summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/activities/index.html.erb4
-rw-r--r--app/views/boards/index.html.erb4
-rw-r--r--app/views/boards/show.html.erb4
-rw-r--r--app/views/issues/index.html.erb6
-rw-r--r--app/views/issues/show.html.erb4
-rw-r--r--app/views/journals/index.builder2
-rw-r--r--app/views/my/_sidebar.html.erb6
-rw-r--r--app/views/my/blocks/_issues.erb2
-rw-r--r--app/views/news/index.html.erb4
-rw-r--r--app/views/projects/index.html.erb2
-rw-r--r--app/views/projects/show.html.erb2
-rw-r--r--app/views/repositories/revisions.html.erb4
-rw-r--r--app/views/repositories/show.html.erb4
-rw-r--r--app/views/timelog/index.html.erb4
-rw-r--r--app/views/users/show.html.erb4
-rw-r--r--app/views/welcome/index.html.erb4
-rw-r--r--app/views/wiki/date_index.html.erb4
-rw-r--r--app/views/wiki/index.html.erb4
18 files changed, 34 insertions, 34 deletions
diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index e7f179ebe..83f67b1b8 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -22,11 +22,11 @@
</span>
&nbsp;
<% other_formats_links do |f| %>
- <%= f.link_to_with_query_parameters 'Atom', 'from' => nil, :key => User.current.rss_key %>
+ <%= f.link_to_with_query_parameters 'Atom', 'from' => nil, :key => User.current.atom_key %>
<% end %>
<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :params => request.query_parameters.merge(:from => nil, :key => User.current.rss_key), :format => 'atom') %>
+<%= auto_discovery_link_tag(:atom, :params => request.query_parameters.merge(:from => nil, :key => User.current.atom_key), :format => 'atom') %>
<% end %>
<% content_for :sidebar do %>
diff --git a/app/views/boards/index.html.erb b/app/views/boards/index.html.erb
index 7d0da1696..63daeb535 100644
--- a/app/views/boards/index.html.erb
+++ b/app/views/boards/index.html.erb
@@ -38,11 +38,11 @@
</table>
<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_messages => 1, :key => User.current.rss_key} %>
+ <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_messages => 1, :key => User.current.atom_key} %>
<% end %>
<% content_for :header_tags do %>
- <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key}) %>
+ <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.atom_key}) %>
<% end %>
<% html_title l(:label_board_plural) %>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index b80ff0383..bc8c24c3d 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -58,10 +58,10 @@
<% end %>
<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+ <%= f.link_to 'Atom', :url => {:key => User.current.atom_key} %>
<% end %>
<% html_title @board.name %>
<% content_for :header_tags do %>
- <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
+ <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.atom_key}, :title => "#{@project}: #{@board}") %>
<% end %>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index b05b6ccf2..5a4d6b2c4 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -34,7 +34,7 @@
<% end %>
<% other_formats_links do |f| %>
- <%= f.link_to_with_query_parameters 'Atom', :key => User.current.rss_key %>
+ <%= f.link_to_with_query_parameters 'Atom', :key => User.current.atom_key %>
<%= f.link_to_with_query_parameters 'CSV', {}, :onclick => "showModal('csv-export-options', '350px'); return false;" %>
<%= f.link_to_with_query_parameters 'PDF' %>
<% end %>
@@ -80,12 +80,12 @@
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom,
{:query_id => @query, :format => 'atom',
- :page => nil, :key => User.current.rss_key},
+ :page => nil, :key => User.current.atom_key},
:title => l(:label_issue_plural)) %>
<%= auto_discovery_link_tag(:atom,
{:controller => 'journals', :action => 'index',
:query_id => @query, :format => 'atom',
- :page => nil, :key => User.current.rss_key},
+ :page => nil, :key => User.current.atom_key},
:title => l(:label_changes_details)) %>
<% end %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 390728ada..c7cd5689c 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -127,7 +127,7 @@ end %>
<%= render partial: 'action_menu_edit' unless User.current.wants_comments_in_reverse_order? %>
<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+ <%= f.link_to 'Atom', :url => {:key => User.current.atom_key} %>
<%= f.link_to 'PDF' %>
<% end %>
@@ -145,7 +145,7 @@ end %>
<% end %>
<% content_for :header_tags do %>
- <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
+ <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.atom_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
<% end %>
<%= context_menu %>
diff --git a/app/views/journals/index.builder b/app/views/journals/index.builder
index b044d8c84..26a067f6c 100644
--- a/app/views/journals/index.builder
+++ b/app/views/journals/index.builder
@@ -3,7 +3,7 @@
xml.instruct!
xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
xml.title @title
- xml.link "rel" => "self", "href" => url_for(:format => 'atom', :key => User.current.rss_key, :only_path => false)
+ xml.link "rel" => "self", "href" => url_for(:format => 'atom', :key => User.current.atom_key, :only_path => false)
xml.link "rel" => "alternate", "href" => home_url
xml.id home_url
xml.icon favicon_url
diff --git a/app/views/my/_sidebar.html.erb b/app/views/my/_sidebar.html.erb
index 01ac5c6a5..cd4860796 100644
--- a/app/views/my/_sidebar.html.erb
+++ b/app/views/my/_sidebar.html.erb
@@ -10,12 +10,12 @@
<h4><%= l(:label_feeds_access_key) %></h4>
<p>
-<% if @user.rss_token %>
-<%= l(:label_feeds_access_key_created_on, distance_of_time_in_words(Time.now, @user.rss_token.created_on)) %>
+<% if @user.atom_token %>
+<%= l(:label_feeds_access_key_created_on, distance_of_time_in_words(Time.now, @user.atom_token.created_on)) %>
<% else %>
<%= l(:label_missing_feeds_access_key) %>
<% end %>
-(<%= link_to l(:button_reset), my_rss_key_path, :method => :post %>)
+(<%= link_to l(:button_reset), my_atom_key_path, :method => :post %>)
</p>
<% if Setting.rest_api_enabled? %>
diff --git a/app/views/my/blocks/_issues.erb b/app/views/my/blocks/_issues.erb
index 845ef5b85..d7cff39e6 100644
--- a/app/views/my/blocks/_issues.erb
+++ b/app/views/my/blocks/_issues.erb
@@ -36,6 +36,6 @@
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom,
- _project_issues_path(query.project, query.as_params.merge(:format => 'atom', :key => User.current.rss_key)),
+ _project_issues_path(query.project, query.as_params.merge(:format => 'atom', :key => User.current.atom_key)),
{:title => query.name}) %>
<% end %>
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index 8ec1d512a..64fbe578b 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -38,11 +38,11 @@
<span class="pagination"><%= pagination_links_full @news_pages %></span>
<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
+ <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.atom_key} %>
<% end %>
<% content_for :header_tags do %>
- <%= auto_discovery_link_tag(:atom, _project_news_path(@project, :key => User.current.rss_key, :format => 'atom')) %>
+ <%= auto_discovery_link_tag(:atom, _project_news_path(@project, :key => User.current.atom_key, :format => 'atom')) %>
<%= stylesheet_link_tag 'scm' %>
<% end %>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index adf6b868f..3bd665640 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -30,7 +30,7 @@
<% end %>
<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+ <%= f.link_to 'Atom', :url => {:key => User.current.atom_key} %>
<% if @query.display_type == 'list' %>
<%= f.link_to_with_query_parameters 'CSV', {}, :onclick => "showModal('csv-export-options', '350px'); return false;" %>
<% end %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 18b15d840..5c7ef440c 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -151,7 +151,7 @@
<% end %>
<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
+<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.atom_key}) %>
<% end %>
<% html_title(l(:label_overview)) -%>
diff --git a/app/views/repositories/revisions.html.erb b/app/views/repositories/revisions.html.erb
index fc22210da..a12942c49 100644
--- a/app/views/repositories/revisions.html.erb
+++ b/app/views/repositories/revisions.html.erb
@@ -23,12 +23,12 @@
<%= stylesheet_link_tag "scm" %>
<%= auto_discovery_link_tag(
:atom,
- :params => request.query_parameters.merge(:page => nil, :key => User.current.rss_key),
+ :params => request.query_parameters.merge(:page => nil, :key => User.current.atom_key),
:format => 'atom') %>
<% end %>
<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+ <%= f.link_to 'Atom', :url => {:key => User.current.atom_key} %>
<% end %>
<% html_title(l(:label_revision_plural)) -%>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index adcce9f64..5533ff09d 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -45,14 +45,14 @@
:atom,
:action => 'revisions', :id => @project,
:repository_id => @repository.identifier_param,
- :key => User.current.rss_key) %>
+ :key => User.current.atom_key) %>
<% end %>
<% other_formats_links do |f| %>
<%= f.link_to 'Atom',
:url => {:action => 'revisions', :id => @project,
:repository_id => @repository.identifier_param,
- :key => User.current.rss_key} %>
+ :key => User.current.atom_key} %>
<% end %>
<% end %>
<% end %>
diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index 7b9778d8e..f6751ebc8 100644
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -28,7 +28,7 @@
<span class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></span>
<% other_formats_links do |f| %>
- <%= f.link_to_with_query_parameters 'Atom', :key => User.current.rss_key %>
+ <%= f.link_to_with_query_parameters 'Atom', :key => User.current.atom_key %>
<%= f.link_to_with_query_parameters 'CSV', {}, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
<% end %>
@@ -67,5 +67,5 @@
<% html_title(@query.new_record? ? l(:label_spent_time) : @query.name, l(:label_details)) %>
<% content_for :header_tags do %>
- <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %>
+ <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.atom_key}, :title => l(:label_spent_time)) %>
<% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index fabf91dae..16a6c3414 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -122,11 +122,11 @@
<%= render :partial => 'activities/activities', :locals => {:events_by_day => @events_by_day} %>
<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :key => User.current.rss_key} %>
+ <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :key => User.current.atom_key} %>
<% end %>
<% content_for :header_tags do %>
- <%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
+ <%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :user_id => @user, :format => :atom, :key => User.current.atom_key) %>
<% end %>
<% end %>
<%= call_hook :view_account_right_bottom, :user => @user %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 32e338fdf..990fc03fb 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -21,8 +21,8 @@
</div>
<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
+<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.atom_key, :format => 'atom'},
:title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
+<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :key => User.current.atom_key, :format => 'atom'},
:title => "#{Setting.app_title}: #{l(:label_activity)}") %>
<% end %>
diff --git a/app/views/wiki/date_index.html.erb b/app/views/wiki/date_index.html.erb
index 274f19a8a..496411b7f 100644
--- a/app/views/wiki/date_index.html.erb
+++ b/app/views/wiki/date_index.html.erb
@@ -29,7 +29,7 @@
<% unless @pages.empty? %>
<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+ <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.atom_key} %>
<% if User.current.allowed_to?(:export_wiki_pages, @project) %>
<%= f.link_to('PDF', :url => {:action => 'export', :format => 'pdf'}) %>
<%= f.link_to('HTML', :url => {:action => 'export'}) %>
@@ -38,5 +38,5 @@
<% end %>
<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.atom_key) %>
<% end %>
diff --git a/app/views/wiki/index.html.erb b/app/views/wiki/index.html.erb
index bb6086874..3c7f55dab 100644
--- a/app/views/wiki/index.html.erb
+++ b/app/views/wiki/index.html.erb
@@ -25,7 +25,7 @@
<%= f.link_to 'Atom',
:url => {:controller => 'activities', :action => 'index',
:id => @project, :show_wiki_edits => 1,
- :key => User.current.rss_key} %>
+ :key => User.current.atom_key} %>
<% if User.current.allowed_to?(:export_wiki_pages, @project) %>
<%= f.link_to('PDF', :url => {:action => 'export', :format => 'pdf'}) %>
<%= f.link_to('HTML', :url => {:action => 'export'}) %>
@@ -37,5 +37,5 @@
<%= auto_discovery_link_tag(
:atom, :controller => 'activities', :action => 'index',
:id => @project, :show_wiki_edits => 1, :format => 'atom',
- :key => User.current.rss_key) %>
+ :key => User.current.atom_key) %>
<% end %>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-05 16:37:12 +0000