##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r4092 from trunk....
Eric Davis -
r4037:d99d2efccafc
parent child
Show More
Side by Side Unified
Context file:
r4037:d99d2efccafc Loading diff...:
Show file before | Show file after | Hide comments
@@ -0,0 +1,26
1 <div class="contextual">
2 <%= watcher_tag(@wiki, User.current) %>
3 </div>
4
5 <h2><%= l(:label_index_by_title) %></h2>
6
7 <% if @pages.empty? %>
8 <p class="nodata"><%= l(:label_no_data) %></p>
9 <% end %>
10
11 <%= render_page_hierarchy(@pages_by_parent_id) %>
12
13 <% content_for :sidebar do %>
14 <%= render :partial => 'sidebar' %>
15 <% end %>
16
17 <% unless @pages.empty? %>
18 <% other_formats_links do |f| %>
19 <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
20 <%= f.link_to('HTML', :url => {:action => 'special', :page => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
21 <% end %>
22 <% end %>
23
24 <% content_for :header_tags do %>
25 <%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
26 <% end %>
Show file before | Show file after | Hide comments
@@ -321,7 +321,7 module ApplicationHelper
321 def time_tag(time)
321 def time_tag(time)
322 text = distance_of_time_in_words(Time.now, time)
322 text = distance_of_time_in_words(Time.now, time)
323 if @project
323 if @project
324 link_to(text, {:controller => 'projects', :action => 'activity', :id => @project, :from => time.to_date}, :title => format_time(time))
324 link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => time.to_date}, :title => format_time(time))
325 else
325 else
326 content_tag('acronym', text, :title => format_time(time))
326 content_tag('acronym', text, :title => format_time(time))
327 end
327 end
Show file before | Show file after | Hide comments
@@ -16,11 +16,11
16
16
17 <% unless @pages.empty? %>
17 <% unless @pages.empty? %>
18 <% other_formats_links do |f| %>
18 <% other_formats_links do |f| %>
19 <%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
19 <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
20 <%= f.link_to('HTML', :url => {:action => 'special', :page => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
20 <%= f.link_to('HTML', :url => {:action => 'special', :page => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
21 <% end %>
21 <% end %>
22 <% end %>
22 <% end %>
23
23
24 <% content_for :header_tags do %>
24 <% content_for :header_tags do %>
25 <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
25 <%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
26 <% end %>
26 <% end %>
General Comments 0
You need to be logged in to leave comments. Login now