##// END OF EJS Templates
Fixes links to wiki atom feed (#3581)....
Jean-Philippe Lang -
r2697:6ff589110073
parent child
Show More
@@ -1,33 +1,33
1 <div class="contextual">
1 <div class="contextual">
2 <%= watcher_tag(@wiki, User.current) %>
2 <%= watcher_tag(@wiki, User.current) %>
3 </div>
3 </div>
4
4
5 <h2><%= l(:label_index_by_date) %></h2>
5 <h2><%= l(:label_index_by_date) %></h2>
6
6
7 <% if @pages.empty? %>
7 <% if @pages.empty? %>
8 <p class="nodata"><%= l(:label_no_data) %></p>
8 <p class="nodata"><%= l(:label_no_data) %></p>
9 <% end %>
9 <% end %>
10
10
11 <% @pages_by_date.keys.sort.reverse.each do |date| %>
11 <% @pages_by_date.keys.sort.reverse.each do |date| %>
12 <h3><%= format_date(date) %></h3>
12 <h3><%= format_date(date) %></h3>
13 <ul>
13 <ul>
14 <% @pages_by_date[date].each do |page| %>
14 <% @pages_by_date[date].each do |page| %>
15 <li><%= link_to page.pretty_title, :action => 'index', :page => page.title %></li>
15 <li><%= link_to page.pretty_title, :action => 'index', :page => page.title %></li>
16 <% end %>
16 <% end %>
17 </ul>
17 </ul>
18 <% end %>
18 <% end %>
19
19
20 <% content_for :sidebar do %>
20 <% content_for :sidebar do %>
21 <%= render :partial => 'sidebar' %>
21 <%= render :partial => 'sidebar' %>
22 <% end %>
22 <% end %>
23
23
24 <% unless @pages.empty? %>
24 <% unless @pages.empty? %>
25 <% other_formats_links do |f| %>
25 <% other_formats_links do |f| %>
26 <%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :key => User.current.rss_key} %>
26 <%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
27 <%= f.link_to 'HTML', :url => {:action => 'special', :page => 'export'} %>
27 <%= f.link_to 'HTML', :url => {:action => 'special', :page => 'export'} %>
28 <% end %>
28 <% end %>
29 <% end %>
29 <% end %>
30
30
31 <% content_for :header_tags do %>
31 <% content_for :header_tags do %>
32 <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key) %>
32 <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
33 <% end %>
33 <% end %>
@@ -1,26 +1,26
1 <div class="contextual">
1 <div class="contextual">
2 <%= watcher_tag(@wiki, User.current) %>
2 <%= watcher_tag(@wiki, User.current) %>
3 </div>
3 </div>
4
4
5 <h2><%= l(:label_index_by_title) %></h2>
5 <h2><%= l(:label_index_by_title) %></h2>
6
6
7 <% if @pages.empty? %>
7 <% if @pages.empty? %>
8 <p class="nodata"><%= l(:label_no_data) %></p>
8 <p class="nodata"><%= l(:label_no_data) %></p>
9 <% end %>
9 <% end %>
10
10
11 <%= render_page_hierarchy(@pages_by_parent_id) %>
11 <%= render_page_hierarchy(@pages_by_parent_id) %>
12
12
13 <% content_for :sidebar do %>
13 <% content_for :sidebar do %>
14 <%= render :partial => 'sidebar' %>
14 <%= render :partial => 'sidebar' %>
15 <% end %>
15 <% end %>
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_pages => 1, :key => User.current.rss_key} %>
19 <%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
20 <%= f.link_to 'HTML', :url => {:action => 'special', :page => 'export'} %>
20 <%= f.link_to 'HTML', :url => {:action => 'special', :page => 'export'} %>
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_pages => 1, :format => 'atom', :key => User.current.rss_key) %>
25 <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :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