From 6f81cb12079be5b464d7bd32c21e5acf23855c36 Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Fri, 2 Mar 2007 18:46:40 -0600
Subject: [PATCH] Fix well-formedness issue in rollback.rhtml and validity in
 that and edit.rhtml.

---
 app/views/wiki/edit.rhtml     | 7 +++----
 app/views/wiki/rollback.rhtml | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 0ccd87ae..6206c62c 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -9,12 +9,11 @@
   <%= render 'wiki_words_help' %>
 </div>
 
-<div id="editForm">
 	<%= form_tag({ :action => 'save', :web => @web.address, :id => @page.name },
 	             { 'id' => 'editForm', 'method' => 'post', 'onsubmit' => 'cleanAuthorName()',
 	               'accept-charset' => 'utf-8' }) %>
-	
-		<textarea name="content" id="content"><%= h(@flash[:content] || @page.content.delete("\x01-\x08\x0B\x0C\x0E-\x1F")) %></textarea>
+	   <div>	
+		<textarea name="content" id="content" rows="24" cols="60"><%= h(@flash[:content] || @page.content.delete("\x01-\x08\x0B\x0C\x0E-\x1F")) %></textarea>
 		<div id="editFormButtons">
 			<input type="submit" value="Submit" accesskey="s"/> as 
 			<%= text_field_tag :author, @author, 
@@ -27,8 +26,8 @@
                 <span class="unlock">(unlocks page)</span>
 			</span>
 		</div>
+	   </div>
 	<%= end_form_tag %>
-</div>
 
 <script type="text/javascript">
 function cleanAuthorName() {
diff --git a/app/views/wiki/rollback.rhtml b/app/views/wiki/rollback.rhtml
index b8ff9151..6ec639a5 100644
--- a/app/views/wiki/rollback.rhtml
+++ b/app/views/wiki/rollback.rhtml
@@ -11,11 +11,11 @@
   <%= render 'wiki_words_help' %>
 </div>
 
-<div id="editForm">
 	<%= form_tag({:web => @web.address, :action => 'save', :id => @page.name},
 	      { :id => 'editForm', :method => 'post', :onsubmit => 'cleanAuthorName();', 
 	        'accept-charset' => 'utf-8' }) %>
-        <textarea name="content" id="content"><%= @revision.content %></textarea>
+	<div>
+        <textarea name="content" id="content" rows="24" cols="60"><%= h(@revision.content.delete("\x01-\x08\x0B\x0C\x0E-\x1F")) %></textarea>
 		<div id="editFormButtons">
 	        <input type="submit" value="Update" accesskey="u" /> as 
 		    <input type="text" name="author" id="authorName" value="<%= @author %>" 
@@ -27,8 +27,8 @@
                 <span class="unlock">(unlocks page)</span>
 			</span>
 	    </div>
+	</div>
 	<%= end_form_tag %>
-</div>
 
 <script type="text/javascript">
 function cleanAuthorName() {