Author: assaf
Date: Thu Jun 5 16:26:35 2008
New Revision: 663777
URL: http://svn.apache.org/viewvc?rev=663777&view=rev
Log:
Yay for really crispy colors and better spacing.
In other news, completed tasks no longer show as over due.
Modified:
ode/sandbox/singleshot/app/models/task.rb
ode/sandbox/singleshot/app/views/tasks/show.html.erb
ode/sandbox/singleshot/public/stylesheets/default.css
Modified: ode/sandbox/singleshot/app/models/task.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/models/task.rb?rev=663777&r1=663776&r2=663777&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/models/task.rb (original)
+++ ode/sandbox/singleshot/app/models/task.rb Thu Jun 5 16:26:35 2008
@@ -288,7 +288,7 @@
end
def over_due?
- due_on ? due_on < Date.today : false
+ (ready? || active?) && due_on && due_on < Date.today
end
# Scopes can use this to add ranking methods on returned records.
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=663777&r1=663776&r2=663777&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/views/tasks/show.html.erb (original)
+++ ode/sandbox/singleshot/app/views/tasks/show.html.erb Thu Jun 5 16:26:35
2008
@@ -8,7 +8,7 @@
<div class='actions'>
<%= quick_actions(@task) %>
<%= content_tag 'button', 'More Options',
:onclick=>"Singleshot.expand(event, '.header .details', 'Less options')",
:class=>'button-to' %>
- <%= button_to 'Completed', task_url(@task, :status=>'completed'),
:title=>'Click when task completed' if performing &&
@task.rendering.use_completion_button? %>
+ <%= button_to 'Completed', task_url(@task, 'task[status]'=>'completed'),
:method=>:put, :title=>'Click when task completed' if performing &&
@task.rendering.use_completion_button? %>
</div>
<div class='vitals'>
<p class='title'><%= h(@task.title) %></p>
Modified: ode/sandbox/singleshot/public/stylesheets/default.css
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/public/stylesheets/default.css?rev=663777&r1=663776&r2=663777&view=diff
==============================================================================
--- ode/sandbox/singleshot/public/stylesheets/default.css (original)
+++ ode/sandbox/singleshot/public/stylesheets/default.css Thu Jun 5 16:26:35
2008
@@ -17,8 +17,11 @@
}
a, a:visited {
- color: #0059be;
text-decoration: none;
+ color: #0081d1;
+}
+a:hover {
+ color: #055da4;
}
@@ -185,28 +188,29 @@
/** Tasks list **/
table.tasks {
+ table-layout: fixed;
width: 100%;
border-spacing: 0;
border-padding: 0;
border: none;
margin: 0;
- padding:2em 2.5em 2em 2.5em;
+ padding: 2em 3em 2em 3em;
font-size: 1.1em;
- table-layout: fixed;
}
table.tasks thead th {
text-align: left;
font-weight: bold;
- padding: 0.5em;
+ padding: 0 0 0.6em 0;
+ padding: 0 0.6em 0.6em 0;
margin: 0;
border-bottom: 1px solid #ccc;
}
table.tasks tbody td {
text-align: left;
vertical-align: top;
- padding: 0.5em;
+ padding: 0.6em 0.6em 0.6em 0;
margin: 0;
- border-bottom: 1px solid #ddd;
+ border-bottom: 1px solid #eee;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@@ -234,10 +238,13 @@
padding: 0;
}
ol.dates li.date {
- padding-bottom: 1em;
+ padding: 0 0 1.2em 0;
+ margin: 0;
}
ol.dates li.date h2 {
- font-size: 1.2em;
+ font-size: 1.0em;
+ padding: 0 0 0.3em 0;
+ margin: 0 0 0.6em 0;
border-bottom: 1px solid #ccc;
}
ol.dates li.date ol.tasks {
@@ -246,12 +253,12 @@
padding: 0;
}
ol.dates li.date ol.tasks li.task {
- margin: 0 0 1.0em 0;
+ margin: 0 0 0.6em 0;
}
ol.dates li.date abbr.updated {
color: #666;
- font-size: 0.8em;
- margin-right: 0.6em;
+ font-size: 0.7em;
+ margin-right: 1.2em;
}
@@ -262,12 +269,12 @@
padding: 0;
}
ol.activities li.activity {
- margin: 0 0 1.0em 0;
+ margin: 0 0 0.6em 0;
}
ol.activities li.activity abbr.published {
color: #666;
- font-size: 0.8em;
- margin-right: 0.6em;
+ font-size: 0.7em;
+ margin-right: 1.2em;
}
