From 0edb198e3956c1ee0edfdbd4d2f04bc1532d0223 Mon Sep 17 00:00:00 2001
From: bsag <bsag@a4c988fc-2ded-0310-b66e-134b36920a42>
Date: Sat, 24 Jun 2006 13:57:31 +0000
Subject: [PATCH] Fixed a display glitch that affected Opera: the contents of
 the page would display underneath the fixed navigation section at the top.

git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@267 a4c988fc-2ded-0310-b66e-134b36920a42
---
 tracks/app/views/layouts/standard.rhtml |  3 +++
 tracks/db/schema.rb                     | 11 +++++------
 tracks/public/stylesheets/standard.css  | 11 ++++++++---
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/tracks/app/views/layouts/standard.rhtml b/tracks/app/views/layouts/standard.rhtml
index 5b6be65f..fca3780a 100644
--- a/tracks/app/views/layouts/standard.rhtml
+++ b/tracks/app/views/layouts/standard.rhtml
@@ -50,6 +50,8 @@
 </ul>
 </div>
 </div>
+
+<div id="content">
 <div id="info"></div>
 <% unless @controller_name == 'feed' or session['noexpiry'] == "on" -%>
 <%= periodically_call_remote( :url => {:controller => "login", :action => "check_expiry"},
@@ -58,6 +60,7 @@
 <%= periodically_call_remote( :url => {:controller => "todo", :action => "check_tickler"},
                               :frequency => (10*60)) %>  
 <%= @content_for_layout %>
+</div>
 
 <div id="footer">
   <p>Send feedback: <a href="http://dev.rousette.org.uk/report/6">Trac</a> | <a href="http://www.rousette.org.uk/projects/wiki/">Wiki</a> | <a href="mailto:butshesagirl@rousette.org.uk?subject=Tracks feedback">Email</a> | <a href="http://www.rousette.org.uk/projects/">Website</a></p>
diff --git a/tracks/db/schema.rb b/tracks/db/schema.rb
index 1b9608ac..bbadce91 100644
--- a/tracks/db/schema.rb
+++ b/tracks/db/schema.rb
@@ -8,11 +8,11 @@ ActiveRecord::Schema.define(:version => 8) do
     t.column "name", :string, :default => "", :null => false
     t.column "position", :integer, :default => 0, :null => false
     t.column "hide", :boolean, :default => false
-    t.column "user_id", :integer, :default => 1, :null => false
+    t.column "user_id", :integer, :default => 1
   end
 
   create_table "notes", :force => true do |t|
-    t.column "user_id", :integer, :default => 1, :null => false
+    t.column "user_id", :integer, :default => 0, :null => false
     t.column "project_id", :integer, :default => 0, :null => false
     t.column "body", :text
     t.column "created_at", :datetime
@@ -23,9 +23,8 @@ ActiveRecord::Schema.define(:version => 8) do
     t.column "name", :string, :default => "", :null => false
     t.column "position", :integer, :default => 0, :null => false
     t.column "done", :boolean, :default => false
-    t.column "user_id", :integer, :default => 1, :null => false
-    t.column "description", :string, :default => ""
-    t.column "linkurl", :string, :default => ""
+    t.column "user_id", :integer, :default => 1
+    t.column "description", :text
   end
 
   create_table "sessions", :force => true do |t|
@@ -45,7 +44,7 @@ ActiveRecord::Schema.define(:version => 8) do
     t.column "created_at", :datetime
     t.column "due", :date
     t.column "completed", :datetime
-    t.column "user_id", :integer, :default => 1, :null => false
+    t.column "user_id", :integer, :default => 1
     t.column "type", :string, :default => "Immediate", :null => false
     t.column "show_from", :date
   end
diff --git a/tracks/public/stylesheets/standard.css b/tracks/public/stylesheets/standard.css
index ebd81ff0..0751006a 100644
--- a/tracks/public/stylesheets/standard.css
+++ b/tracks/public/stylesheets/standard.css
@@ -51,6 +51,10 @@ a.show_notes:hover {background-image: url(../images/notes_on.png); background-re
 
 /* Structural divs */
 
+#content {
+      margin-top: 90px;
+      }
+      
 #display_box {
       float: left;
       width: 55%;
@@ -65,13 +69,13 @@ a.show_notes:hover {background-image: url(../images/notes_on.png); background-re
 #full_width_display {
       float: left;
       width: 95%;
-      margin: 90px 15px 90px 15px;
+      margin: 0px 15px 90px 15px;
       }
 
 #display_box_projects {
       float: left;
       width: 95%;
-      margin: 90px 15px 90px 15px;
+      margin: 0px 15px 90px 15px;
       }
 
 /* Navigation links at the top */
@@ -117,6 +121,7 @@ a.show_notes:hover {background-image: url(../images/notes_on.png); background-re
       top: 0px;
       left: 0px;
       height: 68px;
+      margin-bottom: 20px;
       clear: both;
       background-color: #000;
       filter: alpha(opacity=75);
@@ -177,7 +182,7 @@ h2 a:hover {
       }
       
 #input_box {
-      margin: 100px 5% 0% 60%;
+      margin: 0% 5% 0% 60%;
       padding: 0px 15px 0px 15px;
       }