Pimki 1.3.092 → 1.4.092

data/app/views/wiki/edit_web.rhtml

@@ -24,7 +24,7 @@
   <div class="inputBox">
     Markup:
     <select name="markup">
-      <%= html_options({ "Textile" => :textile, "Markdown" => :markdown, "RDoc" => :rdoc }, @web.markup) %>
+      <%= html_options({ "Textile" => :textile, "Markdown via RedCloth (experimental)" => :red_markdown, "Markdown via BlueCloth" => :blue_markdown, "RDoc" => :rdoc }, @web.markup) %>
     </select>
 
     &nbsp;&nbsp;
@@ -56,11 +56,13 @@
 
   <h2 style="margin-bottom: 3px">Password protection for this web (<%= @web.name %>)</h2>
   <div class="help">
-    This is the password that visitors need to view and edit this web. Setting the password to nothing will remove the password protection.
+    This is the password that visitors need to login to view and edit this web. Setting the password to nothing will remove the password protection.
   </div>
   <div class="inputBox">
     Password: <input type="password" id="password" name="password" value="<%= @web.password %>"> &nbsp;&nbsp;
-    Verify: <input type="password" id="password_check" value="<%= @web.password %>" name="password_check">
+    Verify: <input type="password" id="password_check" value="<%= @web.password %>" name="password_check"><br />
+    <input type="radio" id="check_pass_on_edit" name="check_pass_on_edit" value='each_edit' <%= 'checked' if @web.check_pass_on_edit %>>Require password for each edit
+    <input type="radio" id="check_pass_on_edit" name="check_pass_on_edit" value='login_only' <%= 'checked' if @web.check_pass_on_edit %>>Require password once on logon
   </div>
 
   <h2 style="margin-bottom: 3px">Publish read-only version of this web (<%= @web.name %>)</h2>
@@ -72,18 +74,63 @@
     <input type="checkbox" name="published"<%= " CHECKED" if @web.published %>> Publish this web
   </div>
 
-  <h2 style="margin-bottom: 3px">Customise this PIM (<%= @web.name %>)</h2>
+  <h2 style="margin-bottom: 3px">Customise this PIM</h2>
   <div class="help">
-    Here are a few setting you can use to tweak the appearance of your Pimki.
+    Here are a few setting you can use to tweak the appearance and behaviour of your Pimki.
   </div>
   <div class="inputBox">
+    <h4>Interface Options</h4>
+    <input type="checkbox" name="enable_dclick_edit" <%= "checked" if @web.enable_dclick_edit %>> Edit page on double click.
+    
+    <h4>Mind Map</h4>
+    <i>Size</i>:<br />
     Limit the size of the Mind Map image. Format is "width,height" in inches. Leave blank for no size limit.<br />
     <input type="text" name="mind_map_size" id="mind_map_size" value="<%= web.mind_map_size %>">
+    <table>
+      <tr style="font-style:italic;">
+        <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 @show_authors %>>Show author pages<br>
+          <input type="checkbox" id="missing"      name="missing" <%= 'checked' if @missing %>>Show missing pages<br>
+          <input type="checkbox" id="show_leaves"  name="show_leaves"  <%= 'checked' if @show_leaves %>>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>
+     </table>
+
 
     <!--
 
     <br /><br />
-
+    <h4>Bliki Options</h4>
+    
+    <br /><br />
+    <h4>Content & Symbols mapping</h4>
+    
     Extra special symbols. The format of the map is: "code=text" on separate lines. This will map an element of <i>&lt;:code&gt;</i> to <i>text</i>, e.g. &lt;:cbx&gt; is mapped to &lt;input type="checkbox" disabled /&gt;<br />
     <textarea name="symbols_map" id="symbols_map" style="width: 100%; height: 100px"></textarea>
 
@@ -93,18 +140,18 @@
     <textarea name="links_map" id="links_map" style="width: 100%; height: 100px"></textarea>
    
     -->
