instiki 0.9.2 → 0.10.0

data/app/views/wiki/list.rhtml

@@ -1,57 +1,64 @@
-<% @title = "All Pages" %><%= sub_template "top" %>
-
-<% unless @categories.empty? %>
-<div id="categories">
-  <strong>Categories</strong>: 
-  [<a href=".">Any</a>]
-  <%= @category_links.join(', ') %>
-</div>
-<% end %>
-
-<div id="allPages" style="float: left; width: 280px; margin-right: 30px">
-<% unless @pages_that_are_orphaned.empty? && @page_names_that_are_wanted.empty? %>
-  <h2>
-    All Pages
-    <br/><small style="font-size: 12px"><i>All pages in <%= @set_name %> listed alphabetically</i></small>
-  </h2>
-<% end %>
-
-<ul><% for page in @pages_by_name %><li><a href="../show/<%= page.name %>"><%= truncate(page.plain_name, 35) %></a></li><% end %></ul>
-
-<% if @web.count_pages %>
-  <% total_chars = @pages_in_category.characters %>
-  <p><small>All content: <%= total_chars %> chars / <%= sprintf("%-.1f", (total_chars / 2275 )) %> pages</small></p>
-<% end %>
-</div>
-
-<div style="float: left; width: 280px">
-<% unless @page_names_that_are_wanted.empty? %>
-  <h2>
-    Wanted Pages
-    <br/><small style="font-size: 12px"><i>Unexisting pages that other pages in <%= @set_name %> reference</i></small>
-  </h2>
-
-  <ul style="margin-bottom: 10px">
-  <% for page_name in @page_names_that_are_wanted %>
-    <li>
-      <a href="../show/<%= page_name %>"><%= truncate(WikiWords.separate(page_name), 35) %></a>
-      wanted by
-      <%= web.select.pages_that_reference(page_name).collect { |page| page.link }.join(", ") %>
-    </li>
-  <% end %>
-  </ul>
-<% end %>
-
-<% unless @pages_that_are_orphaned.empty? %>
-  <h2>
-    Orphaned Pages
-    <br/><small style="font-size: 12px"><i>Pages in <%= @set_name %> that no other page reference</i></small>
-  </h2>
-
-  <ul style="margin-bottom: 35px">
-    <% for page in @pages_that_are_orphaned %><li><a href="../show/<%= page.name %>"><%= truncate(page.plain_name, 35) %></a></li><% end %>
-  </ul>
-<% end %>
-</div>
-
-<%= sub_template "bottom" %>
+<% @title = "All Pages" %>
+
+<%= categories_menu unless @categories.empty? %>
+
+<div id="allPages" style="float: left; width: 280px; margin-right: 30px">
+<% unless @pages_that_are_orphaned.empty? && @page_names_that_are_wanted.empty? %>
+  <h2>
+    All Pages
+    <br/><small style="font-size: 12px"><i>All pages in <%= @set_name %> listed alphabetically</i></small>
+  </h2>
+<% end %>
+
+<ul>
+  <% @pages_by_name.each do |page| %>
+    <li>
+      <%= link_to_existing_page page, truncate(page.plain_name, 35) %>
+    </li>
+<% end %></ul>
+
+<% if @web.count_pages %>
+  <% total_chars = @pages_in_category.characters %>
+  <p><small>All content: <%= total_chars %> chars / <%= sprintf("%-.1f", (total_chars / 2275 )) %> pages</small></p>
+<% end %>
+</div>
+
+<div style="float: left; width: 280px">
+<% unless @page_names_that_are_wanted.empty? %>
+  <h2>
+    Wanted Pages
+    <br/>
+    <small style="font-size: 12px">
+      <i>Unexisting pages that other pages in <%= @set_name %> reference</i>
+    </small>
+  </h2>
+
+  <ul style="margin-bottom: 10px">
+  <% @page_names_that_are_wanted.each do |wanted_page_name| %>
+    <li>
+      <%= link_to_page(wanted_page_name, @web, truncate(WikiWords.separate(wanted_page_name), 35)) %>
+      wanted by
+      <%= @web.select.pages_that_reference(wanted_page_name).collect { |referring_page|            
+            link_to_existing_page referring_page
+          }.join(", ") 
+      %>
+    </li>
+  <% end %>
+  </ul>
+<% end %>
+
+<% unless @pages_that_are_orphaned.empty? %>
+  <h2>
+    Orphaned Pages
+    <br/><small style="font-size: 12px"><i>Pages in <%= @set_name %> that no other page reference</i></small>
+  </h2>
+
+  <ul style="margin-bottom: 35px">
+    <% @pages_that_are_orphaned.each do |orphan_page| %>
+      <li>
+        <%= link_to_existing_page orphan_page %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+</div>

data/app/views/wiki/locked.rhtml

@@ -1,14 +1,23 @@
-<% @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" %>
+<% @title = "#{@page.plain_name} is locked" %>
+
+<p>
+  <%= link_to_page(@page.locked_by) %>
+  <% if @page.lock_duration(Time.now) == 0 %>
+    just started editing this page.
+  <% else %>
+    has been editing this page for <%= @page.lock_duration(Time.now) %> minutes.
+  <% end %>
+</p>
+
+<p>
+  <%= link_to 'Edit the page anyway',
+        {:web => @web_name, :action => 'edit', :id => @page.name, :params => {'break_lock' => '1'} },
+        {:accesskey => 'E'}
+  %>
+
+  <%= link_to 'Cancel',
+        {:web => @web_name, :action => 'show', :id => @page.name},
+        {:accesskey => 'C'}
+  %>
+
+</p>

