instiki 0.10.0 → 0.10.1

data/app/views/wiki/print.rhtml

@@ -1,14 +1,14 @@
-<% 
-  @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>
+<% 
+  @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>

data/app/views/wiki/published.rhtml

@@ -1,9 +1,9 @@
-<%
-  @title = @page.plain_name
-  @hide_navigation = false
-  @style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
-  @inline_style = true
-  @show_footer = true
-%>
-
-<%= @page.display_published %>
+<%
+  @title = @page.plain_name
+  @hide_navigation = false
+  @style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
+  @inline_style = true
+  @show_footer = true
+%>
+
+<%= @page.display_published %>

data/app/views/wiki/recently_revised.rhtml

@@ -1,27 +1,27 @@
-<% @title = "Recently Revised" %>
-
-<%= categories_menu %>
-
-<% unless @pages_by_revision.empty? %>
-  <% revision_date = @pages_by_revision.first.revised_on %>
-  <h3><%= revision_date.strftime('%B %e, %Y') %></h3>
-  <ul>
-  <% for page in @pages_by_revision %>
-    <% if page.revised_on < revision_date %>
-      <% revision_date = page.revised_on %>
-      </ul>
-      <h3><%= revision_date.strftime('%B %e, %Y') %></h3>
-      <ul>
-    <% end %>
-    <li>
-      <%= link_to_existing_page page %>
-      <div class="byline" style="margin-bottom: 0px">
-        by <%= link_to_page(page.author) %>
-        at <%= page.created_at.strftime "%H:%M" %>
-        <%= "from #{page.author.ip}" if page.author.respond_to?(:ip) %>
-      </div>
-    </li>
-  <% end %>
-  </ul>
-<% end %>
+<% @title = "Recently Revised" %>
+
+<%= categories_menu %>
+
+<% unless @pages_by_revision.empty? %>
+  <% revision_date = @pages_by_revision.first.revised_on %>
+  <h3><%= revision_date.strftime('%B %e, %Y') %></h3>
+  <ul>
+  <% for page in @pages_by_revision %>
+    <% if page.revised_on < revision_date %>
+      <% revision_date = page.revised_on %>
+      </ul>
+      <h3><%= revision_date.strftime('%B %e, %Y') %></h3>
+      <ul>
+    <% end %>
+    <li>
+      <%= link_to_existing_page page %>
+      <div class="byline" style="margin-bottom: 0px">
+        by <%= link_to_page(page.author) %>
+        at <%= page.created_at.strftime "%H:%M" %>
+        <%= "from #{page.author.ip}" if page.author.respond_to?(:ip) %>
+      </div>
+    </li>
+  <% end %>
+  </ul>
+<% end %>
 	

data/app/views/wiki/revision.rhtml

