From 8fb8517156eb7bf220c8284f8a898f5fbcfb4b6b Mon Sep 17 00:00:00 2001
From: Michal Wlodkowski <mw@mutti.jp>
Date: Tue, 27 Feb 2007 21:56:13 +0000
Subject: [PATCH] css updates

---
 app/views/admin/edit_web.rhtml    |  4 +---
 app/views/layouts/default.rhtml   |  2 +-
 app/views/wiki/edit.rhtml         |  4 ++--
 app/views/wiki/new.rhtml          |  2 +-
 app/views/wiki_words_help.rhtml   |  2 ++
 config/database.yml               |  2 +-
 public/javascripts/application.js |  4 ++++
 public/stylesheets/instiki.css    | 33 ++++++++++++++++++++++++++-----
 8 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/app/views/admin/edit_web.rhtml b/app/views/admin/edit_web.rhtml
index 3062892f..f77cac3e 100644
--- a/app/views/admin/edit_web.rhtml
+++ b/app/views/admin/edit_web.rhtml
@@ -63,8 +63,7 @@
     </small>
     </p>
 
-    <a href="#" 
-       onClick="document.getElementById('additionalStyle').style.display='block';return false;">
+    <a href="#" onClick="toggleView('additionalStyle');return false;">
     Stylesheet tweaks &gt;&gt;</a>
     <small><em>
     - add or change styles used by this web; styles defined here take precedence over 
@@ -72,7 +71,6 @@
     tags.</em></small>
     <br/>
     <textarea id="additionalStyle" class="disableAutoComplete"
-      style="display: none; margin-top: 10px; margin-bottom: 5px; width: 560px; height: 200px" 
       name="additional_style"><%= @web.additional_style %>
     </textarea>
   </div>
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 67b85e06..a43a7660 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -30,7 +30,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     <%= @style_additions %>
     <%= @web ? @web.additional_style : '' %>
   </style>
-
+  <%= javascript_include_tag :defaults %>
   <% if @web %>
   	<%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_headlines') %>
   	<%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_content') %>
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index ad7df15d..2ca00efa 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -3,7 +3,7 @@
   @content_width = 720
   @hide_navigation = true
 %>
-
+<div>
 <div id="MarkupHelp">
   <%= render("#{@web.markup}_help") %>
   <%= render 'wiki_words_help' %>
@@ -29,7 +29,7 @@
 		</div>
 	<%= end_form_tag %>
 </div>
-
+</div>
 <script type="text/javascript">
 function cleanAuthorName() {
   if (document.getElementById('authorName').value == "") {
diff --git a/app/views/wiki/new.rhtml b/app/views/wiki/new.rhtml
index cda26081..b5929040 100644
--- a/app/views/wiki/new.rhtml
+++ b/app/views/wiki/new.rhtml
@@ -12,7 +12,7 @@
 <div id="editForm">
 	<%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name },
 	        { 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();', 'accept-charset' => 'utf-8' }) %>
-	
+	<div class="hidden"><textarea name="content1" id="content1">iam empty</textarea></div>
 	    <textarea name="content" id="content"><%= h(@flash[:content] || '') %></textarea>
 		<div id="editFormButtons">
 		    <input type="submit" value="Submit" accesskey="s"/> as 
diff --git a/app/views/wiki_words_help.rhtml b/app/views/wiki_words_help.rhtml
index b283b407..56375356 100644
--- a/app/views/wiki_words_help.rhtml
+++ b/app/views/wiki_words_help.rhtml
@@ -1,3 +1,4 @@
+<div style="width:254px;">
 <h3>Wiki words</h3>
 <p style="border-top: 1px dotted #ccc; margin-top: 0px">
   Two or more uppercase words stuck together (camel case) or any phrase surrounded by double 
@@ -7,3 +8,4 @@
   Wiki words: <i>HomePage, ThreeWordsTogether, [[C++]], [[Let's play again!]]</i><br/>
   Not wiki words: <i>IBM, School</i>
 </p>
+</div>
diff --git a/config/database.yml b/config/database.yml
index 015390e1..2c951fb6 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -3,7 +3,7 @@
 
 development:
     adapter: sqlite3
-    database: db/development.db.sqlite3
+    database: db/development.db
 
 test:
     adapter: sqlite3
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index fe457769..70de608e 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1,2 +1,6 @@
 // Place your application-specific JavaScript functions and classes here
 // This file is automatically included by javascript_include_tag :defaults
+function toggleView(id)
+{
+	(document.getElementById(id).style.display == 'block') ? document.getElementById(id).style.display='none' : document.getElementById(id).style.display='block';
+}
\ No newline at end of file
diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css
index e676f3b9..27ea0001 100644
--- a/public/stylesheets/instiki.css
+++ b/public/stylesheets/instiki.css
@@ -139,6 +139,17 @@ margin:0 0 1.5em;
 padding:0 2.5em;
 }
 
+
+/* Affects the display of "category: ..." */
+.property { 
+color: #999; 
+font-size: 80%; 
+}
+
+.hidden { 
+display: none;
+}
+
 pre {
 background-color:#DDD;
 font-size:90%;
@@ -237,19 +248,23 @@ div#editFormButtons span {
 white-space:nowrap;
 }
 
+div#editForm {
+float:left;
+width:65%;
+}
+
 div#editForm textarea#content {
 height:400px;
-width:70%;
+width:97%;
 }
 
 div#MarkupHelp {
 float:right;
-margin-top:0.5em;
-width:25%;
+width:34%;
 }
 
 div#MarkupHelp table {
-border-bottom:3px solid #BBB;
+border:3px solid #BBB;
 border-left:3px solid #999;
 border-right:3px solid #BBB;
 border-top:3px solid #999;
@@ -272,7 +287,7 @@ padding:0 0.75em;
 }
 
 div#MarkupHelp h3 {
-font-size:90%;
+font-size:100%;
 font-weight:bold;
 margin:0 0 5px;
 padding:5px 0 0;
@@ -317,4 +332,12 @@ div.errorExplanation p,div.errorExplanation li {
 border:none;
 margin:0;
 padding:0;
+}
+
+.disableAutoComplete {
+display: none; 
+margin-top: 10px; 
+margin-bottom: 5px; 
+width: 99%; 
+height: 200px	
 }
\ No newline at end of file