FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move Group modal toggle to navbar on desktop

This commit is contained in:
pixeldesu 2015-05-24 03:58:15 +02:00
parent 8753af3b48
commit 49dea9095a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/layouts/_header.html.haml
View File

@ -24,6 +24,12 @@
= nav_entry "Inbox", "/inbox", badge: inbox_count = nav_entry "Inbox", "/inbox", badge: inbox_count
= nav_entry "Discover", discover_path = nav_entry "Discover", discover_path
%ul.nav.navbar-nav.navbar-right %ul.nav.navbar-nav.navbar-right
- unless @user.nil?
- unless @user == current_user
%li.hidden-xs{"data-toggle" => "tooltip", "data-placement" => "bottom", title: "Manage group memberships"}
%a{href: '#', data: { target: "#modal-group-memberships", toggle: :modal }}
%i.fa.fa-users.hidden-xs
%span.visible-xs Manage group memberships
= render "layouts/notifications" = render "layouts/notifications"
%li.hidden-xs{"data-toggle" => "tooltip", "data-placement" => "bottom", title: "Ask a question"} %li.hidden-xs{"data-toggle" => "tooltip", "data-placement" => "bottom", title: "Ask a question"}
.btn.btn-link.navbar-btn{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"} .btn.btn-link.navbar-btn{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}

2
app/views/user/_actions.html.haml
View File

@ -20,7 +20,7 @@
%a{href: '#', name: 'user-action', data: { action: :block, type: type, target: user.screen_name }} %a{href: '#', name: 'user-action', data: { action: :block, type: type, target: user.screen_name }}
%i.fa.fa-minus-circle %i.fa.fa-minus-circle
Block Block
%li %li.visible-xs
%a{href: '#', data: { target: "#modal-group-memberships", toggle: :modal }} %a{href: '#', data: { target: "#modal-group-memberships", toggle: :modal }}
%i.fa.fa-users %i.fa.fa-users
Manage group memberships Manage group memberships