From 805d4a829e64b8b6aaf48a5eef57ed9eccb8b8cb Mon Sep 17 00:00:00 2001
From: Alexey Verkhovsky <averkhov@thoughtworks.com>
Date: Sun, 23 Jan 2005 17:05:28 +0000
Subject: [PATCH] further XML well-formedness fixes

---
 app/views/wiki/edit.rhtml             |  4 +--
 app/views/wiki/new.rhtml              |  4 +--
 app/views/wiki/new_system.rhtml       | 23 +++++++++------
 app/views/wiki/new_web.rhtml          | 19 +++++++++----
 app/views/wiki/recently_revised.rhtml | 40 +++++++++++++--------------
 5 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index eb812d5d..8cb202b1 100755
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -13,9 +13,9 @@
     <textarea name="content" style="width: 450px; height: 500px"><%= @page.content %></textarea>
 </p>
 <p>
-    <input type="submit" value="Update"> as 
+    <input type="submit" value="Update" /> as 
     <input type="text" name="author" id="authorName" value="<%= @author %>" 
-        onClick="this.value == 'AnonymousCoward' ? this.value = '' : true">
+        onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
     | <a href="../cancel_edit/<%= @page.name %>">Cancel</a> <small>(unlocks page)</small>
 </p>
 </form>
diff --git a/app/views/wiki/new.rhtml b/app/views/wiki/new.rhtml
index fcd0cf86..8871c7fd 100755
--- a/app/views/wiki/new.rhtml
+++ b/app/views/wiki/new.rhtml
@@ -11,8 +11,8 @@
     <textarea name="content" style="width: 450px; height: 500px"></textarea>
 </p>
 <p>
-    <input type="submit" value="Create"> as 
-    <input type="text" name="author" id="authorName" value="<%= @author %>" onClick="this.value == 'AnonymousCoward' ? this.value = '' : true">
+    <input type="submit" value="Create" /> as 
+    <input type="text" name="author" id="authorName" value="<%= @author %>" onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
 </p>
 </form>
 
diff --git a/app/views/wiki/new_system.rhtml b/app/views/wiki/new_system.rhtml
index 26f3bcac..c684da4c 100755
--- a/app/views/wiki/new_system.rhtml
+++ b/app/views/wiki/new_system.rhtml
@@ -2,7 +2,8 @@
 
 <p>
   Congratulations on succesfully installing and starting Instiki. 
-  Since this is the first time Instiki has been run on this port, you'll need to do a brief one-time setup.
+  Since this is the first time Instiki has been run on this port, 
+  you'll need to do a brief one-time setup.
 </p>
 
 <form action="../create_system" id="setup" method="post" onSubmit="return validateSetup()">
@@ -11,12 +12,17 @@
 
     <h2 style="margin-bottom: 3px">Name and address for your first web</h2>
     <div class="help">
-      The name of the web is included in the title on all pages. The address is the base path that all pages within the web live beneath. Ex: the address "rails" gives URLs like <i>/rails/show/HomePage</i>. The address can only consist of letters & digits.
+      The name of the web is included in the title on all pages. 
+      The address is the base path that all pages within the web live beneath. 
+      Ex: the address "rails" gives URLs like <i>/rails/show/HomePage</i>. 
+      The address can only consist of letters and digits.
     </div>
     <div class="inputBox">
-      Name: <input type="text" id="web_name" name="web_name" value="Wiki" onChange="proposeAddress();" 
-          onClick="this.value == 'Wiki' ? this.value = '' : true"> &nbsp;&nbsp;
-      Address: <input type="text" id="web_address" name="web_address" onChange="cleanAddress();" value="wiki">
+      Name: <input type="text" id="web_name" name="web_name" value="Wiki" 
+            onChange="proposeAddress();" onClick="this.value == 'Wiki' ? this.value = '' : true" /> 
+      &nbsp;&nbsp;
+      Address: <input type="text" id="web_address" name="web_address" onChange="cleanAddress();"
+               value="wiki" />
     </div>
   </li>
 
@@ -27,14 +33,15 @@
       Everyone with this password will be able to do this, so pick it carefully.
     </div>
     <div class="inputBox">
-      Password: <input type="password" id="password" name="password"> &nbsp;&nbsp;
-      Verify: <input type="password" id="password_check" name="password_check">
+      Password: <input type="password" id="password" name="password" />
+      &nbsp;&nbsp;
+      Verify: <input type="password" id="password_check" name="password_check" />
     </div>
   </li>
 </ol>
 
 <p align="right">
