Group and team rss is valid now
This commit is contained in:
parent
8812d9dee2
commit
473efc82b6
10 changed files with 51 additions and 29 deletions
|
@ -71,7 +71,7 @@
|
|||
color: $style_color;
|
||||
text-shadow: 0 1px 1px #FFF;
|
||||
font-size: 18px;
|
||||
line-height: 42px;
|
||||
line-height: 40px;
|
||||
font-weight: normal;
|
||||
letter-spacing: -1px;
|
||||
}
|
||||
|
|
|
@ -23,6 +23,5 @@
|
|||
|
||||
- if current_controller?(:commits) && current_user.private_token
|
||||
%li.pull-right
|
||||
%span.rss-icon
|
||||
= link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
|
||||
= image_tag "rss_ui.png", title: "feed"
|
||||
= link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
|
||||
%i.icon-rss
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
xml.instruct!
|
||||
xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
|
||||
xml.title "Dashboard feed#{" - #{current_user.name}" if current_user.name.present?}"
|
||||
xml.link :href => projects_url(:atom), :rel => "self", :type => "application/atom+xml"
|
||||
xml.link :href => projects_url, :rel => "alternate", :type => "text/html"
|
||||
xml.link :href => dashboard_url(:atom), :rel => "self", :type => "application/atom+xml"
|
||||
xml.link :href => dashboard_url, :rel => "alternate", :type => "text/html"
|
||||
xml.id projects_url
|
||||
xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
xml.instruct!
|
||||
xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
|
||||
xml.title "Dashboard feed#{" - #{current_user.name}" if current_user.name.present?}"
|
||||
xml.link :href => projects_url(:atom), :rel => "self", :type => "application/atom+xml"
|
||||
xml.link :href => projects_url, :rel => "alternate", :type => "text/html"
|
||||
xml.title "Group feed - #{@group.name}"
|
||||
xml.link :href => group_path(@group, :atom), :rel => "self", :type => "application/atom+xml"
|
||||
xml.link :href => group_path(@group), :rel => "alternate", :type => "text/html"
|
||||
xml.id projects_url
|
||||
xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
|
||||
|
||||
|
|
|
@ -16,11 +16,11 @@
|
|||
.description.well.light
|
||||
= @group.description
|
||||
= render "projects", projects: @projects
|
||||
%div
|
||||
%span.rss-icon
|
||||
= link_to dashboard_path(:atom, { private_token: current_user.private_token }) do
|
||||
= image_tag "rss_ui.png", title: "feed"
|
||||
%strong News Feed
|
||||
.prepend-top-20
|
||||
= link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do
|
||||
%strong
|
||||
%i.icon-rss
|
||||
News Feed
|
||||
|
||||
%hr
|
||||
.gitlab-promo
|
||||
|
|
|
@ -6,6 +6,5 @@
|
|||
= nav_link(controller: :labels) do
|
||||
= link_to 'Labels', project_labels_path(@project), class: "tab"
|
||||
%li.pull-right
|
||||
%span.rss-icon
|
||||
= link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
|
||||
= image_tag "rss_ui.png", title: "feed"
|
||||
= link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
|
||||
%i.icon-rss
|
||||
|
|
29
app/views/teams/show.atom.builder
Normal file
29
app/views/teams/show.atom.builder
Normal file
|
@ -0,0 +1,29 @@
|
|||
xml.instruct!
|
||||
xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
|
||||
xml.title "Team feed - #{@team.name}"
|
||||
xml.link :href => team_url(@team, :atom), :rel => "self", :type => "application/atom+xml"
|
||||
xml.link :href => team_url(@team), :rel => "alternate", :type => "text/html"
|
||||
xml.id projects_url
|
||||
xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
|
||||
|
||||
@events.each do |event|
|
||||
if event.proper?
|
||||
event = EventDecorator.decorate(event)
|
||||
xml.entry do
|
||||
event_link = event.feed_url
|
||||
event_title = event.feed_title
|
||||
|
||||
xml.id "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
|
||||
xml.link :href => event_link
|
||||
xml.title truncate(event_title, :length => 80)
|
||||
xml.updated event.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
|
||||
xml.media :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(event.author_email)
|
||||
xml.author do |author|
|
||||
xml.name event.author_name
|
||||
xml.email event.author_email
|
||||
end
|
||||
xml.summary event_title
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
|
@ -15,11 +15,11 @@
|
|||
.description.well.light
|
||||
= @team.description
|
||||
= render "projects", projects: @projects
|
||||
%div
|
||||
%span.rss-icon
|
||||
= link_to dashboard_path(:atom, { private_token: current_user.private_token }) do
|
||||
= image_tag "rss_ui.png", title: "feed"
|
||||
%strong News Feed
|
||||
.prepend-top-20
|
||||
= link_to team_path(@team, { format: :atom, private_token: current_user.private_token }), title: "Feed" do
|
||||
%strong
|
||||
%i.icon-rss
|
||||
News Feed
|
||||
|
||||
%hr
|
||||
.gitlab-promo
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue