Pimki 1.3.092 → 1.4.092

data/app/views/wiki/new_web.rhtml

@@ -1,64 +1,64 @@
-<% @title = "New Wiki Web"; @content_width = 500 %><%= sub_template "top" %>
-
-<p>
-  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()">
-<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.
-    </div>
-    <div class="inputBox">
-      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>
-</ol>
-
-
-<p align="right">
-  <small>
-    Enter system password
-    <input type="password" id="system_password" name="system_password">
-    and
-    <input type="submit" value="Create Web">
-  </small>
-</p>
-
-</form>
-
-<script>
-function proposeAddress() {
-  document.getElementById('web_address').value =
-    document.getElementById('web_name').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
-}
-
-function cleanAddress() {
-  document.getElementById('web_address').value =
-    document.getElementById('web_address').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
-}
-
-function validateSetup() {
-  if (document.getElementById('web_name').value == "") {
-    alert("You must pick a name for the new web");
-    return false;
-  }
-  
-  if (document.getElementById('web_address').value == "") {
-    alert("You must pick an address for the new web");
-    return false;
-  }
-  
-  if (document.getElementById('system_password').value == "") {
-    alert("You must enter the system password");
-    return false;
-  }
-  
-  return true;
-}
-</script>
-
+<% @title = "New Wiki Web"; @content_width = 500 %><%= sub_template "top" %>
+
+<p>
+  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()">
+<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.
+    </div>
+    <div class="inputBox">
+      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>
+</ol>
+
+
+<p align="right">
+  <small>
+    Enter system password
+    <input type="password" id="system_password" name="system_password">
+    and
+    <input type="submit" value="Create Web">
+  </small>
+</p>
+
+</form>
+
+<script>
+function proposeAddress() {
+  document.getElementById('web_address').value =
+    document.getElementById('web_name').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
+}
+
+function cleanAddress() {
+  document.getElementById('web_address').value =
+    document.getElementById('web_address').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
+}
+
+function validateSetup() {
+  if (document.getElementById('web_name').value == "") {
+    alert("You must pick a name for the new web");
+    return false;
+  }
+  
+  if (document.getElementById('web_address').value == "") {
+    alert("You must pick an address for the new web");
+    return false;
+  }
+  
+  if (document.getElementById('system_password').value == "") {
+    alert("You must enter the system password");
+    return false;
+  }
+  
+  return true;
+}
+</script>
+
 <%= sub_template "bottom" %>

data/app/views/wiki/page.rhtml