-    <input type="submit" value="Setup" style="margin-left: 40px">
+    <input type="submit" value="Setup" style="margin-left: 40px" />
 </p>
 </form>
 
diff --git a/app/views/wiki/new_web.rhtml b/app/views/wiki/new_web.rhtml
index 39964fd6..7a64f6e2 100755
--- a/app/views/wiki/new_web.rhtml
+++ b/app/views/wiki/new_web.rhtml
@@ -1,18 +1,25 @@
 <% @title = "New Wiki Web"; @content_width = 500 %>
 
 <p>
-  Each web serves as an isolated name space for wiki pages, so different subjects or projects can write about different <i>MuppetShows</i>.
+  Each web serves as an isolated name space for wiki pages, 
+  so different subjects or projects can write about different <i>MuppetShows</i>.
 </p>
 
-<form action="../create_web" id="setup" method="post" onSubmit="cleanAddress(); return validateSetup()">
+<form action="../create_web" id="setup" method="post" onSubmit="cleanAddress(); 
+      return validateSetup()">
+
 <ol class="setup">
   <li>
     <h2 style="margin-bottom: 3px">Name and address for your new web</h2>
     <div class="help">
-      The name of the web is included in the title on all pages. The address is the base path that all pages within the web live beneath. Ex: the address "rails" gives URLs like <i>/rails/show/HomePage</i>. The address can only consist of letters & digits.
+      The name of the web is included in the title on all pages. 
+      The address is the base path that all pages within the web live beneath. 
+      Ex: the address "rails" gives URLs like <i>/rails/show/HomePage</i>. 
+      The address can only consist of letters and digits.
     </div>
     <div class="inputBox">
-      Name: <input type="text" id="web_name" name="name" onChange="proposeAddress();" /> &nbsp;&nbsp;
+      Name: <input type="text" id="web_name" name="name" onChange="proposeAddress();" />
+      &nbsp;&nbsp;
       Address: <input type="text" id="web_address" name="address" onChange="cleanAddress();" />
     </div>
   </li>
@@ -22,9 +29,9 @@
 <p align="right">
   <small>
     Enter system password
-    <input type="password" id="system_password" name="system_password">
+    <input type="password" id="system_password" name="system_password" />
     and
-    <input type="submit" value="Create Web">
+    <input type="submit" value="Create Web" />
   </small>
 </p>
 
diff --git a/app/views/wiki/recently_revised.rhtml b/app/views/wiki/recently_revised.rhtml
index ca9390d7..902db5ff 100755
--- a/app/views/wiki/recently_revised.rhtml
+++ b/app/views/wiki/recently_revised.rhtml
@@ -8,25 +8,25 @@
 </div>
 <% end %>
 
-<% revision_date = Date.new(2100) %>
-<ul>
-<% for page in @pages_by_revision %>
-  <% if page.revised_on < revision_date %>
-    </ul><b>
-    	<%= DateTime.new(page.revised_on.year, page.revised_on.mon, 
-                page.revised_on.day).strftime('%B %e, %Y') 
-         %>
-    </b><ul>
+<% unless @pages_by_revision.empty? %>
+  <% revision_date = @pages_by_revision.first.revised_on %>
+  <h3><%= revision_date.strftime('%B %e, %Y') %></h3>
+  <ul>
+  <% for page in @pages_by_revision %>
+    <% if page.revised_on < revision_date %>
+      <% revision_date = page.revised_on %>
+      </ul>
+      <h3><%= revision_date.strftime('%B %e, %Y') %></h3>
+      <ul>
+    <% end %>
+    <li>
+      <a href="../show/<%= page.name %>"><%= page.plain_name %></a>
+      <div class="byline" style="margin-bottom: 0px">
+        by <%= page.author_link %>
+        at <%= page.created_at.strftime "%H:%M" %>
+        <%= "from #{page.author.ip}" if page.author.respond_to?(:ip) %>
+      </div>
+    </li>
   <% end %>
-  
-  <li>
-    <a href="../show/<%= page.name %>"><%= page.plain_name %></a>
-    <div class="byline" style="margin-bottom: 0px">
-      by <%= page.author_link %>
-      at <%= page.created_at.strftime "%H:%M" %>
-      <%= "from #{page.author.ip}" if page.author.respond_to?(:ip) %>
-    </div>
-  </li>
-
-  <% revision_date = page.revised_on %>
+  </ul>
 <% end %>