further XML well-formedness fixes

This commit is contained in:
Alexey Verkhovsky 2005-01-23 17:05:28 +00:00
parent 685874da83
commit 805d4a829e
5 changed files with 52 additions and 38 deletions

View file

@ -13,9 +13,9 @@
<textarea name="content" style="width: 450px; height: 500px"><%= @page.content %></textarea> <textarea name="content" style="width: 450px; height: 500px"><%= @page.content %></textarea>
</p> </p>
<p> <p>
<input type="submit" value="Update"> as <input type="submit" value="Update" /> as
<input type="text" name="author" id="authorName" value="<%= @author %>" <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> | <a href="../cancel_edit/<%= @page.name %>">Cancel</a> <small>(unlocks page)</small>
</p> </p>
</form> </form>

View file

@ -11,8 +11,8 @@
<textarea name="content" style="width: 450px; height: 500px"></textarea> <textarea name="content" style="width: 450px; height: 500px"></textarea>
</p> </p>
<p> <p>
<input type="submit" value="Create"> as <input type="submit" value="Create" /> as
<input type="text" name="author" id="authorName" value="<%= @author %>" onClick="this.value == 'AnonymousCoward' ? this.value = '' : true"> <input type="text" name="author" id="authorName" value="<%= @author %>" onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
</p> </p>
</form> </form>

View file

@ -2,7 +2,8 @@
<p> <p>
Congratulations on succesfully installing and starting Instiki. 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> </p>
<form action="../create_system" id="setup" method="post" onSubmit="return validateSetup()"> <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> <h2 style="margin-bottom: 3px">Name and address for your first web</h2>
<div class="help"> <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>
<div class="inputBox"> <div class="inputBox">
Name: <input type="text" id="web_name" name="web_name" value="Wiki" onChange="proposeAddress();" Name: <input type="text" id="web_name" name="web_name" value="Wiki"
onClick="this.value == 'Wiki' ? this.value = '' : true"> &nbsp;&nbsp; onChange="proposeAddress();" onClick="this.value == 'Wiki' ? this.value = '' : true" />
Address: <input type="text" id="web_address" name="web_address" onChange="cleanAddress();" value="wiki"> &nbsp;&nbsp;
Address: <input type="text" id="web_address" name="web_address" onChange="cleanAddress();"
value="wiki" />
</div> </div>
</li> </li>
@ -27,14 +33,15 @@
Everyone with this password will be able to do this, so pick it carefully. Everyone with this password will be able to do this, so pick it carefully.
</div> </div>
<div class="inputBox"> <div class="inputBox">
Password: <input type="password" id="password" name="password"> &nbsp;&nbsp; Password: <input type="password" id="password" name="password" />
Verify: <input type="password" id="password_check" name="password_check"> &nbsp;&nbsp;
Verify: <input type="password" id="password_check" name="password_check" />
</div> </div>
</li> </li>
</ol> </ol>
<p align="right"> <p align="right">
<input type="submit" value="Setup" style="margin-left: 40px"> <input type="submit" value="Setup" style="margin-left: 40px" />
</p> </p>
</form> </form>

View file

@ -1,18 +1,25 @@
<% @title = "New Wiki Web"; @content_width = 500 %> <% @title = "New Wiki Web"; @content_width = 500 %>
<p> <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> </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"> <ol class="setup">
<li> <li>
<h2 style="margin-bottom: 3px">Name and address for your new web</h2> <h2 style="margin-bottom: 3px">Name and address for your new web</h2>
<div class="help"> <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>
<div class="inputBox"> <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();" /> Address: <input type="text" id="web_address" name="address" onChange="cleanAddress();" />
</div> </div>
</li> </li>
@ -22,9 +29,9 @@
<p align="right"> <p align="right">
<small> <small>
Enter system password Enter system password
<input type="password" id="system_password" name="system_password"> <input type="password" id="system_password" name="system_password" />
and and
<input type="submit" value="Create Web"> <input type="submit" value="Create Web" />
</small> </small>
</p> </p>

View file

@ -8,17 +8,17 @@
</div> </div>
<% end %> <% end %>
<% revision_date = Date.new(2100) %> <% unless @pages_by_revision.empty? %>
<% revision_date = @pages_by_revision.first.revised_on %>
<h3><%= revision_date.strftime('%B %e, %Y') %></h3>
<ul> <ul>
<% for page in @pages_by_revision %> <% for page in @pages_by_revision %>
<% if page.revised_on < revision_date %> <% if page.revised_on < revision_date %>
</ul><b> <% revision_date = page.revised_on %>
<%= DateTime.new(page.revised_on.year, page.revised_on.mon, </ul>
page.revised_on.day).strftime('%B %e, %Y') <h3><%= revision_date.strftime('%B %e, %Y') %></h3>
%> <ul>
</b><ul>
<% end %> <% end %>
<li> <li>
<a href="../show/<%= page.name %>"><%= page.plain_name %></a> <a href="../show/<%= page.name %>"><%= page.plain_name %></a>
<div class="byline" style="margin-bottom: 0px"> <div class="byline" style="margin-bottom: 0px">
@ -27,6 +27,6 @@
<%= "from #{page.author.ip}" if page.author.respond_to?(:ip) %> <%= "from #{page.author.ip}" if page.author.respond_to?(:ip) %>
</div> </div>
</li> </li>
<% end %>
<% revision_date = page.revised_on %> </ul>
<% end %> <% end %>