jro_apps/redmine Commit - r6062:25d900c78791

Adds breadcrumb on all wiki page views....

Jean-Philippe Lang -

r6062:25d900c78791

parent child

Context file:

r6062:25d900c78791

Collapse all files

app/helpers/wiki_helper.rb +6 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module WikiHelper
               def wiki_page_options_for_select(pages, selected = nil, parent = nil, level = 0)
                 pages = pages.group_by(&:parent) unless pages.is_a?(Hash)
                 s = ''
                 if pages.has_key?(parent)
                   pages[parent].each do |page|
                     attrs = "value='#{page.id}'"
                     attrs << " selected='selected'" if selected == page
                     indent = (level > 0) ? ('&nbsp;' * level * 2 + '&#187; ') : nil
                     s << "<option #{attrs}>#{indent}#{h page.pretty_title}</option>\n" +
                            wiki_page_options_for_select(pages, selected, page, level + 1)
                   end
                 end
                 s
               end
+              def wiki_page_breadcrumb(page)
+                breadcrumb(page.ancestors.reverse.collect {|parent|
+                  link_to(h(parent.pretty_title), {:controller => 'wiki', :action => 'show', :id => parent.title, :project_id => parent.project})
+                })
+              end
             end

app/views/wiki/annotate.rhtml +3 -1

             <div class="contextual">
             <%= link_to(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit') %>
             <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
             </div>
-            <h2><%= @page.pretty_title %></h2>
+            <%= wiki_page_breadcrumb(@page) %>
+            <h2><%=h @page.pretty_title %></h2>
             <p>
             <%= l(:label_version) %> <%= link_to @annotate.content.version, :action => 'show', :id => @page.title, :version => @annotate.content.version %>
             <em>(<%= @annotate.content.author ? @annotate.content.author.name : "anonyme" %>, <%= format_time(@annotate.content.updated_on) %>)</em>
             </p>
             <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
             <table class="filecontent annotate">
             <tbody>
             <% line_num = 1 %>
             <% @annotate.lines.each do |line| -%>
             <tr class="bloc-<%= colors[line[0]] %>">
                 <th class="line-num"><%= line_num %></th>
                 <td class="revision"><%= link_to line[0], :controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title, :version => line[0] %></td>
                 <td class="author"><%= h(line[1]) %></td>
                 <td class="line-code"><pre><%=h line[2] %></pre></td>
             </tr>
             <% line_num += 1 %>
             <% end -%>
             </tbody>
             </table>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag 'scm' %>
             <% end %>

app/views/wiki/destroy.rhtml +2 0

+            <%= wiki_page_breadcrumb(@page) %>
             <h2><%=h @page.pretty_title %></h2>
             <% form_tag({}, :method => :delete) do %>
             <div class="box">
             <p><strong><%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %></strong></p>
             <p><label><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_wiki_page_nullify_children) %></label><br />
             <label><%= radio_button_tag 'todo', 'destroy', false %> <%= l(:text_wiki_page_destroy_children) %></label>
             <% if @reassignable_to.any? %>
             <br />
             <label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_wiki_page_reassign_children) %></label>:
             <%= select_tag 'reassign_to_id', wiki_page_options_for_select(@reassignable_to),
             																 :onclick => "$('todo_reassign').checked = true;" %>
             <% end %>
             </p>
             </div>
             <%= submit_tag l(:button_apply) %>
             <%= link_to l(:button_cancel), :controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title %>
             <% end %>

app/views/wiki/diff.rhtml +3 -1

             <div class="contextual">
             <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
             </div>
-            <h2><%= @page.pretty_title %></h2>
+            <%= wiki_page_breadcrumb(@page) %>
+            <h2><%=h @page.pretty_title %></h2>
             <p>
             <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
             <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
             &#8594;
             <%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_to.version %>/<%= @page.content.version %>
             <em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
             </p>
             <div class="text-diff">
             <%= simple_format_without_paragraph @diff.to_html %>
             </div>

app/views/wiki/edit.rhtml +2 0

