diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-07-26 11:46:24 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-07-26 11:46:24 +0000 |
| commit | 60d066f943c68a348fee3a8350dc5ba88878b69c (patch) | |
| tree | 00d123b7b25e7306688842a7fed0733412118f41 /app/views/wiki | |
| parent | b68fd4c04bed4d8c9f7d0ad9d65125c36635c819 (diff) | |
| download | redmine-60d066f943c68a348fee3a8350dc5ba88878b69c.tar.gz redmine-60d066f943c68a348fee3a8350dc5ba88878b69c.zip | |
Wiki page hierarchy (#528). Parent page can be assigned on Rename screen.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1698 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/wiki')
| -rw-r--r-- | app/views/wiki/rename.rhtml | 3 | ||||
| -rw-r--r-- | app/views/wiki/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/wiki/special_page_index.rhtml | 6 |
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(('« ' + 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' %> |