diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-17 12:15:08 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-06-21 04:59:15 -0500 |
| commit | ef1e3d0df741b842e17b31ec222751850d3c7e94 (patch) | |
| tree | 7550202cfcb286a3f86e6f94fb9fb40977991351 | |
| parent | 027b07cab884d0edae16bc94ae10d604fb4d042c (diff) | |
| download | gitlab-ce-ef1e3d0df741b842e17b31ec222751850d3c7e94.tar.gz | |
Add tooltip on pin/unpin nav
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 4529c514555..d9fcbf3d573 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -278,7 +278,9 @@ $ -> $('.navbar-fixed-top') .removeClass('header-pinned-nav') .toggleClass('header-collapsed header-expanded') + $('.pin-nav-btn').attr('data-original-title', 'Pin sidebar').tooltip('fixTitle').tooltip('setContent') else $.cookie 'pin_nav', 'true', { path: '/' } $('.page-with-sidebar').addClass('page-sidebar-pinned') $('.navbar-fixed-top').addClass('header-pinned-nav') + $('.pin-nav-btn').attr('data-original-title', 'Unpin sidebar').tooltip('fixTitle').tooltip('setContent') diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 199ab3c38c3..2234bf79c87 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -13,7 +13,7 @@ = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36' .username = current_user.username - = link_to '#', class: "nav-header-btn text-center pin-nav-btn #{'is-active' if pinned_nav?} js-nav-pin", title: 'Pin/Unpin navigation' do + = link_to '#', class: "nav-header-btn text-center pin-nav-btn has-tooltip #{'is-active' if pinned_nav?} js-nav-pin", title: pinned_nav? ? "Unpin navigation" : "Pin Navigation", data: {placement: 'right', container: 'body'} do %span.sr-only Toggle navigation pinning = icon('thumb-tack') - if defined?(nav) && nav |