@@ -1,103 +1,103 @@
-<% @title = "#{@page.plain_name} (Rev ##{@revision.number})" %>
-
-<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" %>
-  <%= link_to_page @revision.author %>
-</div>
-
-<div class="navigation">
-
-  <% if @revision.next_revision %>
-    <% if @revision.next_revision.number < (@page.revisions.length - 1) %>
-      <%= link_to('Forward in time',
-              {:web => @web.address, :action => 'revision', :id => @page.name, 
-               :rev => @revision.next_revision.number},
-              {:class => 'navlink'})
-      %>
-    <% else %>
-      <%= link_to('Forward in time',
-              {:web => @web.address, :action => 'show', :id => @page.name},
-              {:class => 'navlink'})
-      %>
-    <% end %>
-    (<%= @revision.page.revisions.length - @revision.next_revision.number %> more)
-  <% end %>
-
-  <% if @revision.next_revision && @revision.previous_revision %>
-    |
-  <% end %>
-
-  <% if @revision.previous_revision %>
-    <%= link_to('Back in time',
-          {:web => @web.address, :action => 'revision', :id => @page.name, 
-           :rev => @revision.previous_revision.number},
-          {:class => 'navlink'})
-    %>
-    (<%= @revision.previous_revision.number + 1 %> more)
-  <% end %>
-
-  | 
-  <%= link_to('See current', {:web => @web.address, :action => 'show', :id => @page.name},
-          {:class => 'navlink'})
-  %>
-
-  <% if @revision.previous_revision %>
-    <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 %>
-
-  | 
-  
-  <%= link_to('Rollback', 
-        {:web => @web.address, :action => 'rollback', :id => @page.name, :rev => @revision.number},
-        {:class => 'navlink'})
-  %>
-  
-  <% if @page.references.length > 0 %>
-    <small>
-      | Linked from: 
-      <%= @page.references.collect { |ref| 
-            link_to ref.name, :web => @web.address, :action => 'show', :id => ref.name 
-          }.join(", ") 
-      %>
-    </small>
-  <% else %>
-    Orphan page
-  <% 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} (Rev ##{@revision.number})" %>
+
+<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" %>
+  <%= link_to_page @revision.author %>
+</div>
+
+<div class="navigation">
+
+  <% if @revision.next_revision %>
+    <% if @revision.next_revision.number < (@page.revisions.length - 1) %>
+      <%= link_to('Forward in time',
+              {:web => @web.address, :action => 'revision', :id => @page.name, 
+               :rev => @revision.next_revision.number},
+              {:class => 'navlink'})
+      %>
+    <% else %>
+      <%= link_to('Forward in time',
+              {:web => @web.address, :action => 'show', :id => @page.name},
+              {:class => 'navlink'})
+      %>
+    <% end %>
+    (<%= @revision.page.revisions.length - @revision.next_revision.number %> more)
+  <% end %>
+
+  <% if @revision.next_revision && @revision.previous_revision %>
+    |
+  <% end %>
+
+  <% if @revision.previous_revision %>
+    <%= link_to('Back in time',
+          {:web => @web.address, :action => 'revision', :id => @page.name, 
+           :rev => @revision.previous_revision.number},
+          {:class => 'navlink'})
+    %>
+    (<%= @revision.previous_revision.number + 1 %> more)
+  <% end %>
+
+  | 
+  <%= link_to('See current', {:web => @web.address, :action => 'show', :id => @page.name},
+          {:class => 'navlink'})
+  %>
+
+  <% if @revision.previous_revision %>
+    <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 %>
+
+  | 
+  
+  <%= link_to('Rollback', 
+        {:web => @web.address, :action => 'rollback', :id => @page.name, :rev => @revision.number},
+        {:class => 'navlink'})
+  %>
+  
+  <% if @page.references.length > 0 %>
+    <small>
+      | Linked from: 
+      <%= @page.references.collect { |ref| 
+            link_to ref.name, :web => @web.address, :action => 'show', :id => ref.name 
+          }.join(", ") 
+      %>
+    </small>
+  <% else %>
+    Orphan page
+  <% 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/rollback.rhtml

@@ -1,36 +1,36 @@
-<% 
-  @title = "Rollback to #{@page.plain_name} Rev ##{@revision.number}"
-  @content_width = 720
-  @hide_navigation = true
-%>
-
-<%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>
-
-<%= form_tag({:web => @web.address, :action => 'save', :id => @page.name},
-      {:id => 'editForm', :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" accesskey="u" /> as 
-    <input type="text" name="author" id="authorName" value="<%= @author %>" 
-        onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
-    | 
-    <% link_to('Cancel', 
-         {:web => @web.address, :action => 'cancel_edit', :id => @page.name},
-         {:accesskey => 'c'})
-    %>
-    <small>(unlocks page)</small>
-</p>
-<%= end_form_tag %>
-
-<%= render("#{@web.markup}_help") if @web %>
-
-<script language="JavaScript1.2">
-function cleanAuthorName() {
-  if (document.getElementById('authorName').value == "") {
-    document.getElementById('authorName').value = 'AnonymousCoward';
-  }
-}
-</script>
+<% 
+  @title = "Rollback to #{@page.plain_name} Rev ##{@revision.number}"
+  @content_width = 720
+  @hide_navigation = true
+%>
+
+<%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>
+
+<%= form_tag({:web => @web.address, :action => 'save', :id => @page.name},
+      {:id => 'editForm', :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" accesskey="u" /> as 
+    <input type="text" name="author" id="authorName" value="<%= @author %>" 
+        onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
+    | 
+    <% link_to('Cancel', 
+         {:web => @web.address, :action => 'cancel_edit', :id => @page.name},
+         {:accesskey => 'c'})
+    %>
+    <small>(unlocks page)</small>
+</p>
+<%= end_form_tag %>
+
+<%= render("#{@web.markup}_help") if @web %>
+
+<script language="JavaScript1.2">
+function cleanAuthorName() {
+  if (document.getElementById('authorName').value == "") {
+    document.getElementById('authorName').value = 'AnonymousCoward';
+  }
+}
+</script>

data/app/views/wiki/rss_feed.rhtml

@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<channel>
-		<title><%= @web.name %></title>
-		<link><%= url_for :only_path => false, :web => @web_name, :action => @link_action, :id => 'HomePage' %></link>
-		<description>An Instiki wiki</description>
-		<language>en-us</language>
-		<ttl>40</ttl>
-  <% for page in @pages_by_revision %>
-		<item>
-      <title><%= page.plain_name %></title>
-    <% unless @hide_description %>
-      <description><%= h page.display_content %></description>
-    <% end %>
-      <pubDate><%= page.created_at.strftime "%a, %e %b %Y %H:%M:%S %Z" %></pubDate>
-      <guid><%= url_for :only_path => false, :web => @web_name, :action => @link_action, :id => page.name %></guid>
-      <link><%= url_for :only_path => false, :web => @web_name, :action => @link_action, :id => page.name %></link>
-      <dc:creator><%= WikiWords.separate(page.author) %></dc:creator>
-    </item>
-  <% end %>
-  </channel>
-</rss>
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+	<channel>
+		<title><%= @web.name %></title>
+		<link><%= url_for :only_path => false, :web => @web_name, :action => @link_action, :id => 'HomePage' %></link>
+		<description>An Instiki wiki</description>
+		<language>en-us</language>
+		<ttl>40</ttl>
+  <% for page in @pages_by_revision %>
+		<item>
+      <title><%= h page.plain_name %></title>
+    <% unless @hide_description %>
+      <description><%= h page.display_content %></description>
+    <% end %>
+      <pubDate><%= page.created_at.getgm.strftime "%a, %d %b %Y %H:%M:%S Z" %></pubDate>
+      <guid><%= url_for :only_path => false, :web => @web_name, :action => @link_action, :id => page.name %></guid>
+      <link><%= url_for :only_path => false, :web => @web_name, :action => @link_action, :id => page.name %></link>
+      <dc:creator><%= WikiWords.separate(page.author) %></dc:creator>
+    </item>
+  <% end %>
+  </channel>
+</rss>

data/app/views/wiki/search.rhtml

@@ -1,38 +1,38 @@
-<% @title = "Search results for \"#{@params["query"]}\"" %>
-
-<% unless @title_results.empty? %>
-<h2><%= @title_results.length %> page(s) containing search string in the page name:</h2>
-  <ul>
-    <% for page in @title_results %>
-      <li>
-        <%= link_to page.plain_name, :web => @web.address, :action => 'show', :id => page.name %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
-
-
-<% unless @results.empty? %>
-  <h2> <%= @results.length %> page(s) containing search string in the page text:</h2>
-  <ul>
-    <% for page in @results %>
-      <li>
-        <%= link_to page.plain_name, :web => @web.address, :action => 'show', :id => page.name %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
-
-<% if (@results + @title_results).empty? %>
-  <h2>No pages contains "<%= @params["query"] %>" </h2>
-  <p>
-    Perhaps you should try expanding your query. Remember that Instiki searches for entire 
-    phrases, so if you search for "all that jazz" it will not match pages that contain these 
-    words in separation&mdash;only as a sentence fragment.
-  </p>
-  <p>
-    If you're a high-tech computer wizard, you might even want try constructing a Ruby regular 
-    expression. That's actually what Instiki uses, so go right ahead and flex your 
-    "[a-z]*Leet?RegExpSkill(s|z)"
-  </p>
-<% end %>
+<% @title = "Search results for \"#{@params["query"]}\"" %>
+
+<% unless @title_results.empty? %>
+<h2><%= @title_results.length %> page(s) containing search string in the page name:</h2>
+  <ul>
+    <% for page in @title_results %>
+      <li>
+        <%= link_to page.plain_name, :web => @web.address, :action => 'show', :id => page.name %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+
+
+<% unless @results.empty? %>
+  <h2> <%= @results.length %> page(s) containing search string in the page text:</h2>
+  <ul>
+    <% for page in @results %>
+      <li>
+        <%= link_to page.plain_name, :web => @web.address, :action => 'show', :id => page.name %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+
+<% if (@results + @title_results).empty? %>
+  <h2>No pages contains "<%= @params["query"] %>" </h2>
+  <p>
+    Perhaps you should try expanding your query. Remember that Instiki searches for entire 
+    phrases, so if you search for "all that jazz" it will not match pages that contain these 
+    words in separation&mdash;only as a sentence fragment.
+  </p>
+  <p>
+    If you're a high-tech computer wizard, you might even want try constructing a Ruby regular 
+    expression. That's actually what Instiki uses, so go right ahead and flex your 
+    "[a-z]*Leet?RegExpSkill(s|z)"
+  </p>
+<% end %>