app/views/wiki/bliki_revision.rhtml in Pimki-1.6.092 vs app/views/wiki/bliki_revision.rhtml in Pimki-1.7.092
- old
+ new
@@ -1,19 +1,15 @@
<% @title = "#{@page.plain_name} (Rev ##{@revision.number})" %>
<%= sub_template "top" %>
-<table width="100%">
-<tr style="background-color:dfd">
- <td width="70%"><h4><%= @revision.page.name %></h4></td>
- <th><small><%= @revision.pretty_created_at %></small></th>
-</tr>
+<table width="100%" class='content-box'>
<tr>
<td colspan="2">
- <div id="revision">
+ <div id="revision-content">
<%= @revision.display_content %>
</div>
- <div id="changes" style="display: none">
+ <div id="changes-content" 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>
@@ -21,20 +17,17 @@
<%= @revision.display_diff %>
</div>
</td>
</tr>
-<tr style="background-color:efe">
- <th colspan="2" align="right"><small><%= web.make_link(@revision.author, nil, {}) %></small></th>
+<tr style="font-style:italic;">
+ <td style="padding-left:5px"><small>Revision <%= @revision.number+1 %> of <%= @page.revisions.length %> from
+ <%= @revision.pretty_created_at %></small></td>
+ <td style="font-weight:bold;text-align:right;padding-right:5px"><small><%= web.make_link(@page.revisions.first.author, nil, {}) %></small></td>
</tr>
</table>
-<div class="byline">
- <%= "Revision from #{@revision.pretty_created_at} by" %>
- <%# @page.web.pages[@revision.author] ? WikiWords.existing_page_link(@revision.author) : WikiWords.unexisting_page_link(@revision.author) %>
-</div>
-
<div class="navigation">
<a href="../bliki_edit/<%= @page.name %>" class="navlink">Edit</a> |
<% if @revision.previous_revision %>
<a href="../bliki_revision/<%= @page.name %>?rev=<%= @revision.previous_revision.number %>" class="navlink">Lower</a>
<% else %>
@@ -72,17 +65,17 @@
</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";
+ if (document.getElementById("changes-content").style.display == "none") {
+ document.getElementById("changes-content").style.display = "block";
+ document.getElementById("revision-content").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("changes-content").style.display = "none";
+ document.getElementById("revision-content").style.display = "block";
document.getElementById("show_changes").style.display = "inline";
document.getElementById("hide_changes").style.display = "none";
}
}
</script>
\ No newline at end of file