From 6393f664485cefe5c5da71af875c275c73638cf6 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Wed, 4 Mar 2015 00:10:49 +0100 Subject: [PATCH] Fixed: Added symbols and tooltips to Manual Search last two sort columns. --- src/UI/Content/icons.less | 4 ++++ src/UI/Content/theme.less | 6 ++++++ src/UI/Episode/Search/ManualLayout.js | 22 ++++++++++++++-------- src/UI/Shared/Grid/HeaderCell.js | 14 ++++++++++---- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/src/UI/Content/icons.less b/src/UI/Content/icons.less index 94f21d559..83d1fb49e 100644 --- a/src/UI/Content/icons.less +++ b/src/UI/Content/icons.less @@ -470,3 +470,7 @@ .icon-sonarr-episode-file { .fa-icon-content(@fa-var-file-video-o); } + +.icon-sonarr-header-rejections { + .fa-icon-content(@fa-var-exclamation-circle); +} \ No newline at end of file diff --git a/src/UI/Content/theme.less b/src/UI/Content/theme.less index 8aa743b66..b1f80f504 100644 --- a/src/UI/Content/theme.less +++ b/src/UI/Content/theme.less @@ -292,3 +292,9 @@ dl.info { vertical-align : bottom; } } + +.sort-direction-icon { + .pull-right(); + position : relative; + width : 0px; +} \ No newline at end of file diff --git a/src/UI/Episode/Search/ManualLayout.js b/src/UI/Episode/Search/ManualLayout.js index ff842d3c2..cb13c5b4b 100644 --- a/src/UI/Episode/Search/ManualLayout.js +++ b/src/UI/Episode/Search/ManualLayout.js @@ -53,16 +53,22 @@ module.exports = Marionette.Layout.extend({ cell : QualityCell }, { - name : 'rejections', - label : '', - cell : ApprovalStatusCell, - sortable : false + name : 'rejections', + label : '', + tooltip : 'Rejections', + cell : ApprovalStatusCell, + sortable : true, + sortType : 'fixed', + direction : 'ascending' }, { - name : 'download', - label : '', - cell : DownloadReportCell, - sortable : true + name : 'download', + label : '', + tooltip : 'Auto-Search Prioritization', + cell : DownloadReportCell, + sortable : true, + sortType : 'fixed', + direction : 'ascending' } ], diff --git a/src/UI/Shared/Grid/HeaderCell.js b/src/UI/Shared/Grid/HeaderCell.js index cf0a33113..2e72c8cb4 100644 --- a/src/UI/Shared/Grid/HeaderCell.js +++ b/src/UI/Shared/Grid/HeaderCell.js @@ -17,13 +17,19 @@ module.exports = function() { render : function() { this.$el.empty(); this.$el.append(this.column.get('label')); + if (this.column.get('tooltip')) { + this.$el.attr({ + 'title' : this.column.get('tooltip'), + 'data-container' : '.table' + }); + } var column = this.column; var sortable = Backgrid.callByNeed(column.sortable(), column, this.collection); if (sortable) { this.$el.addClass('sortable'); - this.$el.append(' '); + this.$el.prepend(' '); } //Do we need this? @@ -51,7 +57,7 @@ module.exports = function() { }, direction : function(dir) { - this.$el.children('i').removeClass('icon-sonarr-sort-asc icon-sonarr-sort-desc'); + this.$el.children('i.sort-direction-icon').removeClass('icon-sonarr-sort-asc icon-sonarr-sort-desc'); if (arguments.length) { if (dir) { @@ -137,11 +143,11 @@ module.exports = function() { _setSortIcon : function(dir) { this._removeSortIcon(); - this.$el.children('i').addClass(this._convertDirectionToIcon(dir)); + this.$el.children('i.sort-direction-icon').addClass(this._convertDirectionToIcon(dir)); }, _removeSortIcon : function() { - this.$el.children('i').removeClass('icon-sonarr-sort-asc icon-sonarr-sort-desc'); + this.$el.children('i.sort-direction-icon').removeClass('icon-sonarr-sort-asc icon-sonarr-sort-desc'); } });