You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by as...@apache.org on 2008/05/27 21:55:50 UTC
svn commit: r660675 - in /ode/sandbox/singleshot: app/views/tasks/show.html.erb public/stylesheets/default.css

Author: assaf
Date: Tue May 27 12:55:48 2008
New Revision: 660675

URL: http://svn.apache.org/viewvc?rev=660675&view=rev
Log:
Updated task view to allow for inclusion of bottom (completion) bar.

Modified:
    ode/sandbox/singleshot/app/views/tasks/show.html.erb
    ode/sandbox/singleshot/public/stylesheets/default.css

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=660675&r1=660674&r2=660675&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:55:48 2008
@@ -1,9 +1,8 @@
-<% # TODO: trim
-@title = @task.title %>
-<div id='task_bar'>
-  <div class='summary'>
+<% div_for @task do %>
+  <div class='bar'>
+    <div class='summary'>
     <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 class='actions'><%= quick_actions(@task) %> <%= content_tag 'button', 'â½ More Options', :onclick=>"Singleshot.expand(event, '.expanded', 'â³ Less options')", :class=>'button-to' %></div>
   </div>
   <div class='expanded' style='display:none'>
     <%= link_to image_tag('calendar.png') + ' Calendar', formatted_task_url(@task, 'ics', :access_key=>authenticated.access_key),
@@ -33,10 +32,11 @@
           content_tag('dt', 'Observers') + content_tag('dd', observers.to_sentence) unless observers.empty? %>
     </dl>
     <div class='actions'>
-      <%= button_to 'Some action' %>
       <%= quick_actions(@task) %>
     </div>
   </div>
-</div>
-<%= content_tag 'iframe', nil, :id=>'task_frame', :src=>task_iframe_url(@task) %>
-<%= javascript_tag 'Singleshot.taskView()' %>
+
+  </div>
+  <%= content_tag 'iframe', nil, :id=>'task_frame', :src=>task_iframe_url(@task) %>
+  <%= javascript_tag 'Singleshot.taskView()' %>
+<% end %>

Modified: ode/sandbox/singleshot/public/stylesheets/default.css
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/public/stylesheets/default.css?rev=660675&r1=660674&r2=660675&view=diff
==============================================================================
--- ode/sandbox/singleshot/public/stylesheets/default.css (original)
+++ ode/sandbox/singleshot/public/stylesheets/default.css Tue May 27 12:55:48 2008
@@ -186,49 +186,49 @@
 
 /** Tasks list **/
 
-#main ol.tasks {
+ol.tasks {
   list-style: none;
   margin: 2em 3.5em 0 3.5em;
   padding: 0;
 }
-#main ol.tasks li.task {
+ol.tasks li.task {
   border-bottom: 1px solid #ccc;
   margin-bottom: 1.5em;
 }
-#main ol.tasks li.task .entry-title {
+ol.tasks li.task .entry-title {
   font-size: 1.2em;
   margin: 0;
 }
-#main ol.tasks li.task .entry-title.priority_1:before {
+ol.tasks li.task .entry-title.priority_1:before {
   content: 'â ';
   color: red;
 }
-#main ol.tasks li.task .entry-title.priority_2:before {
+ol.tasks li.task .entry-title.priority_2:before {
 }
-#main ol.tasks li.task .entry-title.priority_1:before {
+ol.tasks li.task .entry-title.priority_1:before {
 }
-#main ol.tasks li.task .entry-title.overdue a {
+ol.tasks li.task .entry-title.overdue a {
   color: red;
 }
-#main ol.tasks li.task a {
+ol.tasks li.task a {
   text-decoration: none;
 }
-#main ol.tasks li.task .description {
+ol.tasks li.task .description {
   color: #222;
 }
-#main ol.tasks li.task .actions {
+ol.tasks li.task .actions {
   float: right;
 }
-#main ol.tasks li.task .actions form {
+ol.tasks li.task .actions form {
   margin-left: 0.1em;
 }