-</div>
-
-<p align="right">
-  <small>
-    Enter system password
-    <input type="password" id="system_password" name="system_password">
-    and
-    <input type="submit" value="Update Web">
-    <br/><br/>
-    ...or forget changes and <a href="/new_web/">create a new web</a>
-  </small>
-</p>
+  </div>
+  
+  <p align="right">
+    <small>
+      Enter system password
+      <input type="password" id="system_password" name="system_password">
+      and
+      <input type="submit" value="Update Web">
+      <br/><br/>
+      ...or forget changes and <a href="/new_web/">create a new web</a>
+    </small>
+  </p>
 
 </form>
 

data/app/views/wiki/export.rhtml

@@ -1,14 +1,14 @@
-<% @title = "Export" %><%= sub_template "top" %>
-
-<p>You can export all the pages in this web as a zip file in either HTML (with working links and all) or the pure markup (to import in another wiki).</p> 
-
-<ul id="feedsList">
-  <li><a href="../export_html">HTML</a>
-  <li><a href="../export_markup">Markup (<%= @web.markup %>)</a>
-<% if OPTIONS[:pdflatex] && @web.markup == :textile %>
-  <li><a href="../export_tex">TeX</a>
-  <li><a href="../export_pdf">PDF</a>
-<% end %>
-</ul>
-
-<%= sub_template "bottom" %>
+<% @title = "Export" %><%= sub_template "top" %>
+
+<p>You can export all the pages in this web as a zip file in either HTML (with working links and all) or the pure markup (to import in another wiki).</p> 
+
+<ul id="feedsList">
+  <li><a href="../export_html">HTML</a>
+  <li><a href="../export_markup">Markup (<%= @web.markup %>)</a>
+<% if OPTIONS[:pdflatex] && @web.markup == :textile %>
+  <li><a href="../export_tex">TeX</a>
+  <li><a href="../export_pdf">PDF</a>
+<% end %>
+</ul>
+
+<%= sub_template "bottom" %>

data/app/views/wiki/feeds.rhtml

@@ -1,10 +1,10 @@
-<% @title = "Feeds" %><%= sub_template "top" %>
-
-<p>You can subscribe to this wiki by RSS and get either just the headlines of the pages that change or the entire page.</p> 
-
-<ul id="feedsList">
-  <li><a href="../rss_with_content<%= "?password=#{web.password}" if web.password %>">Full content (RSS 2.0)</a>
-  <li><a href="../rss_with_headlines<%= "?password=#{web.password}" if web.password %>">Headlines (RSS 2.0)</a>
-</ul>
-
-<%= sub_template "bottom" %>
+<% @title = "Feeds" %><%= sub_template "top" %>
+
+<p>You can subscribe to this wiki by RSS and get either just the headlines of the pages that change or the entire page.</p> 
+
+<ul id="feedsList">
+  <li><a href="../rss_with_content<%= "?password=#{web.password}" if web.password %>">Full content (RSS 2.0)</a>
+  <li><a href="../rss_with_headlines<%= "?password=#{web.password}" if web.password %>">Headlines (RSS 2.0)</a>
+</ul>
+
+<%= sub_template "bottom" %>

data/app/views/wiki/list.rhtml

@@ -3,21 +3,22 @@
 
 <% unless @categories.empty? %>
 <div id="categories">
-  <strong>Categories</strong>:
+  <p><strong>Categories</strong>:
   
   <% if @params["category"].nil? %>
-    [Any]
+    [<span class='selected'>Any</span>]
   <% else %>
     <a href=".">Any</a>
   <% end %>
   
   <% if @params["category"] == 'none' %>
-    [None]
+    [<span class='selected'>None</span>]
   <% else %>
     <a href="?category=none">None</a>
   <% end %>
 
   <%= @category_links.join(', ') %>
+  </p>
 </div>
 <% end %>
 
@@ -103,8 +104,13 @@
   <h2>Page Administration</h2>
     
   <table border="0" style="font-size:10px">
