app/views/wiki/page.rhtml in instiki-0.9.2 vs app/views/wiki/page.rhtml in instiki-0.10.0
- old
+ new
@@ -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" %>
\ No newline at end of file
+<%
+ @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>