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/03 02:16:50 UTC
svn commit: r652958 - in /ode/sandbox/singleshot: app/controllers/
app/views/layouts/ app/views/tasks/ public/stylesheets/
Author: assaf
Date: Fri May 2 17:16:49 2008
New Revision: 652958
URL: http://svn.apache.org/viewvc?rev=652958&view=rev
Log:
Fixed: SessionController must not use authenticate filter.
Preliminary dashboard view
Added:
ode/sandbox/singleshot/app/views/tasks/index.html.erb
Modified:
ode/sandbox/singleshot/app/controllers/sessions_controller.rb
ode/sandbox/singleshot/app/controllers/tasks_controller.rb
ode/sandbox/singleshot/app/views/layouts/application.html.erb
ode/sandbox/singleshot/app/views/layouts/head.html.erb
ode/sandbox/singleshot/public/stylesheets/default.css
ode/sandbox/singleshot/public/stylesheets/screen.css
Modified: ode/sandbox/singleshot/app/controllers/sessions_controller.rb
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/controllers/sessions_controller.rb?rev=652958&r1=652957&r2=652958&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/controllers/sessions_controller.rb (original)
+++ ode/sandbox/singleshot/app/controllers/sessions_controller.rb Fri May 2 17:16:49 2008
@@ -1,4 +1,5 @@
class SessionsController < ApplicationController
+ skip_before_filter :authenticate
def show
flash.keep(:return_to)
Modified: ode/sandbox/singleshot/app/controllers/tasks_controller.rb
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/controllers/tasks_controller.rb?rev=652958&r1=652957&r2=652958&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/controllers/tasks_controller.rb (original)
+++ ode/sandbox/singleshot/app/controllers/tasks_controller.rb Fri May 2 17:16:49 2008
@@ -6,6 +6,10 @@
before_filter :forbid_reserved, :except=>[:update, :destroy]
layout 'head', :only=>[:show]
+ layout 'application', :only=>[:index]
+
+ def index
+ end
def new
@task = Task.new(:creator=>authenticated)
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=652958&r1=652957&r2=652958&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/views/layouts/application.html.erb (original)
+++ ode/sandbox/singleshot/app/views/layouts/application.html.erb Fri May 2 17:16:49 2008
@@ -1,6 +1,6 @@
<html>
<head>
- <title>Single Shot<%= " — #{escape_once(@title)}" if @title %></title>
+ <title>Singleshot<%= " — #{escape_once(@title)}" if @title %></title>
<%= javascript_include_tag :all, :cache=>true %>
<%= stylesheet_link_tag 'screen', 'buttons', 'default', :cache=>true %>
<%= stylesheet_link_tag 'print', :media=>'print', :cache=>true %>
@@ -10,6 +10,19 @@
</head>
<body>
<div id='header'>
+ <h1>Singleshot</h1>
+ <ul id='personal'>
+ <li><a>Help</a></li>
+ <li><a>Settings</a></li>
+ <li><%= link_to 'Logout', session_url(:method=>:delete) %></li>
+ </ul>
+ <ul id='navigation'>
+ <li><a>Dashboard</a></li>
+ <li><a>Active Tasks</a></li>
+ <li><a>Notifications</a></li>
+ <li><a>Tracking</a></li>
+ <li><a>Archive</a></li>
+ </ul>
</div>
<div id='main'>
<%= yield %>
Modified: ode/sandbox/singleshot/app/views/layouts/head.html.erb
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/views/layouts/head.html.erb?rev=652958&r1=652957&r2=652958&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/views/layouts/head.html.erb (original)
+++ ode/sandbox/singleshot/app/views/layouts/head.html.erb Fri May 2 17:16:49 2008
@@ -1,6 +1,6 @@
<html>
<head>
- <title>Single Shot<%= " — #{escape_once(@title)}" if @title %></title>
+ <title>Singleshot<%= " — #{escape_once(@title)}" if @title %></title>
<%= javascript_include_tag :all, :cache=>true %>
<%= stylesheet_link_tag 'screen', 'buttons', 'default', :cache=>true %>
<%= stylesheet_link_tag 'print', :media=>'print', :cache=>true %>
Added: 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=652958&view=auto
==============================================================================
(empty)
Modified: ode/sandbox/singleshot/public/stylesheets/default.css
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/public/stylesheets/default.css?rev=652958&r1=652957&r2=652958&view=diff
==============================================================================
--- ode/sandbox/singleshot/public/stylesheets/default.css (original)
+++ ode/sandbox/singleshot/public/stylesheets/default.css Fri May 2 17:16:49 2008
@@ -139,3 +139,63 @@
margin:2em 0 0 0;
background:transparent;
}
+
+
+#header {
+ background-color: #666;
+ padding: 1em 2em 0 2em;
+ border-bottom: solid 0.3em #999;
+}
+#header h1 {
+ font-size: 2.5em;
+ font-weight: bold;
+ color:#fff;
+ float: left;
+}
+
+ul#personal {
+ list-style: none;
+ float: right;
+ font-size: 1.1em;
+ margin: 0;
+}
+ul#personal li {
+ display: inline;
+ margin-left: 1em;
+}
+ul#personal li a {
+ color: #fff;
+ text-decoration: none;
+}
+
+ul#navigation {
+ clear: both;
+ list-style: none;
+ margin: 0 0 1px 0;
+ padding: 0;
+}
+ul#navigation li {
+ display: inline;
+ margin-right: 0.3em;
+ padding: 0;
+}
+ul#navigation li a {
+ color: #eee;
+ font-size: 1.3em;
+ font-weight: bold;
+ text-decoration: none;
+ background-color:#336699;
+ padding: 0.6em 0.6em 0.3em 0.6em;
+ -webkit-border-top-left-radius: 0.2em;
+ -webkit-border-top-right-radius: 0.2em;
+ -moz-border-radius-topright: 0.6em;
+ -moz-border-radius-topleft: 0.6em;
+}
+ul#navigation li a:hover {
+ background-color:#6299c5;
+}
+#header hr {
+ background-color: #000;
+ margin:0;
+ padding:0;
+}
Modified: ode/sandbox/singleshot/public/stylesheets/screen.css
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/public/stylesheets/screen.css?rev=652958&r1=652957&r2=652958&view=diff
==============================================================================
--- ode/sandbox/singleshot/public/stylesheets/screen.css (original)
+++ ode/sandbox/singleshot/public/stylesheets/screen.css Fri May 2 17:16:49 2008
@@ -15,7 +15,6 @@
font-size:75%;
color:#222;
font-family:"Helvetica Neue", "Lucida Grande", Helvetica, Arial, Verdana, sans-serif;
-margin:1.5em 0;
}
table {