data/app/views/wiki/login.rhtml

@@ -1,11 +1,14 @@
-<% @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" %>
+<% @title = "#{@web_name} Login" %><% @hide_navigation = true %>
+
+<p>
+<%= form_tag({ :controller => 'wiki', :action => 'authenticate', :web => @web.address},
+    { 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post'})
+%>
+    <b>Password</b><br />
+    <input type="password" name="password" id="password" default="yes" />
+<%= end_form_tag %>
+</p>
+
+<script language="JavaScript">
+  document.forms["loginForm"].elements["password"].focus();
+</script>

data/app/views/wiki/new.rhtml

@@ -1,27 +1,31 @@
-<% 
-  @title = "Creating #{WikiWords.separate(CGI.unescape(@page_name))}"
-  @content_width = 720
-  @hide_navigation = true
-%><%= sub_template "top" %>
-
-<%= render_markup_help %>
-
-<form action="../save/<%= @page_name %>" method="post" onSubmit="cleanAuthorName();">
-<p>
-    <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">
-</p>
-</form>
-
-<script language="JavaScript1.2">
-function cleanAuthorName() {
-  if (document.getElementById('authorName').value == "") {
-    document.getElementById('authorName').value = 'AnonymousCoward';
-  }
-}
-</script>
-
-<%= sub_template "bottom" %>
+<% 
+  @title = "Creating #{WikiWords.separate(CGI.unescape(@page_name))}"
+  @content_width = 720
+  @hide_navigation = true
+%>
+
+<div id="MarkupHelp" style="float: right; width: 250px; margin-top: 5px">
+  <%= render("#{@web.markup}_help") %>
+  <%= render 'wiki_words_help' %>
+</div>
+
+<%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name},
+             {'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();'})
+%>
+
+<p>
+    <textarea name="content" style="width: 450px; height: 500px"></textarea>
+</p>
+<p>
+    <input type="submit" value="Submit" accesskey="s"/> as 
+    <input type="text" name="author" id="authorName" value="<%= @author %>" onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
+</p>
+<%= end_form_tag %>
+
+<script language="JavaScript1.2">
+function cleanAuthorName() {
+  if (document.getElementById('authorName').value == "") {
+    document.getElementById('authorName').value = 'AnonymousCoward';
+  }
+}
+</script>

data/app/views/wiki/page.rhtml

@@ -1,81 +1,115 @@
-<% @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">
-  <% if @page.name == "HomePage" %>
-    <a href="../edit/<%= @page.name %>" class="navlink" accesskey="E">Edit Page</a>
-    | <a href="../edit_web/" class="navlink">Edit Web</a>
-  <% else %>
-    <a href="../edit/<%= @page.name %>" class="navlink" accesskey="E">Edit</a>
-  <% end %>
-
-  <% 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 %>
-</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 
+  @show_footer = true
+%>
+
+<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">
+  <% if @page.name == "HomePage" %>
+    <%= link_to('Edit Page', 
+          {:web => @web.address, :action => 'edit', :id => @page.name}, 
+          {:class => 'navlink', :accesskey => 'E'})
+    %>
+    | 
+    <%= link_to('Edit Web', 
+            {:web => @web.address, :action => 'edit_web'}, 
+            {:class => 'navlink'})
+    %>
+  <% else %>
+    <%= link_to('Edit', 
+          {:web => @web.address, :action => 'edit', :id => @page.name}, 
+          {:class => 'navlink', :accesskey => 'E'})
+    %>
+  <% end %>
+
+  <% if @page.revisions.length > 1 %>
+    | 
+    <%= link_to('Back in time', 
+          {:web => @web.address, :action => 'revision', :id => @page.name, 
+           :rev => @page.revisions.length - 2},
+          {:class => 'navlink', :accesskey => 'R'})
+    %>
+    <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: 
+    <%= link_to('Print',
+          {:web => @web.address, :action => 'print', :id => @page.name},
+          {:accesskey => 'p'}) %>
+  <% if defined? RedClothForTex and RedClothForTex.available? and @web.markup == :textile %>
+    | 
+    <%= link_to 'TeX', :web => @web.address, :action => 'tex', :id => @page.name %>
+    | 
+    <%= link_to 'PDF', :web => @web.address, :action => 'pdf', :id => @page.name %>
+  <% end %>
+  </small>
+
+  <% unless @page.linked_from.empty? %>
+    <small>
+      | Linked from: 
+      <%= @page.linked_from.collect { |referring_page| 
+            link_to_existing_page referring_page
+          }.join(", ")
+      %>
+    </small>
+  <% end %>
+
+  <% if @page.included_from.length > 0 %>
+    <small>
+      | Included from: <%= @page.included_from.collect { |referring_page|
+	 link_to_existing_page referring_page
+	}.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>

data/app/views/wiki/print.rhtml

@@ -1,16 +1,14 @@
-<% 
-  @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" %>
+<% 
+  @title = @page.plain_name
+  @hide_navigation = true
+  @style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
+  @inline_style = true
+%>
+
+<%= @page.display_content_for_export %>
+
+<div class="byline">
+  <%= @page.revisions? ? "Revised" : "Created" %> on <%= @page.pretty_created_at %> 
+  by
+  <%= @page.author_link({ :mode => (@link_mode || :show) }) %>
+</div>