Author: assaf
Date: Tue May 27 12:49:54 2008
New Revision: 660663
URL: http://svn.apache.org/viewvc?rev=660663&view=rev
Log:
Removing space in lists may not read as well, but displays better.
Removing Singleshot header from pages gives us more functional screen real
estate.
Modified:
ode/sandbox/singleshot/app/views/layouts/application.html.erb
ode/sandbox/singleshot/app/views/tasks/show.html.erb
ode/sandbox/singleshot/config/environments/development.rb
ode/sandbox/singleshot/lib/tasks/populate.rake
ode/sandbox/singleshot/public/stylesheets/default.css
Modified: ode/sandbox/singleshot/app/views/layouts/application.html.erb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/views/layouts/application.html.erb?rev=660663&r1=660662&r2=660663&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/views/layouts/application.html.erb (original)
+++ ode/sandbox/singleshot/app/views/layouts/application.html.erb Tue May 27
12:49:54 2008
@@ -10,23 +10,9 @@
</head>
<body>
<div id='header'>
- <h1><%= link_to 'Singleshot', root_url %></h1>
- <ul class='links'>
- <li><%= link_to 'Logout', session_url(:method=>:delete) %></li>
- </ul>
- <ul class='tabs'>
- <li><%= link_to 'â Tasks', tasks_url %></li>
- <li><%= link_to 'Following', following_tasks_url %></a></li>
- <li><%= link_to 'Completed', completed_tasks_url %></a></li>
- <li><%= link_to 'Activity', activities_url %></a></li>
- <li><a href='#'>Start …</a></li>
- </ul>
- <ul class='alternate'>
- <%= content_tag 'li', link_to(image_tag('feed.png') + ' Feed',
@alternate[Mime::ATOM],
- :rel=>'alternate', :title=>'Subscribe
with your feed reader') if @alternate && @alternate[Mime::ATOM] %>
- <%= content_tag 'li', link_to(image_tag('calendar.png') + ' Calendar',
@alternate[Mime::ICS],
- :rel=>'alternate', :title=>'Add to your
calendar') if @alternate && @alternate[Mime::ICS] %>
- </ul>
+ <ul class='links'><li><%= link_to 'Logout',
session_url(:method=>:delete) %></li></ul>
+ <ul class='tabs'><li><%= link_to 'â Tasks', tasks_url %></li><li><%=
link_to 'Following', following_tasks_url %></a></li><li><%= link_to
'Completed', completed_tasks_url %></a></li><li><%= link_to 'Activity',
activities_url %></a></li><li><a href='#'>Start …</a></li></ul>
+ <ul class='alternate'><%= content_tag 'li',
link_to(image_tag('feed.png') + ' Feed', @alternate[Mime::ATOM],
:rel=>'alternate', :title=>'Subscribe with your feed reader') if @alternate &&
@alternate[Mime::ATOM] %><%= content_tag 'li',
link_to(image_tag('calendar.png') + ' Calendar', @alternate[Mime::ICS],
:rel=>'alternate', :title=>'Add to your calendar') if @alternate &&
@alternate[Mime::ICS] %></ul>
</div>
<div id='main'>
<%= yield %>
Modified: ode/sandbox/singleshot/app/views/tasks/show.html.erb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/views/tasks/show.html.erb?rev=660663&r1=660662&r2=660663&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/views/tasks/show.html.erb (original)
+++ ode/sandbox/singleshot/app/views/tasks/show.html.erb Tue May 27 12:49:54
2008
@@ -2,7 +2,6 @@
@title = @task.title %>
<div id='task_bar'>
<div class='summary'>
- <h1><%= link_to 'Singleshot', root_url %></h1>
<div class='vitals'><%= task_vitals(@task) %></div>
<div class='actions'><%= quick_actions(@task) %> <%= content_tag 'button',
'More Options', :onclick=>"Singleshot.expand(event, '.expanded', 'Less
options')", :class=>'button-to' %></div>
</div>
Modified: ode/sandbox/singleshot/config/environments/development.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/environments/development.rb?rev=660663&r1=660662&r2=660663&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/environments/development.rb (original)
+++ ode/sandbox/singleshot/config/environments/development.rb Tue May 27
12:49:54 2008
@@ -11,7 +11,6 @@
# Show full error reports and disable caching
config.action_controller.consider_all_requests_local = true
config.action_controller.perform_caching = false
-config.action_view.cache_template_extensions = false
config.action_view.debug_rjs = true
# Don't care if the mailer can't send
Modified: ode/sandbox/singleshot/lib/tasks/populate.rake
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/lib/tasks/populate.rake?rev=660663&r1=660662&r2=660663&view=diff
==============================================================================
--- ode/sandbox/singleshot/lib/tasks/populate.rake (original)
+++ ode/sandbox/singleshot/lib/tasks/populate.rake Tue May 27 12:49:54 2008
@@ -35,7 +35,7 @@
def create(attributes)
retract
you = Person.find_by_identity(ENV['USER'])
- defaults = { :title=>Faker::Lorem.sentence,
:description=>Faker::Lorem.paragraphs(3).join("\n"),
+ defaults = { :title=>Faker::Lorem.sentence,
:description=>Faker::Lorem.paragraphs(3).join("\n\n"),
:frame_url=>'http://localhost:3001/sandwich',
:potential_owners=>[you, other] }
Task.new(defaults.merge(attributes || {})).modified_by(you).save!
end
Modified: ode/sandbox/singleshot/public/stylesheets/default.css
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/public/stylesheets/default.css?rev=660663&r1=660662&r2=660663&view=diff
==============================================================================
--- ode/sandbox/singleshot/public/stylesheets/default.css (original)
+++ ode/sandbox/singleshot/public/stylesheets/default.css Tue May 27 12:49:54
2008
@@ -13,6 +13,11 @@
border: none;
}
+a, a:visited {
+ color: blue;
+ text-decoration: none;
+}
+
/** Forms and controls **/
@@ -109,7 +114,7 @@
}
#header ul.links {
list-style: none;
- margin: 0;
+ margin: 0 0 0.5em 0;
float: right
}
#header ul.links li {
@@ -261,9 +266,11 @@
color: #000;
text-decoration: none;
}
+#task_bar div.summary a {
+ text-decoration: none;
+}
#task_bar div.summary div.vitals {
- display: inline;
- margin-left: 2em;
+ padding-top: 0.3em;
}
#task_bar div.summary div.actions {
display: inline;