-#main ol.tasks li.task p.vitals {
+ol.tasks li.task p.vitals {
   color: #808080;
 }
-#main ol.tasks li.date h2 {
+ol.tasks li.date h2 {
   font-size: 1.4em;
 }
-#main ol.tasks li.date ol {
+ol.tasks li.date ol {
   list-style: none;
   margin: 0;
   padding: 0;
@@ -250,95 +250,118 @@
 }
 
 
-/** Task bar **/
+/** Single task **/
 
-#task_bar {
+div.task {
+  margin: 0;
+  padding: 0;
+}
+
+div.task div.bar {
   position:absolute;
-  width:100%;
+  width: 100%;
   margin:0;
   padding:0;
   border-bottom: solid 2px #046380;
   background-color: #e0e0e0;
 }
-#task_bar div.summary {
+
+div.task div.bar div.summary {
   height:2em;
   padding-top:0.3em;
   padding: 0.5em 3em 3px 3em;
 }
-#task_bar div.summary h1 {
+div.task div.bar div.summary h1 {
   margin: 0;
   font-size: 1.5em;
   display: inline;
 }
-#task_bar div.summary h1 a {
+div.task div.bar div.summary h1 a {
   color: #000;
   text-decoration: none;
 }
-#task_bar div.summary a {
+div.task div.bar div.summary a {
   text-decoration: none;
 }
-#task_bar div.summary div.vitals {
+div.task div.bar div.summary div.vitals {
   padding-top: 0.3em;
 }
-#task_bar div.summary div.actions {
+div.task div.bar div.summary div.actions {
   display: inline;
   position: absolute;
   right: 3em;
   top: 0.5em;
 }
-#task_bar div.summary .button-to {
+div.task div.bar div.summary .button-to {
   margin-left: 1em;
 }
 
-#task_bar div.expanded {
+div.task div.bar div.expanded {
   clear: both;
   padding: 2em 3em 2em 3em;
   border-top: 1px solid #ccc;
   margin: 0;
 }
-#task_bar div.expanded a[rel=alternate] {
+div.task div.bar div.expanded a[rel=alternate] {
   float: right;
   padding-left: 1em;
   text-decoration: none;
 }
-#task_bar div.expanded a[rel=alternate] img {
+div.task div.bar div.expanded a[rel=alternate] img {
   border: none;
   vertical-align: bottom;
   margin: 0.1em;
 }
-#task_bar div.expanded h2 {
+div.task div.bar div.expanded h2 {
   font-size: 1.2em;
   margin: 0 0 1em 0;
 }
-#task_bar div.expanded div.description {
+div.task div.bar div.expanded div.description {
   margin: 1em 0 1em 0;
 }
-#task_bar div.expanded dl {
+div.task div.bar div.expanded dl {
 }
-#task_bar div.expanded dt {
+div.task div.bar div.expanded dt {
   font-weight: bold;
   display: inline;
   float: left;
 }
-#task_bar div.expanded dd {
+div.task div.bar div.expanded dd {
   margin: 0 0 1em 10em;
 }
-#task_bar div.expanded ol.activities {
+div.task div.bar div.expanded ol.activities {
   margin: 0;
   padding: 0;
 }
-#task_bar div.expanded div.actions {
+div.task div.bar div.expanded div.actions {
   text-align: right;
 }
 
+div.task iframe {
+  border: 0;
+  width: 100%;
+  height: 0;
+  padding: 0;
+  margin: 3em 0 0 0;
+  background: transparent;
+}
 
-iframe#task_frame {
-  border:0;
-  width:100%;
-  height:0;
-  padding:0;
-  margin:2em 0 0 0;
-  background:transparent;
+div.task div.completion {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  margin: 0;
+  padding: 0.3em 3em 0.3em 3em;
+  background-color: #e0e0e0;
+  border-top: solid 2px #046380;
+}
+div.task div.completion .actions {
+  margin-right: 3em;
+  padding-right: 3em;
+  text-align: right;
+}
+div.task div.completion .actions .button-to {
+  margin-left: 1em;
 }