deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Jacques Distler 2009-04-01 09:22:19 -05:00
parent eebf7ecc6e 888ebe4b58
commit 60f2864b9e
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/wiki/history.html.erb
View file

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

5
app/views/wiki/recently_revised.rhtml
View file

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