From 46e78c23171f094b421f68efae3f74b6ab260cd6 Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Thu, 8 Mar 2007 22:35:49 -0600
Subject: [PATCH] Sync with latest Instiki trunk (to the extent that the
 bizarre stuff being committed there makes any sense).

---
 app/views/admin/edit_web.rhtml    | 6 ++----
 app/views/layouts/default.rhtml   | 2 +-
 public/javascripts/application.js | 5 +++++
 public/stylesheets/instiki.css    | 2 --
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/edit_web.rhtml b/app/views/admin/edit_web.rhtml
index 984d3265..ad5c64ee 100644
--- a/app/views/admin/edit_web.rhtml
+++ b/app/views/admin/edit_web.rhtml
@@ -61,8 +61,7 @@
       <br/>
     </p>
 
-    <a href="#" 
-       onclick="document.getElementById('additionalStyle').style.display='block';return false;">
+    <a href="#" onclick="toggleView('additionalStyle');return false;">
     Stylesheet tweaks &gt;&gt;</a>
     <em>
     - add or change styles used by this web; styles defined here take precedence over 
@@ -70,8 +69,7 @@
     tags.</em>
     <br/>
     <textarea id="additionalStyle" class="disableAutoComplete" cols="50" rows="20"
-      style="display: none; margin-top: 10px; margin-bottom: 5px;" 
-      name="additional_style"><%= @web.additional_style %>
+      style="display:none" name="additional_style"><%= @web.additional_style %>
     </textarea>
   </div>
 
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index e677427d..d4ba72e2 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -30,7 +30,7 @@
     <%= @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/public/javascripts/application.js b/public/javascripts/application.js
index fe457769..47df15e9 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1,2 +1,7 @@
 // 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';
+}
+
diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css
index 4b9514f9..986b3aa8 100644
--- a/public/stylesheets/instiki.css
+++ b/public/stylesheets/instiki.css
@@ -292,8 +292,6 @@ white-space:nowrap;
 }
 
 div#editForm textarea#content {
-height:400px;
-width:70%;
 }
 
 div#MarkupHelp {