@@ -1,83 +1,89 @@
-<% @title = @page.plain_name %>
-<%= sub_template "top" %>
-
-<div id="revision">
-  <%= @page.display_content %>
-</div>
-
-<div id="changes" style="display: none">
-  <p style="background: #eee; padding: 3px; border: 1px solid silver">
-    <small>
-      Showing changes from revision #<%= @page.number - 1 %> to #<%= @page.number %>:
-      <ins class="diffins">Added</ins> | <del class="diffdel">Removed</del>
-    </small>
-  </p>
-
-  <%= @page.display_diff %>
-</div>
-
-<div class="byline">
-  <%= @page.revisions? ? "Revised" : "Created" %> on <%= @page.pretty_created_at %> 
-  by <%= @page.author_link %>
-  <%= "(#{@page.author.ip})" if @page.author.respond_to?(:ip) %>
-  <% if @web.count_pages %>
-    <% total_chars = @page.content.length %>
-    (<%= total_chars %> characters / <%= sprintf("%-.1f", (total_chars / 2275 rescue 0)) %> pages)
-  <% end %>
-</div>
-
-<div class="navigation">
-  <a href="../edit/<%= @page.name %>" class="navlink" accesskey="E">Edit Page</a>
-
-  <% if @page.revisions.length > 1 %>
-    | <a href="../revision/<%= @page.name %>?rev=<%= @page.revisions.length - 2 %>" class="navlink" accesskey="R">Back in time</a> 
-    <small>(<%= @page.revisions.length - 1 %> revisions)</small>
-  <% end %>
-
-  <% if @page.revisions.length > 1 %>
-    <span id="show_changes">
-      | <a href="#" onClick="toggleChanges(); return false;">See changes</a>
-    </span>
-    <span id="hide_changes" style="display: none">
-      | <a href="#" onClick="toggleChanges(); return false;">Hide changes</a>
-    </span>
-  <% end %>
-
-  <small>
-    | Views: <a href="../print/<%= @page.name %>">Print</a>
-  <% if OPTIONS[:pdflatex] && @web.markup == :textile %>
-    | <a href="../tex/<%= @page.name %>">TeX</a> | <a href="../pdf/<%= @page.name %>">PDF</a>
-  <% end %>
-  </small>
-
-  <% if @page.references.length > 0 %>
-    <small>
-      | Linked from: <%= @page.references.collect { |ref| ref.link }.join(", ") %>
-    </small>
-  <% end %>
-
-  <% if @page.name == "HomePage" %>
-    <br /><a href="../edit_web/" class="navlink">Edit Web</a>
-    | <%= list_item "Authors", "../authors/", "Who wrote what" %> 
-    | <%= list_item "Feeds", "../feeds/", "Subscribe to changes by RSS" %> 
-    | <%= list_item "Export", "../export/", "Download a zip with all the pages in this wiki", "X" %>
-  <% end %>
-</div>
-
-<script language="Javascript">
-  function toggleChanges() {
-    if (document.getElementById("changes").style.display == "none") {
-      document.getElementById("changes").style.display  = "block";
-      document.getElementById("revision").style.display = "none";
-      document.getElementById("show_changes").style.display  = "none";
-      document.getElementById("hide_changes").style.display = "inline";
-    } else {
-      document.getElementById("changes").style.display  = "none";
-      document.getElementById("revision").style.display = "block";
-      document.getElementById("show_changes").style.display  = "inline";
-      document.getElementById("hide_changes").style.display = "none";
-    }
-  }
-</script>
-
+<% @title = @page.plain_name %>
+<%= sub_template "top" %>
+
+<div id="revision">
+  <%= @page.display_content %>
+</div>
+
+<div id="changes" style="display: none">
+  <p style="background: #eee; padding: 3px; border: 1px solid silver">
+    <small>
+      Showing changes from revision #<%= @page.number - 1 %> to #<%= @page.number %>:
+      <ins class="diffins">Added</ins> | <del class="diffdel">Removed</del>
+    </small>
+  </p>
+
+  <%= @page.display_diff %>
+</div>
+
+<div class="byline">
+  <%= @page.revisions? ? "Revised" : "Created" %> on <%= @page.pretty_created_at %> 
+  by <%= @page.author_link %>
+  <%= "(#{@page.author.ip})" if @page.author.respond_to?(:ip) %>
+  <% if @web.count_pages %>
+    <% total_chars = @page.content.length %>
+    (<%= total_chars %> characters / <%= sprintf("%-.1f", (total_chars / 2275 rescue 0)) %> pages)
+  <% end %>
+</div>
+
+<div class="navigation">
+  <a href="../edit/<%= @page.name %>" class="navlink" accesskey="E">Edit Page</a>
+
+  <% if @page.revisions.length > 1 %>
+    | <a href="../revision/<%= @page.name %>?rev=<%= @page.revisions.length - 2 %>" class="navlink" accesskey="R">Back in time</a> 
+    <small>(<%= @page.revisions.length - 1 %> revisions)</small>
+  <% end %>
+
+  <% if @page.revisions.length > 1 %>
+    <span id="show_changes">
+      | <a href="#" onClick="toggleChanges(); return false;">See changes</a>
+    </span>
+    <span id="hide_changes" style="display: none">
+      | <a href="#" onClick="toggleChanges(); return false;">Hide changes</a>
+    </span>
+  <% end %>
+
+  <small>
+    | Views: <a href="../print/<%= @page.name %>">Print</a>
+  <% if OPTIONS[:pdflatex] && @web.markup == :textile %>
+    | <a href="../tex/<%= @page.name %>">TeX</a> | <a href="../pdf/<%= @page.name %>">PDF</a>
+  <% end %>
+  </small>
+
+  <% if @page.references.length > 0 %>
+    <small>
+      <br />| Linked from: <%= @page.references.collect { |ref| ref.link }.join(", ") %>
+    </small>
+  <% end %>
+
+  <% if @page.bliki_references.length > 0 %>
+    <small>
+      <br />| Bliki Linked from: <%= @page.bliki_references.collect { |ref| link_to_bliki(ref) }.join(", ") %>
+    </small>
+  <% end %>
+
+  <% if @page.name == "HomePage" %>
+    <br /><a href="../edit_web/" class="navlink">Edit Web</a>
+    | <%= list_item "Authors", "../authors/", "Who wrote what" %> 
+    | <%= list_item "Feeds", "../feeds/", "Subscribe to changes by RSS" %> 
+    | <%= list_item "Export", "../export/", "Download a zip with all the pages in this wiki", "X" %>
+  <% end %>
+</div>
+
+<script language="Javascript">
+  function toggleChanges() {
+    if (document.getElementById("changes").style.display == "none") {
+      document.getElementById("changes").style.display  = "block";
+      document.getElementById("revision").style.display = "none";
+      document.getElementById("show_changes").style.display  = "none";
+      document.getElementById("hide_changes").style.display = "inline";
+    } else {
+      document.getElementById("changes").style.display  = "none";
+      document.getElementById("revision").style.display = "block";
+      document.getElementById("show_changes").style.display  = "inline";
+      document.getElementById("hide_changes").style.display = "none";
+    }
+  }
+</script>
+
 <%= sub_template "bottom" %>

