diff --git a/CHANGES.md b/CHANGES.md
index 08e2837..307d493 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -32,6 +32,9 @@
* Add CPU throttling preset "Disabled" to config/General/Advanced Settings
* Change overhaul Kodi notifier and tidy up config/notification/KodiNotifier ui
* Add passthru of param "post_json" to Requests() "json" in helpers.getURL
+* Add search show Name to Show List Layout: Poster
+* Change indicate when not sorting with article by dimming ("The", "A", "An") on Show List, Episode, History,
+ Mass Update, Add with Browse and from Existing views
### 0.11.6 (2016-02-18 23:10:00 UTC)
diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css
index 5b898c6..fd77041 100644
--- a/gui/slick/css/dark.css
+++ b/gui/slick/css/dark.css
@@ -218,12 +218,12 @@ home.tmpl
color:#fff
}
-.show{
+#show-list .show-card{
background-color:#333;
border:1px solid #111
}
-.show .ui-widget-content{
+#show-list .show-card .ui-widget-content{
border-top:1px solid #111;
border-bottom:1px solid #111;
border-left:0;
@@ -265,6 +265,7 @@ td.tvShow a{
text-decoration:none
}
+td.tvShow a:hover span,
td.tvShow a:hover{
cursor:pointer;
color:#09A2FF
@@ -274,21 +275,10 @@ td.tvShow a:hover{
home_addShows.tmpl
========================================================================== */
-.icon-addnewshow{
- background-image:url("../images/addshows/add-new32-white.png")
-}
-
-.icon-addtrendingshow{
- background-image:url("../images/addshows/add-trending32-white.png")
-}
-
-.icon-addrecommendedshow{
- background-image:url("../images/addshows/add-trakt32-white.png")
-}
-
-.icon-addexistingshow{
- background-image:url("../images/addshows/add-existing32-white.png")
-}
+.icon-addnewshow{background-image:url("../images/addshows/add-new32-white.png")}
+.icon-addexistingshow{background-image:url("../images/addshows/add-existing32-white.png")}
+.icon-addrecommendedshow{background-image:url("../images/addshows/add-trakt32-white.png")}
+.icon-addtrendingshow{background-image:url("../images/addshows/add-trending32-white.png")}
/* =======================================================================
home_newShow.tmpl
@@ -303,6 +293,10 @@ home_newShow.tmpl
background-color:rgb(40, 40, 40)
}
+.article{
+ color:#707070
+}
+
#addRootDirTable td label .filepath,
.grey-text{
color:#999
@@ -331,7 +325,7 @@ ul#rootDirStaticList li{
home_browseShows.tmpl
========================================================================== */
-.browse-container{
+#browse-list .show-card{
background-color:#333;
border:1px solid #111
}
@@ -684,10 +678,14 @@ bootstrap Overrides
========================================================================== */
body{
- color:#fff;
background-color:#222
}
+body,
+.show-date{
+ color:#fff
+}
+
input, textarea, select, .uneditable-input{
width:auto;
color:#000
@@ -1177,7 +1175,7 @@ pre{
/* =======================================================================
input sizing (for config pages)
========================================================================== */
-
+
.showlist-select optgroup,
#pickShow optgroup,
#showfilter optgroup,
@@ -1185,8 +1183,8 @@ input sizing (for config pages)
color:#eee;
background-color:rgb(51, 51, 51)
}
-
-.showlist-select optgroup option,
+
+.showlist-select optgroup option,
#pickShow optgroup option,
#showfilter optgroup option,
#editAProvider optgroup option{
diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css
index f5f2cd2..51fffbb 100644
--- a/gui/slick/css/light.css
+++ b/gui/slick/css/light.css
@@ -217,12 +217,13 @@ home.tmpl
color:#000
}
-.show{
+#show-list .show-card{
background-color:#DFDACF;
+ color:#666;
border:1px solid #111
}
-.show .ui-widget-content{
+#show-list .show-card .ui-widget-content{
border-top:1px solid #111;
border-bottom:1px solid #111;
border-left:0;
@@ -264,6 +265,7 @@ td.tvShow a{
text-decoration:none
}
+td.tvShow a:hover span,
td.tvShow a:hover{
cursor:pointer;
color:#428BCA
@@ -273,21 +275,10 @@ td.tvShow a:hover{
home_addShows.tmpl
========================================================================== */
-.icon-addnewshow{
- background-image:url("../images/addshows/add-new32-black.png")
-}
-
-.icon-addtrendingshow{
- background-image:url("../images/addshows/add-trending32-black.png")
-}
-
-.icon-addrecommendedshow{
- background-image:url("../images/addshows/add-trakt32-black.png")
-}
-
-.icon-addexistingshow{
- background-image:url("../images/addshows/add-existing32-black.png")
-}
+.icon-addnewshow{background-image:url("../images/addshows/add-new32-black.png")}
+.icon-addexistingshow{background-image:url("../images/addshows/add-existing32-black.png")}
+.icon-addrecommendedshow{background-image:url("../images/addshows/add-trakt32-black.png")}
+.icon-addtrendingshow{background-image:url("../images/addshows/add-trending32-black.png")}
/* =======================================================================
home_newShow.tmpl
@@ -302,6 +293,10 @@ home_newShow.tmpl
background-color:rgb(245, 245, 245)
}
+.article{
+ color:#909090
+}
+
#addRootDirTable td label .filepath,
.grey-text{
color:#666
@@ -330,7 +325,7 @@ ul#rootDirStaticList li{
home_browseShows.tmpl
========================================================================== */
-.browse-container{
+#browse-list .show-card{
background-color:#DFDACF;
border:1px solid #111
}
@@ -656,7 +651,8 @@ span.path{
bootstrap Overrides
========================================================================== */
-body{
+body,
+.show-date{
color:#000
}
diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css
index 81af0fd..ef10170 100644
--- a/gui/slick/css/style.css
+++ b/gui/slick/css/style.css
@@ -563,12 +563,11 @@ home.tmpl
font-size:100%
}
-#HomeLayout{margin-top:-35px}
-#HomeLayout.not-poster{height:75px}
-#HomeLayout div.not-poster{position:relative;top:38px}
-#HomeLayout span.not-poster{margin-top:-30px}
-#HomeLayout.poster{margin-top:-35px}
-#HomeLayout span.poster{margin-bottom:10px}
+#HomeLayout{
+ margin-top:-35px;
+ height:75px;
+ margin-bottom:10px
+}
#search_show_name{margin-top:0}
.ui-progressbar{
@@ -644,18 +643,24 @@ home.tmpl
.yes{background-image:url("../images/yes16.png")}
.no{background-image:url("../images/no16.png")}
+.container,
#container{
- margin:0 auto
+ margin:12px auto 12px
}
-.show{
- margin:12px;
+#show-list .show-card{
+ margin:0 2px 12px;
width:188px;
height:352px;
+ float:left;
background-color:#DFDACF;
+ color:#a6a6a6;
border:1px solid #111;
border-radius:6px
}
+#show-list .show-card-top{
+ height:344px
+}
.show-image{
overflow:hidden;
@@ -665,28 +670,33 @@ home.tmpl
border-top-right-radius:5px
}
-.show .ui-progressbar{
- height:7px !important;
- top:-2px
+.show-image a{
+ display:block;
+ height:100%;
+ width:100%
+}
+
+#show-list .show-card .ui-progressbar{
+ height:8px !important;
}
-.show .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br{
- border-bottom-right-radius:0
+#show-list .show-card .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br{
+ border-bottom-right-radius:5px
}
-.show .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl{
- border-bottom-left-radius:0
+#show-list .show-card .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl{
+ border-bottom-left-radius:5px
}
-.show .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr{
+#show-list .show-card .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr{
border-top-right-radius:0
}
-.show .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl{
+#show-list .show-card .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl{
border-top-left-radius:0
}
-.show .ui-widget-content{
+#show-list .show-card .ui-widget-content{
border-top:1px solid #111;
border-bottom:1px solid #111;
border-left:0;
@@ -701,26 +711,17 @@ home.tmpl
border:none
}
-.show .progress-20,
-.show .progress-40,
-.show .progress-60,
-.show .progress-80{
- height:7px
-}
-
-.show .progress-80{
- border-radius:0
-}
-
-.show .progress-60{
- border-radius:0
-}
-
-.show .progress-40{
- border-radius:0
+#show-list .show-card .progress-20,
+#show-list .show-card .progress-40,
+#show-list .show-card .progress-60,
+#show-list .show-card .progress-80{
+ height:8px
}
-.show .progress-20{
+#show-list .show-card .progress-20,
+#show-list .show-card .progress-40,
+#show-list .show-card .progress-60,
+#show-list .show-card .progress-80{
border-radius:0
}
@@ -788,6 +789,10 @@ home.tmpl
display:block
}
+.show-network{
+ font-size:11px;
+}
+
.show-network-image{
width:50px;
height:auto
@@ -860,7 +865,7 @@ home_addShows.tmpl
margin-left:auto
}
-#addShowPortal a{
+#addShowPortal a.btn{
padding:0 20px;
width:360px;
float:left;
@@ -889,26 +894,14 @@ div.buttontext p{
font-size:13px
}
-.icon-addnewshow{
- background-image:url("../images/addshows/add-new32-black.png");
- width:32px;
- height:32px
-}
-
-.icon-addtrendingshow{
- background-image:url("../images/addshows/add-trending32-black.png");
- width:32px;
- height:32px
-}
+.icon-addnewshow{background-image:url("../images/addshows/add-new32-black.png")}
+.icon-addexistingshow{background-image:url("../images/addshows/add-existing32-black.png")}
+.icon-addrecommendedshow{background-image:url("../images/addshows/add-trakt32-black.png")}
+.icon-addtrendingshow{background-image:url("../images/addshows/add-trending32-black.png")}
+.img-anime{background-image: url("../images/addshows/add-anime.gif")}
+.img-imdb{background-image: url("../images/addshows/add-imdb.gif")}
-.icon-addrecommendedshow{
- background-image:url("../images/addshows/add-trakt32-black.png");
- width:32px;
- height:32px
-}
-
-.icon-addexistingshow{
- background-image:url("../images/addshows/add-existing32-black.png");
+.square-32{
width:32px;
height:32px
}
@@ -1063,16 +1056,16 @@ home_browseShows.tmpl
padding-bottom:4px
}
-.browse-container p{
+.show-card-inner p{
padding-top:2px
}
-.browse-container p img{
+.show-card-inner p img{
position:relative;
top:-2px
}
-.browse-container p, .browse-container i{
+.show-card-inner p, .show-card-inner i{
white-space:nowrap;
font-size:12px;
overflow:hidden;
@@ -1080,9 +1073,11 @@ home_browseShows.tmpl
margin:0
}
-.browse-container{
- margin:12px 12px 12px 0;
+#browse-list .show-card{
+ margin:0 2px 12px;
width:188px;
+ height:341px;
+ float:left;
background-color:#DFDACF;
border:1px solid #111;
border-radius:6px
@@ -2070,6 +2065,10 @@ history.tmpl
vertical-align:middle
}
+#historyTable td span.article{
+ vertical-align:initial
+}
+
#historyTable td img.help,
#historyTable td span.help{
cursor:help
@@ -2853,6 +2852,12 @@ div.blackwhitelist.manual{
max-width:300px
}
+img[src=''],img:not([src]){
+ width:102%;
+ height:102%;
+ margin:-1%;
+}
+
/* =======================================================================
bootstrap Overrides
========================================================================== */
diff --git a/gui/slick/interfaces/default/episodeView.tmpl b/gui/slick/interfaces/default/episodeView.tmpl
index 3dd69ec..3b296ef 100644
--- a/gui/slick/interfaces/default/episodeView.tmpl
+++ b/gui/slick/interfaces/default/episodeView.tmpl
@@ -304,6 +304,7 @@
#for $cur_result in $sql_results:
#set $cur_indexer = int($cur_result['indexer'])
#set $runtime = $cur_result['runtime']
+ #set $display_name = (re.sub('^((?:A(?!\s+to)n?)|The)\s(\w)', r'\1 \2', $cur_result['show_name']), $cur_result['show_name'])[$sickbeard.SORT_ARTICLE]
#if int($cur_result['paused']) and not $sickbeard.EPISODE_VIEW_DISPLAY_PAUSED:
#continue
@@ -334,7 +335,7 @@
$sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)
$cur_result['localtime'].strftime('%Y%m%d%H%M')
- $cur_result['show_name']
+ | $display_name
#if int($cur_result['paused']):
[paused]
#end if
@@ -437,6 +438,7 @@
#for $cur_result in $sql_results:
#set $cur_indexer = int($cur_result['indexer'])
+ #set $display_name = (re.sub('^((?:A(?!\s+to)n?)|The)\s(\w)', r'\1 \2', $cur_result['show_name']), $cur_result['show_name'])[$sickbeard.SORT_ARTICLE]
#if int($cur_result['paused']) and not $sickbeard.EPISODE_VIEW_DISPLAY_PAUSED:
#continue
@@ -551,7 +553,7 @@
|
-
+
#end if
diff --git a/gui/slick/interfaces/default/history.tmpl b/gui/slick/interfaces/default/history.tmpl
index db0d835..48db530 100644
--- a/gui/slick/interfaces/default/history.tmpl
+++ b/gui/slick/interfaces/default/history.tmpl
@@ -39,7 +39,7 @@
#if ('detailed' == $layout)
4: function(node) { return \$(node).find('span').text().toLowerCase(); }
#else
- 1: function(node) { return \$(node).find('span').text().toLowerCase(); },
+ 1: function(node) { return \$(node).find('span[data-name]').attr('data-name').toLowerCase(); },
2: function(node) { return \$(node).attr('provider').toLowerCase(); },
5: function(node) { return \$(node).attr('quality').toLowerCase(); }
#end if
@@ -111,7 +111,7 @@
| Quality |
-
+
|
@@ -121,11 +121,16 @@
#for $hItem in $historyResults
#set $curStatus, $curQuality = $Quality.splitCompositeStatus(int($hItem['action']))
+ #set $data_name = (re.sub('^((?:A(?!\s+to)n?)|The)\s(\w)', r'\2', $hItem['show_name']), $hItem['show_name'])[$sickbeard.SORT_ARTICLE]
+ #set $display_name = '%s - S%02iE%02i' % (
+ $data_name,
+ (re.sub('^((?:A(?!\s+to)n?)|The)\s(\w)', r'\1 \2', $hItem['show_name']), $hItem['show_name'])[$sickbeard.SORT_ARTICLE],
+ int(hItem['season']), int(hItem['episode']))
#set $curdatetime = $datetime.datetime.strptime(str($hItem['date']), $history.dateFormat)
$sbdatetime.sbdatetime.sbfdatetime($curdatetime, show_seconds=True) $time.mktime($curdatetime.timetuple()) |
- $hItem['show_name'] - <%= 'S%02i' % int(hItem['season']) + 'E%02i' % int(hItem['episode']) %>#if 'proper' in $hItem['resource'].lower or 'repack' in $hItem['resource'].lower then ' Proper' else ''# |
-
+ | $display_name#if 'proper' in $hItem['resource'].lower or 'repack' in $hItem['resource'].lower then ' Proper' else ''# |
+
#if SUBTITLED == $curStatus
">
#end if
@@ -151,7 +156,7 @@
#end if
#end if
|
- $curQuality$Quality.qualityStrings[$curQuality] |
+ $curQuality$Quality.qualityStrings[$curQuality] |
#end for
@@ -178,6 +183,11 @@
#for $hItem in $compactResults
#set $curdatetime = $datetime.datetime.strptime(str($hItem['actions'][0]['time']), $history.dateFormat)
+ #set $data_name = (re.sub('^((?:A(?!\s+to)n?)|The)\s(\w)', r'\2', $hItem['show_name']), $hItem['show_name'])[$sickbeard.SORT_ARTICLE]
+ #set $display_name = '%s - S%02iE%02i' % (
+ $data_name,
+ (re.sub('^((?:A(?!\s+to)n?)|The)\s(\w)', r'\1 \2', $hItem['show_name']), $hItem['show_name'])[$sickbeard.SORT_ARTICLE],
+ int(hItem['season']), int(hItem['episode']))
#set $prov_list = []
#set $down_list = []
#set $order = 1
@@ -227,7 +237,7 @@
$sbdatetime.sbdatetime.sbfdatetime($curdatetime, show_seconds=True) $time.mktime($curdatetime.timetuple()) |
- $hItem['show_name'] - <%= 'S%02i' % int(hItem['season']) + 'E%02i' % int(hItem['episode']) %>#if 'proper' in $hItem['resource'].lower or 'repack' in $hItem['resource'].lower then ' Proper' else ''#
+ $display_name#if 'proper' in $hItem['resource'].lower or 'repack' in $hItem['resource'].lower then ' Proper' else ''#
|
#echo ''.join($prov_list)#
diff --git a/gui/slick/interfaces/default/home.tmpl b/gui/slick/interfaces/default/home.tmpl
index d972e55..1ea62e9 100644
--- a/gui/slick/interfaces/default/home.tmpl
+++ b/gui/slick/interfaces/default/home.tmpl
@@ -28,48 +28,47 @@
+
+
#set $tab = 1
-#if 'poster' != $layout
+#set $selected = ' selected="selected"'
+#if 'poster' == $layout
+
+ Sort By:
+
+
-
-
-
-
-
+ Sort Order:
+
+
- Layout:
+ Layout:
#else
-
-
- Layout:
+ Layout:
#end if
-#set $selected = ' selected="selected"'
-
-
-#if 'poster' == $layout
-
- Sort By:
-
-
+
+
- Sort Order:
-
-
-
+#if 'poster' == $layout
+
#end if
+
+
+
+
##
#for $curShowlist in $showlists
@@ -84,7 +83,7 @@
##
#if 'poster' == $layout
##
-
+
##
#for $curLoadingShow in $sickbeard.showQueueScheduler.action.loadingShowList
@@ -95,7 +94,7 @@
##
#if None is $curLoadingShow.show
##
-
+
Loading... ($curLoadingShow.show_name)
@@ -116,6 +115,7 @@
#set $cur_total = 0
#set $download_stat_tip = ''
#set $display_status = $curShow.status
+ #set $display_name = (re.sub('^((?:A(?!\s+to)n?)|The)\s(\w)', r' \1 \2', $curShow.name), $curShow.name)[$sickbeard.SORT_ARTICLE]
#if None is not $display_status
#if re.search(r'(?i)(?:new|returning)\s*series', $curShow.status)
#set $display_status = 'Continuing'
@@ -178,18 +178,19 @@
#end if
#end if
##
-
-
- 
-
+
+
+
+ 
+
-
+
-
- $curShow.name
-
+
+ $display_name
+
-
+
#if $cur_airs_next
#set $ldatetime = $sbdatetime.sbdatetime.convert_to_setting($network_timezones.parse_date_time($cur_airs_next,$curShow.airs,$curShow.network))
$sbdatetime.sbdatetime.sbfdate($ldatetime)
@@ -202,34 +203,40 @@
#set $output_html = $display_status
#end if
#end if
- $output_html
+ $output_html
#end if
-
+
-
-
-
- $download_stat
- |
+
+
+
+ $download_stat
+ |
-
- #if 'simple' != $layout
- #set $img_text = ($curShow.network, 'No Network')[None is $curShow.network]
-
+ |
+ #if 'simple' == $layout
+ $curShow.network
#else
- $curShow.network
+ #set $img_text = ($curShow.network, 'No Network')[None is $curShow.network]
+ #if 'No Network' is not $img_text and 'nonetwork' in $network_images[$curShow.indexerid]
+ $curShow.network
+ #else
+
+ #end if
#end if
- |
+
-
+ |
#if $curShow.quality in $qualityPresets
- $qualityPresetStrings[$curShow.quality]
+ $qualityPresetStrings[$curShow.quality]
#else
- Custom
+ Custom
#end if
- |
-
-
+
+
+
+
+
@@ -294,6 +301,7 @@
#set $cur_downloaded = 0
#set $cur_total = 0
#set $download_stat_tip = ''
+ #set $display_name = (re.sub('^((?:A(?!\s+to)n?)|The)\s(\w)', r' \1 \2', $curShow.name), $curShow.name)[$sickbeard.SORT_ARTICLE]
##
#if $curShow.indexerid in $show_stat
#set $cur_airs_next = $show_stat[$curShow.indexerid]['ep_airs_next']
@@ -350,7 +358,7 @@
- $curShow.name
+ $display_name
|
#else if 'banner' == $layout
@@ -361,18 +369,22 @@
- $curShow.name
+ $display_name/span>
#else if 'simple' == $layout
- $curShow.name |
+ $display_name |
#end if
#if 'simple' != $layout
#set $img_text = ($curShow.network, 'No Network')[None is $curShow.network]
+ #if 'No Network' is not $img_text and 'nonetwork' in $network_images[$curShow.indexerid]
+ $curShow.network
+ #else
$curShow.network
+ #end if
|
#else
@@ -420,4 +432,4 @@
##
-#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl')
\ No newline at end of file
+#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl')
diff --git a/gui/slick/interfaces/default/home_addExistingShow.tmpl b/gui/slick/interfaces/default/home_addExistingShow.tmpl
index d3784e8..4016402 100644
--- a/gui/slick/interfaces/default/home_addExistingShow.tmpl
+++ b/gui/slick/interfaces/default/home_addExistingShow.tmpl
@@ -12,13 +12,11 @@
@@ -37,7 +35,7 @@