Author: assaf
Date: Sun Jun 15 19:16:55 2008
New Revision: 668039
URL: http://svn.apache.org/viewvc?rev=668039&view=rev
Log:
Switched order of priority and due on date in task view.
Lighter background color for buttons.
Fixed search bar view when zooming in.
Modified:
ode/sandbox/singleshot/app/views/tasks/following.html.erb
ode/sandbox/singleshot/app/views/tasks/index.html.erb
ode/sandbox/singleshot/public/stylesheets/default.css
Modified: ode/sandbox/singleshot/app/views/tasks/following.html.erb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/views/tasks/following.html.erb?rev=668039&r1=668038&r2=668039&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/views/tasks/following.html.erb (original)
+++ ode/sandbox/singleshot/app/views/tasks/following.html.erb Sun Jun 15
19:16:55 2008
@@ -2,8 +2,8 @@
<thead>
<th style='width:7em'>Status</th>
<th>Task</th>
- <th style='width:7em'>Due on</th>
<th style='width:5em'>Priority</th>
+ <th style='width:7em'>Due on</th>
<th style='width:7em'>Age</th>
<th style='width:8em'>Assigned to</th>
</thead>
@@ -15,10 +15,10 @@
content_tag_for 'tr', task, :class=>classes.join(' ') do %>
<td class='status'><%= task.status.titleize %></td>
<td class='entry-title'><%= link_to h(task.title), task_url(task),
:rel=>'bookmark', :title=>truncate(strip_tags(task.description), 250) %></td>
- <td><%= image_tag('exclamation.png') if task.over_due? %> <%=
abbr_date task.due_on, relative_date(task.due_on).titleize,
:class=>(task.over_due? ? 'overdue' : nil) if task.due_on %></td>
<td><%= content_tag 'span', ['High', 'Normal', 'Low'][task.priority -
1], :class=>"priority_#{task.priority}" %></td>
+ <td><%= image_tag('exclamation.png') if task.over_due? %> <%=
abbr_date task.due_on, relative_date(task.due_on).titleize,
:class=>(task.over_due? ? 'overdue' : nil) if task.due_on %></td>
<td><%= abbr_time task.created_at, age(task.created_at, false),
:class=>'published' %></td>
- <td><%= link_to_person task.owner, :rel=>:owner if task.owner %></td>
+ <td><%= link_to_person task.owner, :rel=>:owner if task.owner %><%=
button_to 'Claim', task_url(task, 'task[owner]'=>authenticated), :method=>:put,
:title=>'Claim this task' if task.can_claim?(authenticated) %></td>
<% end %>
<% end %>
</tbody>
Modified: ode/sandbox/singleshot/app/views/tasks/index.html.erb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/views/tasks/index.html.erb?rev=668039&r1=668038&r2=668039&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/views/tasks/index.html.erb (original)
+++ ode/sandbox/singleshot/app/views/tasks/index.html.erb Sun Jun 15 19:16:55
2008
@@ -1,8 +1,8 @@
<table class='tasks hfeed'>
<thead>
<th>Task</th>
- <th style='width:7em'>Due on</th>
<th style='width:5em'>Priority</th>
+ <th style='width:7em'>Due on</th>
<th style='width:7em'>Age</th>
<th style='width:5em'></th>
</thead>
@@ -10,8 +10,8 @@
<% for task in @tasks %>
<% content_tag_for 'tr', task, :class=>'hentry' + (task.over_due? ? '
overdue' : '') do %>
<td class='entry-title'><%= link_to h(task.title), task_url(task),
:rel=>'bookmark', :title=>truncate(strip_tags(task.description), 250) %></td>
- <td><%= image_tag('exclamation.png') if task.over_due? %> <%=
abbr_date task.due_on, relative_date(task.due_on).titleize if task.due_on
%></td>
<td><%= content_tag 'span', ['High', 'Normal', 'Low'][task.priority -
1], :class=>"priority_#{task.priority}" %></td>
+ <td><%= image_tag('exclamation.png') if task.over_due? %> <%=
abbr_date task.due_on, relative_date(task.due_on).titleize if task.due_on
%></td>
<td><%= abbr_time task.created_at, age(task.created_at, false),
:class=>'published' %></td>
<td><%= button_to 'Claim', task_url(task,
'task[owner]'=>authenticated), :method=>:put, :title=>'Claim this task' if
task.can_claim?(authenticated) %></td>
<% end %>
Modified: ode/sandbox/singleshot/public/stylesheets/default.css
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/public/stylesheets/default.css?rev=668039&r1=668038&r2=668039&view=diff
==============================================================================
--- ode/sandbox/singleshot/public/stylesheets/default.css (original)
+++ ode/sandbox/singleshot/public/stylesheets/default.css Sun Jun 15 19:16:55
2008
@@ -62,7 +62,7 @@
padding: 0.3em 0.6em 0.3em 0.6em;
margin: 0;
color: #fff;
- background-color: #646060;
+ background-color: #848080;
cursor: pointer;
text-decoration: none;
-moz-border-radius: 2px;
@@ -90,8 +90,8 @@
form.search {
display: inline;
- margin: 0 -1.2em 0 1em;
white-space: nowrap;
+ margin: 0 -20px 0 1em;
}
form.search input {
width: 15em;
@@ -107,10 +107,11 @@
display: inline;
background: transparent;
position: relative;
- left: -1.5em;
+ left: -20px;
vertical-align: middle;
padding: 0;
margin: 0;
+ width: 20px;
-webkit-box-shadow: none;
}
@@ -252,7 +253,7 @@
table.tasks tbody td .priority_1 {
color: #f04040;
}
-table.tasks td .button-to {
+table.tasks td .button-to input {
font-size: 0.7em;
}