@@ -6,15 +6,14 | |||||
6 |
|
6 | |||
7 | <%= wiki_page_breadcrumb(@page) %> |
|
7 | <%= wiki_page_breadcrumb(@page) %> | |
8 |
|
8 | |||
9 | <h2><%=h @page.pretty_title %></h2> |
|
9 | <%= title [@page.pretty_title, project_wiki_page_path(@page.project, @page.title, :version => nil)], | |
|
10 | [l(:label_history), history_project_wiki_page_path(@page.project, @page.title)], | |||
|
11 | "#{l(:label_version)} #{@annotate.content.version}" %> | |||
10 |
|
12 | |||
11 | <p> |
|
13 | <p> | |
12 | <%= l(:label_version) %> <%= link_to h(@annotate.content.version), |
|
14 | <em><%= @annotate.content.author ? link_to_user(@annotate.content.author) : l(:label_user_anonymous) | |
13 | :action => 'show', :project_id => @project, |
|
15 | %>, <%= format_time(@annotate.content.updated_on) %> </em><br /> | |
14 | :id => @page.title, :version => @annotate.content.version %> |
|
16 | <%=h @annotate.content.comments %> | |
15 | <em>(<%= h(@annotate.content.author ? |
|
|||
16 | @annotate.content.author.name : l(:label_user_anonymous)) |
|
|||
17 | %>, <%= format_time(@annotate.content.updated_on) %>)</em> |
|
|||
18 | </p> |
|
17 | </p> | |
19 |
|
18 | |||
20 | <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %> |
|
19 | <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %> |
@@ -5,7 +5,9 | |||||
5 |
|
5 | |||
6 | <%= wiki_page_breadcrumb(@page) %> |
|
6 | <%= wiki_page_breadcrumb(@page) %> | |
7 |
|
7 | |||
8 | <h2><%= h(@page.pretty_title) %></h2> |
|
8 | <%= title [@page.pretty_title, project_wiki_page_path(@page.project, @page.title, :version => nil)], | |
|
9 | [l(:label_history), history_project_wiki_page_path(@page.project, @page.title)], | |||
|
10 | "#{l(:label_version)} #{@diff.content_to.version}" %> | |||
9 |
|
11 | |||
10 | <p> |
|
12 | <p> | |
11 | <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %> |
|
13 | <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %> |
@@ -1,8 +1,6 | |||||
1 | <%= wiki_page_breadcrumb(@page) %> |
|
1 | <%= wiki_page_breadcrumb(@page) %> | |
2 |
|
2 | |||
3 | <h2><%= h(@page.pretty_title) %></h2> |
|
3 | <%= title [@page.pretty_title, project_wiki_page_path(@page.project, @page.title, :version => nil)], l(:label_history) %> | |
4 |
|
||||
5 | <h3><%= l(:label_history) %></h3> |
|
|||
6 |
|
4 | |||
7 | <%= form_tag({:controller => 'wiki', :action => 'diff', |
|
5 | <%= form_tag({:controller => 'wiki', :action => 'diff', | |
8 | :project_id => @page.project, :id => @page.title}, |
|
6 | :project_id => @page.project, :id => @page.title}, |
@@ -17,6 +17,10 | |||||
17 | <%= wiki_page_breadcrumb(@page) %> |
|
17 | <%= wiki_page_breadcrumb(@page) %> | |
18 |
|
18 | |||
19 | <% unless @content.current_version? %> |
|
19 | <% unless @content.current_version? %> | |
|
20 | <%= title [@page.pretty_title, project_wiki_page_path(@page.project, @page.title, :version => nil)], | |||
|
21 | [l(:label_history), history_project_wiki_page_path(@page.project, @page.title)], | |||
|
22 | "#{l(:label_version)} #{@content.version}" %> | |||
|
23 | ||||
20 | <p> |
|
24 | <p> | |
21 | <%= link_to(("\xc2\xab " + l(:label_previous)), |
|
25 | <%= link_to(("\xc2\xab " + l(:label_previous)), | |
22 | :action => 'show', :id => @page.title, :project_id => @page.project, |
|
26 | :action => 'show', :id => @page.title, :project_id => @page.project, |
General Comments 0
You need to be logged in to leave comments.
Login now