data/app/views/wiki/print.rhtml

@@ -1,16 +1,16 @@
-<% 
-  @title = @page.plain_name
-  @hide_navigation = true
-  @style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
-  @inline_style = true
-%><%= sub_template "top" %>
-
-<%= @page.display_content_for_export %>
-
-<div class="byline">
-  <%= @page.revisions? ? "Revised" : "Created" %> on <%= @page.pretty_created_at %> 
-  by
-  <%= @page.author_link({ :mode => :export }) %>
-</div>
-
+<% 
+  @title = @page.plain_name
+  @hide_navigation = true
+  @style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
+  @inline_style = true
+%><%= sub_template "top" %>
+
+<%= @page.display_content_for_export %>
+
+<div class="byline">
+  <%= @page.revisions? ? "Revised" : "Created" %> on <%= @page.pretty_created_at %> 
+  by
+  <%= @page.author_link({ :mode => :export }) %>
+</div>
+
 <%= sub_template "bottom" %>

data/app/views/wiki/published.rhtml

@@ -1,7 +1,8 @@
 <%
   @title = @page.plain_name
   @hide_navigation = true
-  @style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
+  @style_additions = ".newWikiWord { background-color: white; font-style: italic; }
+                      #Container, #Content { width: 600px; padding-left: 180px;}"
   @inline_style = true
 %><%= sub_template "top" %>
 

data/app/views/wiki/recently_revised.rhtml

@@ -1,31 +1,31 @@
-<% @title = "Recently Revised" %>
-<%= sub_template "top" %>
-
-<% unless @categories.empty? %>
-<div id="categories">
-  <strong>Categories</strong>: 
-  [<a href=".">Any</a>]
-  <%= @category_links.join(', ') %>
-</div>
-<% end %>
-
-<% revision_date = Date.new(2100) %>
-<ul>
-<% for page in @pages_by_revision %>
-  <% if page.revised_on < revision_date %>
-    </ul><b><%= page.pretty_revised_on %></b><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>
-
-  <% revision_date = page.revised_on %>
-<% end %>
-
-<%= sub_template "bottom" %>
+<% @title = "Recently Revised" %>
+<%= sub_template "top" %>
+
+<% unless @categories.empty? %>
+<div id="categories">
+  <strong>Categories</strong>: 
+  [<a href=".">Any</a>]
+  <%= @category_links.join(', ') %>
+</div>
+<% end %>
+
+<% revision_date = Date.new(2100) %>
+<ul>
+<% for page in @pages_by_revision %>
+  <% if page.revised_on < revision_date %>
+    </ul><b><%= page.pretty_revised_on %></b><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>
+
+  <% revision_date = page.revised_on %>
+<% end %>
+
+<%= sub_template "bottom" %>

data/app/views/wiki/revision.rhtml

@@ -53,7 +53,7 @@
     </span>
   <% end %>
 
-  | <a href="#" class="navlink" onClick="confirmRollback(); return false;">Rollback</a>  
+  | <a href="../rollback/<%= @page.name %>?rev=<%= @revision.number %>" class="navlink">Rollback</a>  
   
   <% if @page.references.length > 0 %>
     <small>
@@ -76,12 +76,6 @@
       document.getElementById("hide_changes").style.display = "none";
     }
   }
-  
-  function confirmRollback() {
-    if (confirm('Are you sure you want reset the page to this revision?')) {
-      location.href = '../rollback/<%= @page.name %>?rev=<%= @revision.number %>';
-    }
-  }
 </script>
 
 <%= sub_template "bottom" %>

data/app/views/wiki/rollback.rhtml

@@ -0,0 +1,31 @@
+<% 
+  @title = "Rollback to #{@page.plain_name} Rev ##{@revision.number}"
+  @content_width = 720
+  @hide_navigation = true
+%><%= sub_template "top" %>
+
+<%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>
+
+<form id="editForm" action="../save/<%= @page.name %>" method="post" onSubmit="cleanAuthorName();">
+<p>
+  <textarea name="content" style="font-size: 12px; width: 450px; height: 500px"><%= @revision.content %></textarea>
+</p>
+<p>
+    <input type="submit" value="Update"> as 
+    <input type="text" name="author" id="authorName" value="<%= @author %>" 
+        onClick="this.value == 'AnonymousCoward' ? this.value = '' : true">
+    | <a href="../cancel_edit/<%= @page.name %>">Cancel</a> <small>(unlocks page)</small>
+</p>
+</form>
+
+<%= render_markup_help %>
+
+<script language="JavaScript1.2">
+function cleanAuthorName() {
+  if (document.getElementById('authorName').value == "") {
+    document.getElementById('authorName').value = 'AnonymousCoward';
+  }
+}
+</script>
+
+<%= sub_template "bottom" %>