-    <!-- Delete Page -->
-    <form class="navigation" action="list/" action="get" onSubmit="return validateSelection('sel_delete') && verifyDelete();">
+    <form class="navigation" action="list/" action="get">
+      <% if @web.check_pass_on_edit %>
+        <tr>
+          <td colspan="2">Enter edit Password <input type="password" name="password" id="password" size="11"> and...</td>
+        </tr>
+      <% end %>
+      <!-- Delete Page -->
       <tr>
         <td>Delete page:</td>
         <td><select id="sel_delete" name="sel_page_name" size="1" style="width:195">
@@ -118,12 +124,10 @@
       <tr>
         <td>&nbsp;</td>
         <td align="right">
-          <input type="submit" name="Action" value="Delete">
+          <input type="submit" name="Action" value="Delete" onClick="return validateSelection('sel_delete') && verifyDelete();">
         </td>
       </tr>
-    </form>
-    <!-- Rename Page -->
-    <form class="navigation" action="../list/" action="get" onSubmit="return validateSelection('sel_rename') && verifyRename() && validatePageName('ren_newpage');">
+      <!-- Rename Page -->
       <tr>
         <td>Rename:</td>
         <td><select id="sel_rename" name="sel_page_name" size="1" style="width:195">
@@ -143,22 +147,20 @@
       <tr>
         <td>&nbsp;</td>
         <td  align="right">
-          <input type="submit" name="Action" value="Rename">
+          <input type="submit" name="Action" value="Rename" onClick="return validateSelection('sel_rename') && verifyRename() && validatePageName('ren_newpage');">
         </td>
       </tr>
-    </form>
-    <!-- Create Page -->
-    <form class="navigation" action="../list/" action="get" onSubmit="return validatePageName('newpage');">
+      <!-- Create Page -->
       <tr>
         <td>Create New Page:</td>
         <td>
-          <input type="text" name="newpage" id="newpage"  size="28">
+          <input type="text" name="newpage" id="newpage" size="28">
         </td>
       </tr>
       <tr>
         <td>&nbsp;</td>
         <td  align="right">
-          <input type="submit" name="Action" value="Create">
+          <input type="submit" name="Action" value="Create" onClick="return validatePageName('newpage');">
         </td>
         </td>
       </tr>

data/app/views/wiki/locked.rhtml

@@ -1,14 +1,14 @@
-<% @title = "#{@page.plain_name} is locked" %><%= sub_template "top" %>
-
-<% if @page.lock_duration(Time.now) == 0 %>
-  <p><%= @page.locked_by_link %> just started editing this page.</p>
-<% else %>
-  <p><%= @page.locked_by_link %> has been editing this page for <%= @page.lock_duration(Time.now) %> minutes.</p>
-<% end %>
-
-<p>
-  <a href="<%= @page.name %>?break_lock=1">Edit the page anyway</a> |
-  <a href="../show/<%= @page.name %>">Cancel</a>
-</p>
-
+<% @title = "#{@page.plain_name} is locked" %><%= sub_template "top" %>
+
+<% if @page.lock_duration(Time.now) == 0 %>
+  <p><%= @page.locked_by_link %> just started editing this page.</p>
+<% else %>
+  <p><%= @page.locked_by_link %> has been editing this page for <%= @page.lock_duration(Time.now) %> minutes.</p>
+<% end %>
+
+<p>
+  <a href="<%= @page.name %>?break_lock=1">Edit the page anyway</a> |
+  <a href="../show/<%= @page.name %>">Cancel</a>
+</p>
+
 <%= sub_template "bottom" %>

data/app/views/wiki/login.rhtml

@@ -1,11 +1,11 @@
-<% @title = "#{@web_name} Login" %><% @hide_navigation = true %><%= sub_template "top" %>
-
-<form action="authenticate" method="post">
-<p>
-    <b>Password</b><br />
-    <input type="password" name="password" />
-</p>
-</form>
-
-
+<% @title = "#{@web_name} Login" %><% @hide_navigation = true %><%= sub_template "top" %>
+
+<form action="authenticate" method="post">
+<p>
+    <b>Password</b><br />
+    <input type="password" name="password" />
+</p>
+</form>
+
+
 <%= sub_template "bottom" %>