+            <%= wiki_page_breadcrumb(@page) %>
             <h2><%=h @page.pretty_title %></h2>
             <% form_for :content, @content, :url => {:action => 'update', :id => @page.title}, :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
             <%= f.hidden_field :version %>
             <%= error_messages_for 'content' %>
             <p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %></p>
             <p><label><%= l(:field_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>
             <p><label><%=l(:label_attachment_plural)%></label><br /><%= render :partial => 'attachments/form' %></p>
             <p><%= submit_tag l(:button_save) %>
                <%= link_to_remote l(:label_preview),
                                    { :url => { :controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title },
                                      :method => :post,
                                      :update => 'preview',
                                      :with => "Form.serialize('wiki_form')",
                                      :complete => "Element.scrollTo('preview')"
                                    }, :accesskey => accesskey(:preview) %></p>
             <%= wikitoolbar_for 'content_text' %>
             <% end %>
             <div id="preview" class="wiki"></div>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
               <%= robot_exclusion_tag %>
             <% end %>
             <% html_title @page.pretty_title %>

app/views/wiki/history.rhtml +3 -1

-            <h2><%= @page.pretty_title %></h2>
+            <%= wiki_page_breadcrumb(@page) %>
+            <h2><%=h @page.pretty_title %></h2>
             <h3><%= l(:label_history) %></h3>
             <% form_tag({:action => "diff"}, :method => :get) do %>
             <table class="list wiki-page-versions">
             <thead><tr>
                 <th>#</th>
                 <th></th>
                 <th></th>
                 <th><%= l(:field_updated_on) %></th>
                 <th><%= l(:field_author) %></th>
                 <th><%= l(:field_comments) %></th>
                 <th></th>
             </tr></thead>
             <tbody>
             <% show_diff = @versions.size > 1 %>
             <% line_num = 1 %>
             <% @versions.each do |ver| %>
             <tr class="wiki-page-version <%= cycle("odd", "even") %>">
                 <td class="id"><%= link_to ver.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
                 <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
                 <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
                 <td class="updated_on"><%= format_time(ver.updated_on) %></td>
                 <td class="author"><%= link_to_user ver.author %></td>
                 <td class="comments"><%=h ver.comments %></td>
                 <td class="buttons"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td>
             </tr>
             <% line_num += 1 %>
             <% end %>
             </tbody>
             </table>
             <%= submit_tag l(:label_view_diff), :class => 'small' if show_diff %>
             <span class="pagination"><%= pagination_links_full @version_pages, @version_count, :page_param => :p %></span>
             <% end %>

app/views/wiki/rename.rhtml +3 -1

-            <h2><%= l(:button_rename) %>: <%= @original_title %></h2>
+            <%= wiki_page_breadcrumb(@page) %>
+            <h2><%=h @original_title %></h2>
             <%= error_messages_for 'page' %>
             <% labelled_tabular_form_for :wiki_page, @page, :url => { :action => 'rename' } do |f| %>
             <div class="box">
             <p><%= f.text_field :title, :required => true, :size => 100  %></p>
             <p><%= f.check_box :redirect_existing_links %></p>
             <p><%= f.select :parent_id, "<option value=''></option>" + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent), :label => :field_parent_title %></p>
             </div>
             <%= submit_tag l(:button_rename) %>
             <% end %>

app/views/wiki/show.rhtml +1 -1

             <div class="contextual">
             <% if @editable %>
             <%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %>
             <%= watcher_tag(@page, User.current) %>
             <%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
             <%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
             <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
             <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
             <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
             <% end %>
             <%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
             </div>
-            <%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:id => parent.title, :project_id => parent.project}}) %>
+            <%= wiki_page_breadcrumb(@page) %>
             <% if @content.version != @page.content.version %>
                 <p>
                 <%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
                 <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
                 <%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :id => @page.title, :project_id => @page.project, :version => @content.version) + ')' if @content.version > 1 %> -
                 <%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
                 <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %>
                 <br />
                 <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
                 <%=h @content.comments %>
                 </p>
                 <hr />
             <% end %>
             <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
             <%= link_to_attachments @page %>
             <% if @editable && authorize_for('wiki', 'add_attachment') %>
             <div id="wiki_add_attachment">
             <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
                                                          :id => 'attach_files_link' %></p>
             <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :project_id => @project, :id => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
               <div class="box">
               <p><%= render :partial => 'attachments/form' %></p>
               </div>
             <%= submit_tag l(:button_add) %>
             <%= link_to l(:button_cancel), {}, :onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;" %>
             <% end %>
             </div>
             <% end %>
             <% other_formats_links do |f| %>
             	<%= f.link_to 'HTML', :url => {:id => @page.title, :version => @content.version} %>
             	<%= f.link_to 'TXT', :url => {:id => @page.title, :version => @content.version} %>
             <% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>
             <% content_for :sidebar do %>
               <%= render :partial => 'sidebar' %>
             <% end %>
             <% html_title @page.pretty_title %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages