diff --git a/app/assets/javascripts/app/controllers/notes.js b/app/assets/javascripts/app/controllers/notes.js index fec78bf90..7b1d6b181 100644 --- a/app/assets/javascripts/app/controllers/notes.js +++ b/app/assets/javascripts/app/controllers/notes.js @@ -230,6 +230,9 @@ angular.module('app') if(this.hidePinned) { base += " | – Pinned" } + if(this.sortReverse) { + base += " | Reversed" + } return base; } diff --git a/app/assets/stylesheets/app/_ionicons.scss b/app/assets/stylesheets/app/_ionicons.scss index 48b99d156..ae07f0906 100644 --- a/app/assets/stylesheets/app/_ionicons.scss +++ b/app/assets/stylesheets/app/_ionicons.scss @@ -15,8 +15,6 @@ .ion, .ionicons, .ion-locked:before, .ion-plus:before, -.ion-arrow-return-left:before, -.ion-arrow-return-right:before, { display: inline-block; font-family: "Ionicons"; speak: none; font-style: normal; font-weight: normal; font-variant: normal; text-transform: none; text-rendering: auto; line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -25,8 +23,4 @@ .ion-plus:before { content: "\f218"; } -.ion-arrow-return-left:before { content: "\f265"; } - -.ion-arrow-return-right:before { content: "\f266"; } - /*# sourceMappingURL=ionicons.css.map */ diff --git a/app/assets/stylesheets/app/_stylekit-sub.scss b/app/assets/stylesheets/app/_stylekit-sub.scss index fe5cd0a20..baf6fd293 100644 --- a/app/assets/stylesheets/app/_stylekit-sub.scss +++ b/app/assets/stylesheets/app/_stylekit-sub.scss @@ -51,6 +51,12 @@ } } +.sk-menu-panel-header { + a { + cursor: pointer; + } +} + #session-history-menu { .sk-menu-panel .sk-menu-panel-row .sk-sublabel.opaque { opacity: 1.0 diff --git a/app/assets/templates/notes.html.haml b/app/assets/templates/notes.html.haml index fb2ea96e7..0d9b6ec7b 100644 --- a/app/assets/templates/notes.html.haml +++ b/app/assets/templates/notes.html.haml @@ -25,9 +25,8 @@ .sk-menu-panel.dropdown-menu{"ng-show" => "ctrl.showMenu"} .sk-menu-panel-header .sk-menu-panel-header-title Sort By - .sk-button.sk-secondary-contrast{"ng-click" => "ctrl.toggleReverseSort()"} - .sk-label - %i.icon{"ng-class" => "{'ion-arrow-return-left' : ctrl.sortReverse == false, 'ion-arrow-return-right' : ctrl.sortReverse == true }"} + %a.info.sk-h5{"ng-click" => "ctrl.toggleReverseSort()"} + {{ctrl.sortReverse === true ? 'Disable Reverse Sort' : 'Enable Reverse Sort'}} %menu-row{"label" => "'Date Added'", "circle" => "ctrl.sortBy == 'created_at' && 'success'", "action" => "ctrl.selectedMenuItem(); ctrl.selectedSortByCreated()", "desc" => "'Sort notes by newest first'"} %menu-row{"label" => "'Date Modified'", "circle" => "ctrl.sortBy == 'client_updated_at' && 'success'", "action" => "ctrl.selectedMenuItem(); ctrl.selectedSortByUpdated()", "desc" => "'Sort notes with the most recently updated first'"}