Pimki 1.7.092 → 1.8.092

data/app/views/wiki/mind.rhtml

@@ -1,70 +1,70 @@
-<% @title = "Mind Map"
-   #@hide_menu = true
-   #@style_additions = "#Container { width: 100%; } #Content { float: left; }"
-%>
-<%= sub_template "top" %>
-
-<h4>A "Mind Map" created from the Wiki links.</h4>
-<p style="font-size: 9px; margin-top: -20px; margin-bottom: 10px;">A printable version (just the image) can be found <a href="../get_map_img">here</a>.</p>
-
-<img src="../get_map_img" usemap="#graph.map" />
-<map name="graph.map" id="graph.map">
-<%= File.read(@mapFile) %>
-</map>
-
-<table border="0" width="100%">
-<form name="mapOpts" id="mapOpts" action="../mind/" method="post">
-  <tr style="font-weight:bold;">
-    <td>Graph Type</td>
-    <td style="width:200px">Layout Type</td>
-    <td style="width:500px">Content Options</td>
-    <td>Categories</td>
-  </tr>
-  <tr>
-    <td style="vertical-align:top;" width="30%">
-      <input type="radio" name="graph_type" value="normal"   <%= 'checked' if @graph_type == 'normal'   %>>Draw Normal Graph<br>
-      <input type="radio" name="graph_type" value="author"   <%= 'checked' if @graph_type == 'author'   %>>Draw Authors Graph<br>
-      <input type="radio" name="graph_type" value="category" <%= 'checked' if @graph_type == 'category' %>>Draw Category Graph<br>
-    </td>
-    <td width="100" style="vertical-align:top;" >
-      <input type="radio" name="draw_type" value="neato" <% if @prog == 'neato' %> checked <% end %>>Neato<br>
-      <input type="radio" name="draw_type" value="dot"   <% if @prog == 'dot'   %> checked <% end %>>Dot</br>
-      <input type="radio" name="draw_type" value="circo" <% if @prog == 'circo' %> checked <% end %>>Circo</br>
-      <input type="radio" name="draw_type" value="twopi" <% if @prog == 'twopi' %> checked <% end %>>Twopi</br>
-    </td>
-    <td style="vertical-align:top;width:400px;">
-      <input type="checkbox" id="show_authors" name="show_authors" <%= 'checked' if @req.query['show_authors'] == 'on' %>>Show author pages<br>
-      <input type="checkbox" id="missing"      name="missing" <%= 'checked' if @req.query['missing'] == 'on' %>>Show missing pages<br>
-      <input type="checkbox" id="show_leaves"  name="show_leaves"  <%= 'checked' if @req.query.empty? || @req.query['show_leaves'] == 'on' %>>Show leaf pages<br>
-    </td>
-    <td>
-      <select id="selected_categs" name="selected_categs" size="4" style="width:120px;" multiple>
-        <option value="all" <%= 'selected' if @selected_categories.empty? %>>&lt;all categories&gt;</option>
-        <option value="none" <%= 'selected' if @selected_categories.include? 'none' %>>&lt;no categories&gt;</option>
-        <% for category in @categories %>
-          <option value="<%= category %>" <%= 'selected' if @selected_categories.include? category %>><%= category %></option>
-        <% end %>
-      </select>
-    </td>
-   </tr>
-   <tr>
-     <td>Size: <input type="text" name="mind_map_size" id="mind_map_size" value="<%= @req.query['mind_map_size'] || web.mind_map_size %>"></td>
-     <td colspan='3' align='center'><input type="submit" value="Redraw" name="Go" onClick='return validateMMSize();'></td>
-   </tr>
-</form>
-</table>
-
-<p>Graphs generated with <a href='http://www.research.att.com/sw/tools/graphviz/'>GraphViz</a>. 
-
-<script>
-function validateMMSize() {
-  if (document.getElementById('mind_map_size').value != "" &&
-      !(/^\d+,\d+$/.test(document.getElementById('mind_map_size').value))) {
-    alert("The Mind Map size must be in the format of 'digit(s),digit(s)'!");
-    return false;
-  }
-  return true;
-}
-</script>
-<%= sub_template "bottom" %>
-
+<% @title = "Mind Map"
+   @hide_menu = true
+   @style_additions = "#Container { width: 100%; } #Content { float: left; width: 98% }"
+%>
+<%= sub_template "top" %>
+
+<h4>A "Mind Map" created from the Wiki links.</h4>
+<p style="font-size: 9px; margin-top: -20px; margin-bottom: 10px;">A printable version (just the image) can be found <a href="/<%= web.address %>/get_map_img">here</a>.</p>
+
+<img src="/<%= web.address %>/get_map_img" usemap="#graph.map" />
+<map name="graph.map" id="graph.map">
+<%= File.read(@mapFile) %>
+</map>
+
+<table border="0" width="100%">
+<form name="mapOpts" id="mapOpts" action="../mind/" method="post">
+  <tr style="font-weight:bold;">
+    <td>Graph Type</td>
+    <td style="width:200px">Layout Type</td>
+    <td style="width:500px">Content Options</td>
+    <td>Categories</td>
+  </tr>
+  <tr>
+    <td style="vertical-align:top;" width="30%">
+      <input type="radio" name="graph_type" value="normal"   <%= 'checked' if @graph_type == 'normal'   %>>Draw Normal Graph<br>
+      <input type="radio" name="graph_type" value="author"   <%= 'checked' if @graph_type == 'author'   %>>Draw Authors Graph<br>
+      <input type="radio" name="graph_type" value="category" <%= 'checked' if @graph_type == 'category' %>>Draw Category Graph<br>
+    </td>
+    <td width="100" style="vertical-align:top;" >
+      <input type="radio" name="draw_type" value="neato" <% if @prog == 'neato' %> checked <% end %>>Neato<br>
+      <input type="radio" name="draw_type" value="dot"   <% if @prog == 'dot'   %> checked <% end %>>Dot</br>
+      <input type="radio" name="draw_type" value="circo" <% if @prog == 'circo' %> checked <% end %>>Circo</br>
+      <input type="radio" name="draw_type" value="twopi" <% if @prog == 'twopi' %> checked <% end %>>Twopi</br>
+    </td>
+    <td style="vertical-align:top;width:400px;">
+      <input type="checkbox" id="show_authors" name="show_authors" <%= 'checked' if @req.query['show_authors'] == 'on' %>>Show author pages<br>
+      <input type="checkbox" id="missing"      name="missing" <%= 'checked' if @req.query['missing'] == 'on' %>>Show missing pages<br>
+      <input type="checkbox" id="show_leaves"  name="show_leaves"  <%= 'checked' if @req.query.empty? || @req.query['show_leaves'] == 'on' %>>Show leaf pages<br>
+    </td>
+    <td>
+      <select id="selected_categs" name="selected_categs" size="4" style="width:120px;" multiple>
+        <option value="all" <%= 'selected' if @selected_categories.empty? %>>&lt;all categories&gt;</option>
+        <option value="none" <%= 'selected' if @selected_categories.include? 'none' %>>&lt;no categories&gt;</option>
+        <% for category in @categories %>
+          <option value="<%= category %>" <%= 'selected' if @selected_categories.include? category %>><%= category %></option>
+        <% end %>
+      </select>
+    </td>
+   </tr>
+   <tr>
+     <td>Size: <input type="text" name="mind_map_size" id="mind_map_size" value="<%= @req.query['mind_map_size'] || web.mind_map_size %>"></td>
+     <td colspan='3' align='center'><input type="submit" value="Redraw" name="Go" onClick='return validateMMSize();'></td>
+   </tr>
+</form>
+</table>
+
+<p>Graphs generated with <a href='http://www.research.att.com/sw/tools/graphviz/'>GraphViz</a>. 
+
+<script>
+function validateMMSize() {
+  if (document.getElementById('mind_map_size').value != "" &&
+      !(/^\d+,\d+$/.test(document.getElementById('mind_map_size').value))) {
+    alert("The Mind Map size must be in the format of 'digit(s),digit(s)'!");
+    return false;
+  }
+  return true;
+}
+</script>
+<%= sub_template "bottom" %>
+

data/app/views/wiki/new.rhtml

@@ -1,33 +1,35 @@
-<% 
-  @title = "Creating #{WikiWords.separate(CGI.unescape(@page_name))}"
-  @content_width = 800
-  @hide_navigation = true
-  @hide_menu = true
-  @style_additions = "#Container, #Content {padding-left:100px;}"
-%>
-<%= sub_template "top" %>
-
-<%= render_markup_help %>
-
-<form action="../save/<%= @page_name %>" method="post" onSubmit="cleanAuthorName();">
-<p>
-    <textarea name="content" style="width: 550px; height: 430px"></textarea>
-</p>
-<p>
-    <% if @web.check_pass_on_edit %>
-      Please enter edit password: <input type="password" name="password" id="password"><br />
-    <% end %>
-    <input type="submit" value="Create"> as 
-    <input type="text" name="author" id="authorName" value="<%= @author %>" onClick="this.value == 'AnonymousCoward' ? this.value = '' : true">
-</p>
-</form>
-
-<script language="JavaScript1.2">
-function cleanAuthorName() {
-  if (document.getElementById('authorName').value == "") {
-    document.getElementById('authorName').value = 'AnonymousCoward';
-  }
-}
-</script>
-
+<% 
+  @title = "Creating #{WikiWords.separate(CGI.unescape(@page_name))}"
+  @content_width = 800
+  @hide_navigation = true
+  @hide_menu = true
+  @style_additions = "#Container, #Content {padding-left:100px;}"
+%>
+<%= sub_template "top" %>
+
+<%= render_markup_help %>
+
+<form action="../save/<%= @page_name %>" method="post" onSubmit="cleanAuthorName();">
+<p>
+    <textarea name="content" style="width: 550px; height: 75%"></textarea>
+</p>
+<p>
+    <% if @web.check_pass_on_edit %>
+      Please enter edit password: <input type="password" name="password" id="password"><br />
+    <% end %>
+    <input type="submit" value="Create"> as 
+    <input type="text" name="author" id="authorName" value="<%= @author %>" onClick="this.value == 'AnonymousCoward' ? this.value = '' : true">
+    |
+    <a href='../list/'>Cancel</a>
+</p>
+</form>
+
+<script language="JavaScript1.2">
+function cleanAuthorName() {
+  if (document.getElementById('authorName').value == "") {
+    document.getElementById('authorName').value = 'AnonymousCoward';
+  }
+}
+</script>
+
 <%= sub_template "bottom" %>