data/app/views/wiki/mind.rhtml

@@ -34,7 +34,6 @@
       <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>
-      <!-- <input type="checkbox" id="limit_categs" name="limit_categs" <%= 'checked' if @req.query['limit_categ'] == 'on' %>>Limit to selected cetegories<br> -->
     </td>
     <td>
       <select id="selected_categs" name="selected_categs" size="4" style="width:120px;" multiple>

data/app/views/wiki/new.rhtml

@@ -1,16 +1,21 @@
 <% 
   @title = "Creating #{WikiWords.separate(CGI.unescape(@page_name))}"
-  @content_width = 720
+  @content_width = 800
   @hide_navigation = true
-%><%= sub_template "top" %>
+  @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: 450px; height: 430px"></textarea>
+    <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>

data/app/views/wiki/new_system.rhtml

@@ -1,78 +1,78 @@
-<% @title = "Instiki Setup"; @content_width = 500 %><%= sub_template "top" %>
-
-<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.
-</p>
-
-<form action="../create_system" id="setup" method="post" onSubmit="return validateSetup()">
-<ol class="setup">
-  <li>
-
-    <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.
-    </div>
-    <div class="inputBox">
-      Name: <input type="text" id="web_name" name="web_name" value="Wiki" onChange="proposeAddress();" 
-          onClick="this.value == 'Pimki' ? this.value = '' : true"> &nbsp;&nbsp;
-      Address: <input type="text" id="web_address" name="web_address" onChange="cleanAddress();" value="pimki">
-    </div>
-  </li>
-
-  <li>
-    <h2 style="margin-bottom: 3px">Password for creating and changing webs</h2>
-    <div class="help">
-      Administrative access allows you to make new webs and change existing ones.<br/>
-      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">
-    </div>
-  </li>
-</ol>
-
-<p align="right">
-    <input type="submit" value="Setup" style="margin-left: 40px">
-</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 first web");
-    return false;
-  }
-  
-  if (document.getElementById('web_address').value == "") {
-    alert("You must pick an address for the first web");
-    return false;
-  }
-  
-  if (document.getElementById('password').value == "") {
-    alert("You must pick a system password");
-    return false;
-  }
-
-  if (document.getElementById('password_check').value == "" ||
-      document.getElementById('password').value != document.getElementById('password_check').value) {
-    alert("The password and its verification doesn't match");
-    return false;
-  }
-  
-  return true;
-}
-</script>
-
+<% @title = "Instiki Setup"; @content_width = 500 %><%= sub_template "top" %>
+
+<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.
+</p>
+
+<form action="../create_system" id="setup" method="post" onSubmit="return validateSetup()">
+<ol class="setup">
+  <li>
+
+    <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.
+    </div>
+    <div class="inputBox">
+      Name: <input type="text" id="web_name" name="web_name" value="Wiki" onChange="proposeAddress();" 
+          onClick="this.value == 'Pimki' ? this.value = '' : true"> &nbsp;&nbsp;
+      Address: <input type="text" id="web_address" name="web_address" onChange="cleanAddress();" value="pimki">
+    </div>
+  </li>
+
+  <li>
+    <h2 style="margin-bottom: 3px">Password for creating and changing webs</h2>
+    <div class="help">
+      Administrative access allows you to make new webs and change existing ones.<br/>
+      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">
+    </div>
+  </li>
+</ol>
+
+<p align="right">
+    <input type="submit" value="Setup" style="margin-left: 40px">
+</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 first web");
+    return false;
+  }
+  
+  if (document.getElementById('web_address').value == "") {
+    alert("You must pick an address for the first web");
+    return false;
+  }
+  
+  if (document.getElementById('password').value == "") {
+    alert("You must pick a system password");
+    return false;
+  }
+
+  if (document.getElementById('password_check').value == "" ||
+      document.getElementById('password').value != document.getElementById('password_check').value) {
+    alert("The password and its verification doesn't match");
+    return false;
+  }
+  
+  return true;
+}
+</script>
+
 <%= sub_template "bottom" %>