Author: assaf
Date: Mon Jun 2 21:53:22 2008
New Revision: 662649
URL: http://svn.apache.org/viewvc?rev=662649&view=rev
Log:
Changed color scheme (again, can't make up my mind!)
Root URL now redirects to task list (good idea not to overload same URL).
Modified:
ode/sandbox/singleshot/app/controllers/application.rb
ode/sandbox/singleshot/app/controllers/tasks_controller.rb
ode/sandbox/singleshot/app/helpers/task_helper.rb
ode/sandbox/singleshot/app/views/tasks/show.html.erb
ode/sandbox/singleshot/config/routes.rb
ode/sandbox/singleshot/db/schema.rb
ode/sandbox/singleshot/public/stylesheets/default.css
Modified: ode/sandbox/singleshot/app/controllers/application.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/controllers/application.rb?rev=662649&r1=662648&r2=662649&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/controllers/application.rb (original)
+++ ode/sandbox/singleshot/app/controllers/application.rb Mon Jun 2 21:53:22
2008
@@ -10,6 +10,10 @@
# from your application log (in this case, all fields with names like
"password").
filter_parameter_logging :password
+ def index
+ redirect_to tasks_url
+ end
+
# --- Authentication ---
Modified: ode/sandbox/singleshot/app/controllers/tasks_controller.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/controllers/tasks_controller.rb?rev=662649&r1=662648&r2=662649&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/controllers/tasks_controller.rb (original)
+++ ode/sandbox/singleshot/app/controllers/tasks_controller.rb Mon Jun 2
21:53:22 2008
@@ -64,12 +64,11 @@
end
end
+
+
def update
# TODO: rescue ActiveRecord::ReadOnlyRecord
- logger.info @task.inspect
- logger.info @task.readonly?
- logger.info params[:task].inspect
- @task.modified_by(authenticated).update_attributes!(params[:task])
+ @task.modify_by(authenticated).update_attributes!(params[:task])
=begin
# TODO: conditional put
Modified: ode/sandbox/singleshot/app/helpers/task_helper.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/helpers/task_helper.rb?rev=662649&r1=662648&r2=662649&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/helpers/task_helper.rb (original)
+++ ode/sandbox/singleshot/app/helpers/task_helper.rb Mon Jun 2 21:53:22 2008
@@ -53,7 +53,7 @@
actions << form_tag(task_url(task), :method=>:put,
:class=>'button-to') +
'<select name="task[owner]"><option disabled>Select owner
...</option>' +
options_for_select(others.map { |person| [person.fullname,
person.identity] }.sort) +
- '</select><input type="submit" value="Delegate"></form>'
+ '<option value="">Anyone</option></select><input type="submit"
value="Delegate"></form>'
end
end
actions.join
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=662649&r1=662648&r2=662649&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/views/tasks/show.html.erb (original)
+++ ode/sandbox/singleshot/app/views/tasks/show.html.erb Mon Jun 2 21:53:22
2008
@@ -12,7 +12,7 @@
<div class='vitals'>
<%= task_vitals(@task) %>: <%= content_tag 'span', h(@task.title),
:class=>'title', :title=>@task.title %>
</div>
- <div class='details' style='display:non'>
+ <div class='details' style='display:none'>
<dl>
<%= content_tag('dt', 'Description') + content_tag('dd',
sanitize(simple_format(@task.description))) unless use_description %>
<dt>Priority</dt><dd><%= ['High', 'Medium', 'Low'[EMAIL PROTECTED] -
1] %></dd>
Modified: ode/sandbox/singleshot/config/routes.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/routes.rb?rev=662649&r1=662648&r2=662649&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/routes.rb (original)
+++ ode/sandbox/singleshot/config/routes.rb Mon Jun 2 21:53:22 2008
@@ -1,12 +1,12 @@
ActionController::Routing::Routes.draw do |map|
map.resource 'session'
- map.resources 'tasks', :collection=>{ 'completed'=>:get, 'following'=>:get,
'complete_redirect'=>:get }, :member=>{ 'activity'=>:get } do |tasks|
+ map.resources 'tasks', :collection=>{ 'completed'=>:get, 'following'=>:get,
'complete_redirect'=>:get } do |tasks|
tasks.resource :perform
end
map.resources 'activities'
map.day_activity 'activity/:year/:month/:day', :controller=>'activities',
:action=>'show', :year =>/\d{4}/, :month=>/\d{1,2}/, :day=>/\d{1,2}/
- map.root :tasks
+ map.root :controller=>'application'
map.resource 'sandwich'
Modified: ode/sandbox/singleshot/db/schema.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/db/schema.rb?rev=662649&r1=662648&r2=662649&view=diff
==============================================================================
--- ode/sandbox/singleshot/db/schema.rb (original)
+++ ode/sandbox/singleshot/db/schema.rb Mon Jun 2 21:53:22 2008
@@ -1,5 +1,5 @@
# This file is auto-generated from the current state of the database. Instead
of editing this file,
-# please use the migrations feature of ActiveRecord to incrementally modify
your database, and
+# please use the migrations feature of Active Record to incrementally modify
your database, and
# then regenerate this schema definition.
#
# Note that this schema.rb definition is the authoritative source for your
database schema. If you need
Modified: ode/sandbox/singleshot/public/stylesheets/default.css
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/public/stylesheets/default.css?rev=662649&r1=662648&r2=662649&view=diff
==============================================================================
--- ode/sandbox/singleshot/public/stylesheets/default.css (original)
+++ ode/sandbox/singleshot/public/stylesheets/default.css Mon Jun 2 21:53:22
2008
@@ -1,12 +1,15 @@
/** Main styles **/
body {
- font: 10pt "Lucida Grande", Helvetica, Verdana, Sans;
+ font: 10pt "Lucida Sans", Helvetica, Verdana, Sans;
color: #000;
background-color: #fff;
margin: 0;
padding: 0;
}
+h1 {
+ font-family: "Corbel";
+}
abbr {
text-decoration: none;
@@ -14,7 +17,7 @@
}
a, a:visited {
- color: blue;
+ color: #0059be;
text-decoration: none;
}
@@ -98,9 +101,9 @@
/** Header **/
#header {
- background-color: #fff;
+ background-color: #e8e8e8;
padding: 0.5em 3em 3px 3em;
- border-bottom: solid 2px #046380;
+ border-bottom: solid 2px #055da4;
}
#header h1 {
font-size: 2.2em;
@@ -109,7 +112,7 @@
float: left;
}
#header h1 a {
- color: #000;
+ color: #404040;
text-decoration: none;
}
#header ul.links {
@@ -126,6 +129,7 @@
text-decoration: none;
}
+
#header ul.tabs {
clear: both;
list-style: none;
@@ -134,7 +138,7 @@
}
#header ul.tabs li {
display: inline;
- margin-right: 0.5em;
+ margin-right: 0.6em;
padding: 0;
}
#header ul.tabs li a {
@@ -142,25 +146,14 @@
font-size: 1.2em;
font-weight: bold;
text-decoration: none;
- background-color: #046380;
- padding: 0.3em 0.6em 0.3em 0.6em;
+ background-color: #0081d1;
+ padding: 0.3em 0.9em 0.3em 0.9em;
-moz-border-radius: 4px 4px 0 0;
-webkit-border-top-left-radius: 6px;
-webkit-border-top-right-radius: 6px;
}
#header ul.tabs li a:hover, #header ul.tabs li a.current {
- background-color: #044360;
-}
-#header ul.tabs li a .counter {
- position: relative;
- top: -1.1em;
- right: -1em;
- font-size: 0.5em;
- margin: 0;
- padding: 0.3em;
- background-color: red;
- -moz-border-radius: 0.3em;
- -webkit-border-top-left-radius: 0.3em;
+ background-color: #055da4;
}
#header ul.alternate {
margin-top: -1.3em;
@@ -226,10 +219,10 @@
color: #888;
}
table.tasks tbody tr.overdue td, table.tasks tbody .overdue td a {
- color: red;
+ color: #f04040;
}
table.tasks tbody td .priority_1 {
- color: red;
+ color: #f04040;
}
@@ -291,7 +284,8 @@
width: 100%;
margin: 0;
padding: 0;
- border-bottom: solid 2px #046380;
+ background-color: #e8e8e8;
+ border-bottom: solid 2px #055da4;
}
div.task div.header h1 {
display: inline;
@@ -300,7 +294,7 @@
margin: 0.6em 2em 0 2.5em;
}
div.task div.header h1 a {
- color: #000;
+ color: #404040;
}
div.task div.header div.vitals {
@@ -315,9 +309,9 @@
}
div.task div.header div.actions {
display: inline;
- background: #fff;
float: right;
margin: 0.5em 2.5em 0.5em 0;
+ white-space: nowrap;
}
div.task div.header div.actions .button-to {
margin-left: 0.6em;
@@ -328,7 +322,7 @@
padding: 1em 3em 2em 3em;
border-top: 1px solid #ccc;
margin: 0;
- background-color: #fff;
+ background-color: #e8e8e8;
}
div.task div.details dt {
font-weight: bold;
@@ -370,7 +364,8 @@
width: 100%;
margin: 0;
padding: 0.3em 3em 0.3em 3em;
- border-top: solid 2px #046380;
+ background-color: #e8e8e8;
+ border-top: solid 2px #055da4;
}
div.task div.footer .actions {
margin-right: 3em;