data/app/views/wiki/published.rhtml

@@ -1,50 +1,35 @@
-<%
-  @title = @page.plain_name
-  @hide_navigation = true
-  @style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
-                      #Container, #Content { width: 600px; padding-left: 180px;}"
-  @inline_style = true
-%>
-<%= sub_template "top" %>
-
-<div id="revision">
-<%= @page.display_published %>
-</div>
-
-<div class="byline">
-  <%= @page.revisions? ? "Revised" : "Created" %> on <%= @page.pretty_created_at %> 
-  by
-  <%= @page.author_link({ :mode => :export }) %>
-</div>
-
-<div class="navigation">
-  <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(", ").gsub('/show/', '/published/') %>
-    </small>
-  <% end %>
-
-  <!-- TODO: fix this one the Bliki has a published interface
-  <% if @page.bliki_references.length > 0 %>
-    <small>
-      <br />| Bliki Linked from: <%= @page.bliki_references.collect { |ref| link_to_bliki(ref) }.join(", ") %>
-    </small>
-  <% end %>
-  -->
-
-  <br />
-  <!-- TODO: fix this one the published interface is better for all special templates.
-    <%= 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" %>
-  -->
-</div>
-
+<%
+  @title = @page.plain_name
+  @hide_navigation = true
+  @style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
+                      #Container, #Content { width: 600px; padding-left: 180px;}"
+  @inline_style = true
+%>
+<%= sub_template "top" %>
+
+<div id="revision">
+<%= @page.display_published %>
+</div>
+
+<div class="byline">
+  <%= @page.revisions? ? "Revised" : "Created" %> on <%= @page.pretty_created_at %> 
+  by
+  <%= @page.author_link({ :mode => :publish }) %>
+</div>
+
+<div class="navigation">
+  <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(", ").gsub('/show/', '/published/') %>
+    </small>
+  <% end %>
+</div>
+
 <%= sub_template "bottom" %>

data/app/views/wiki/revision.rhtml

