Move activity feed buttons out of event_filter into actual show views.
This commit is contained in:
parent
cba86eed74
commit
72b090b890
4 changed files with 20 additions and 14 deletions
|
@ -1,4 +1,13 @@
|
||||||
= render "events/event_last_push", event: @last_push
|
= render "events/event_last_push", event: @last_push
|
||||||
|
|
||||||
|
- if current_user
|
||||||
|
%ul.nav.nav-pills.event_filter.pull-right
|
||||||
|
%li.pull-right
|
||||||
|
= link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
|
||||||
|
%i.fa.fa-rss
|
||||||
|
News Feed
|
||||||
|
|
||||||
= render 'shared/event_filter'
|
= render 'shared/event_filter'
|
||||||
|
%hr
|
||||||
.content_list
|
.content_list
|
||||||
= spinner
|
= spinner
|
||||||
|
|
|
@ -17,7 +17,17 @@
|
||||||
%section.activities.col-md-8
|
%section.activities.col-md-8
|
||||||
- if current_user
|
- if current_user
|
||||||
= render "events/event_last_push", event: @last_push
|
= render "events/event_last_push", event: @last_push
|
||||||
|
|
||||||
|
- if current_user
|
||||||
|
%ul.nav.nav-pills.event_filter.pull-right
|
||||||
|
%li
|
||||||
|
= link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do
|
||||||
|
%i.fa.fa-rss
|
||||||
|
News Feed
|
||||||
|
|
||||||
= render 'shared/event_filter'
|
= render 'shared/event_filter'
|
||||||
|
%hr
|
||||||
|
|
||||||
.content_list
|
.content_list
|
||||||
= spinner
|
= spinner
|
||||||
%aside.side.col-md-4
|
%aside.side.col-md-4
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
%section.col-md-9
|
%section.col-md-9
|
||||||
= render "events/event_last_push", event: @last_push
|
= render "events/event_last_push", event: @last_push
|
||||||
= render 'shared/event_filter'
|
= render 'shared/event_filter'
|
||||||
|
%hr
|
||||||
.content_list
|
.content_list
|
||||||
= spinner
|
= spinner
|
||||||
%aside.col-md-3.project-side
|
%aside.col-md-3.project-side
|
||||||
|
|
|
@ -3,17 +3,3 @@
|
||||||
= event_filter_link EventFilter.merged, 'Merge events'
|
= event_filter_link EventFilter.merged, 'Merge events'
|
||||||
= event_filter_link EventFilter.comments, 'Comments'
|
= event_filter_link EventFilter.comments, 'Comments'
|
||||||
= event_filter_link EventFilter.team, 'Team'
|
= event_filter_link EventFilter.team, 'Team'
|
||||||
|
|
||||||
- if current_user
|
|
||||||
- if current_controller?(:dashboard)
|
|
||||||
%li.pull-right
|
|
||||||
= link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
|
|
||||||
%i.fa.fa-rss
|
|
||||||
News Feed
|
|
||||||
|
|
||||||
- if current_controller?(:groups)
|
|
||||||
%li.pull-right
|
|
||||||
= link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do
|
|
||||||
%i.fa.fa-rss
|
|
||||||
News Feed
|
|
||||||
%hr
|
|
||||||
|
|
Loading…
Reference in a new issue