summaryrefslogtreecommitdiffstats
path: root/app/views/wiki
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/wiki')
-rw-r--r--app/views/wiki/rename.rhtml3
-rw-r--r--app/views/wiki/show.rhtml2
-rw-r--r--app/views/wiki/special_page_index.rhtml6
3 files changed, 5 insertions, 6 deletions
diff --git a/app/views/wiki/rename.rhtml b/app/views/wiki/rename.rhtml
index 0c069f43d..260f9af8b 100644
--- a/app/views/wiki/rename.rhtml
+++ b/app/views/wiki/rename.rhtml
@@ -4,8 +4,9 @@
<% labelled_tabular_form_for :wiki_page, @page, :url => { :action => 'rename' } do |f| %>
<div class="box">
-<p><%= f.text_field :title, :required => true, :size => 255 %></p>
+<p><%= f.text_field :title, :required => true, :size => 100 %></p>
<p><%= f.check_box :redirect_existing_links %></p>
+<p><%= f.text_field :parent_title, :size => 100 %></p>
</div>
<%= submit_tag l(:button_rename) %>
<% end %>
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index 8092525bd..255b904f5 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -10,6 +10,8 @@
<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
</div>
+<%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:page => parent.title}}) %>
+
<% if @content.version != @page.content.version %>
<p>
<%= link_to(('&#171; ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
diff --git a/app/views/wiki/special_page_index.rhtml b/app/views/wiki/special_page_index.rhtml
index f21cc3423..72b395ef7 100644
--- a/app/views/wiki/special_page_index.rhtml
+++ b/app/views/wiki/special_page_index.rhtml
@@ -4,11 +4,7 @@
<p class="nodata"><%= l(:label_no_data) %></p>
<% end %>
-<ul><% @pages.each do |page| %>
- <li><%= link_to page.pretty_title, {:action => 'index', :page => page.title},
- :title => l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) %>
- </li>
-<% end %></ul>
+<%= render_page_hierarchy(@pages_by_parent_id) %>
<% content_for :sidebar do %>
<%= render :partial => 'sidebar' %>