@@ -1,87 +1,88 @@
-<% @title = "#{@page.plain_name} (Rev ##{@revision.number})" %><%= sub_template "top" %>
-
-<div id="revision">
-  <%= @revision.display_content %>
-</div>
-
-<div id="changes" style="display: none">
-  <p style="background: #eee; padding: 3px; border: 1px solid silver">
-    <small>
-      Showing changes from revision #<%= @revision.number - 1 %> to #<%= @revision.number %>:
-      <ins class="diffins">Added</ins> | <del class="diffdel">Removed</del>
-    </small>
-  </p>
-
-  <%= @revision.display_diff %>
-</div>
-
-
-<div class="byline">
-  <%= "Revision from #{@revision.pretty_created_at} by" %>
-  <%= @page.web.make_link(@revision.author) %>
-</div>
-
-<div class="navigation">
-
-  <% if @revision.previous_revision %>
-    <a href="../revision/<%= @page.name %>?rev=<%= @revision.previous_revision.number %>" class="navlink">Back in time</a>
-    (<%= @revision.previous_revision.number + 1 %> more)
-  <% end %>
-
-  <% if @revision.next_revision && @revision.previous_revision %>
-    |
-  <% end %>
-
-  <% if @revision.next_revision %>
-    <% if @revision.next_revision.number < (@page.revisions.length - 1) %>
-      <a href="../revision/<%= @page.name %>?rev=<%= @revision.next_revision.number %>" class="navlink">
-    <% else %>
-      <a href="../show/<%= @page.name %>" class="navlink">
-    <% end %>
-      Forward in time</a>
-    (<%= @revision.page.revisions.length - @revision.next_revision.number %> more)
-  <% end %>
-
-  | <a href="../show/<%= @page.name %>" class="navlink">Show current</a>
-
-  <% if @revision.previous_revision %>
-    <span id="show_changes">
-      | <a href="#" onClick="toggleChanges(); return false;">Show changes</a>
-    </span>
-    <span id="hide_changes" style="display: none">
-      | <a href="#" onClick="toggleChanges(); return false;">Hide changes</a>
-    </span>
-  <% end %>
-
-  | <a href="../rollback/<%= @page.name %>?rev=<%= @revision.number %>" class="navlink">Rollback</a>  
-  
-  <% if @page.references.length > 0 %>
-    <small>
-      | Linked from: <%= @page.references.collect { |ref| "<a href='#{ref.name}'>#{ref.name}</a>" }.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 %>
-</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" %>
+<% @title = "#{@page.plain_name} (Rev ##{@revision.number})" %><%= sub_template "top" %>
+
+<div id="revision">
+  <%= @revision.display_content %>
+</div>
+
+<div id="changes" style="display: none">
+  <p style="background: #eee; padding: 3px; border: 1px solid silver">
+    <small>
+      Showing changes from revision #<%= @revision.number - 1 %> to #<%= @revision.number %>:
+      <ins class="diffins">Added</ins> | <del class="diffdel">Removed</del>
+    </small>
+  </p>
+
+  <%= @revision.display_diff %>
+</div>
+
+
+<div class="byline">
+  <%= "Revision from #{@revision.pretty_created_at} by" %>
+  <%= @page.web.make_link(@revision.author) %>
+</div>
+
+<div class="navigation">
+
+  <% if @revision.previous_revision %>
+    <a href="../revision/<%= @page.name %>?rev=<%= @revision.previous_revision.number %>" class="navlink">Back in time</a>
+    (<%= @revision.previous_revision.number + 1 %> more)
+  <% end %>
+
+  <% if @revision.next_revision && @revision.previous_revision %>
+    |
+  <% end %>
+
+  <% if @revision.next_revision %>
+    <% if @revision.next_revision.number < (@page.revisions.length - 1) %>
+      <a href="../revision/<%= @page.name %>?rev=<%= @revision.next_revision.number %>" class="navlink">
+    <% else %>
+      <a href="../show/<%= @page.name %>" class="navlink">
+    <% end %>
+      Forward in time</a>
+    (<%= @revision.page.revisions.length - @revision.next_revision.number %> more)
+  <% end %>
+
+  | <a href="../show/<%= @page.name %>" class="navlink">Show current</a>
+
+  <% if @revision.previous_revision %>
+    <span id="show_changes">
+      | <a href="#" onClick="toggleChanges(); return false;">Show changes</a>
+    </span>
+    <span id="hide_changes" style="display: none">
+      | <a href="#" onClick="toggleChanges(); return false;">Hide changes</a>
+    </span>
+  <% end %>
+
+  | <a href="../rollback/<%= @page.name %>?rev=<%= @revision.number %>" class="navlink">Rollback</a>  
+  
+  <% if @page.references.length > 0 %>
+    <small>
+      | Linked from: <%= @page.references.collect { |ref| "<a href='#{ref.name}'>#{ref.name}</a>" }.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 %>
+</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";
+    }
+  }
+  toggleChanges();
+</script>
+
+<%= sub_template "bottom" %>