Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

This commit is contained in:
Jacques Distler 2009-04-01 09:22:19 -05:00
commit 60f2864b9e
2 changed files with 3 additions and 4 deletions

View file

@ -12,7 +12,7 @@
"Revision #{@revision_numbers[rev.id]}" )
) %>
<%- if @revision_numbers[rev.id] > 1 -%>
<span class="views">
<span class="hist_views">
(<%= link_to_revision(rev.page, @revision_numbers[rev.id],
text="diff", mode='diff') %>)
</span>

View file

@ -10,9 +10,8 @@
<%= link_to_existing_page page %>
<%- if page.revisions.length > 1 %>
<span class="views">
(<%= link_to_revision(page, page.revisions.length, text='diff',
mode='diff') %>)
(<%= link_to_history(page, text='history') %>)
( <%= link_to_revision(page, page.revisions.length, text='diff',
mode='diff') %> | <%= link_to_history(page, text='history') %> )
</span>
<%- end -%>
<div class="byline" style="margin-bottom: 0px">