From c8c1a07f85e84e63e0188e1cb08eff3cdf55f775 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Thu, 20 Nov 2014 22:25:33 +0000 Subject: [PATCH] Overhaul all Add Show pages. --- CHANGES.md | 1 + gui/slick/css/dark.css | 281 ++---------- gui/slick/css/light.css | 270 ++--------- gui/slick/css/style.css | 233 ++++++---- gui/slick/interfaces/default/editShow.tmpl | 1 - .../default/home_addExistingShow.tmpl | 82 ++-- .../interfaces/default/home_addShows.tmpl | 89 ++-- .../interfaces/default/home_massAddTable.tmpl | 6 +- .../interfaces/default/home_newShow.tmpl | 34 +- .../default/home_recommendedShows.tmpl | 22 +- .../default/inc_addShowOptions.tmpl | 125 +++--- .../default/inc_qualityChooser.tmpl | 66 +-- gui/slick/interfaces/default/inc_top.tmpl | 2 +- gui/slick/js/addExistingShow.js | 137 +++--- gui/slick/js/formwizard.js | 365 +++++++++------ gui/slick/js/newShow.js | 423 ++++++++++-------- gui/slick/js/qualityChooser.js | 61 ++- gui/slick/js/recommendedShows.js | 307 ++++++++----- sickbeard/webserve.py | 31 +- 19 files changed, 1228 insertions(+), 1308 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 57204f0a..b121c22e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ * Fix visual positioning of sprites on Config page * Fix missing navbar gradients for all browsers * Update qTip2 to v2.2.1 +* Overhaul all Add Show pages [develop changelog] * Add TVRage network name standardization diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index 695971b2..d38bd9bb 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -773,122 +773,38 @@ td.tvShow a:hover { /* ======================================================================= home_addShows.tmpl ========================================================================== */ - -#addShowPortal { - width: 700px; - padding: 10px 0; - margin-right: auto; - margin-left: auto; -} - -#addShowPortal a { - padding: 10px; -} - -div.button { - display: table-cell; - vertical-align: middle; - padding-left: 10px; -} - -div.buttontext { - display: table-cell; - padding-left: 20px; - text-align: left; - white-space: normal; -} - -div.buttontext h3 { - margin-top: 10px; -} - -div.buttontext p { - font-size: 13px; -} - .icon-addnewshow { background-image: url("../images/addshows/add-new32-white.png"); - width: 32px; - height: 32px; } .icon-addtrendingshow { background-image: url("../images/addshows/add-trending32-white.png"); - width: 32px; - height: 32px; } .icon-addrecommendedshow { background-image: url("../images/addshows/add-trakt32-white.png"); - width: 32px; - height: 32px; } .icon-addexistingshow { background-image: url("../images/addshows/add-existing32-white.png"); - width: 32px; - height: 32px; } /* ======================================================================= home_newShow.tmpl ========================================================================== */ -#addShowForm, #recommendedShowsForm { - margin-left: auto; - margin-right: auto; -} - -#newShowPortal { - width: 800px; - padding: 10px 0; - margin-right: auto; - margin-left: auto; -} - #displayText { - padding: 8px; - overflow: hidden; - font-size: 14px; - background-color: #3d3d3d; - border: 1px solid #111; -} - -#searchResults input[type="radio"] { - vertical-align: -2px; + background-color: rgb(17, 120, 179); + border: 0; } /* ======================================================================= home_addExistingShow.tmpl ========================================================================== */ -.existingtabs { - padding: 1em 1.4em; -} - -ul#rootDirStaticList { - width: 90%; - margin-right: auto; - margin-left: auto; - text-align: left; -} - ul#rootDirStaticList li { - padding: 4px 5px 4px 5px; - margin: 2px; - list-style: none outside none; - cursor: pointer; background: #3d3d3d; } -ul#rootDirStaticList li label { - margin-top: 5px; - margin-bottom: 5px; -} - -ul#rootDirStaticList li input[type="checkbox"] { - vertical-align: -2px; -} - /* ======================================================================= home_trendingShows.tmpl ========================================================================== */ @@ -1834,11 +1750,6 @@ body { background-color: #222; } -html * { - outline: 0 !important; -} - - input[type="radio"] { margin: 2px 0px 0px; line-height: normal; @@ -2002,12 +1913,6 @@ fieldset[disabled] .navbar-default .btn-link:focus { color: #000000; } -.form-control-inline { - min-width: 0; - width: auto; - display: inline; -} - .btn { color: #fff; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.75); @@ -2052,7 +1957,6 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn:hover { color: #fff; - text-decoration: none; background-color: #2672B6; *background-color: #2672B6; background-position: 0 -150px; @@ -2085,8 +1989,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #15528F; - background-image: none; + background: #15528F none; opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; @@ -2094,19 +1997,6 @@ fieldset[disabled] .navbar-default .btn-link:focus { box-shadow: none; } -.btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.btn-large [class^="icon-"] { - margin-top: 1px; -} - .btn-small { padding: 5px 9px; font-size: 11px; @@ -2368,58 +2258,12 @@ input sizing (for config pages) ========================================================================== */ #editAProvider optgroup { color: #eee; - background-color: rgb(51, 51, 51); + background-color: rgb(51, 51, 51); } #editAProvider optgroup option { color: #222; - background-color: #fff; -} - -#config select { - min-width: 0; - width: auto; - display: inline; - margin-top: -4px; -} - -.btn-inline { - margin-top: -3px; -} - -.input75 { - width: 75px; - margin-top: -4px; -} - -.input100 { - width: 100px; - margin-top: -4px; -} - -.input150 { - width: 150px; - margin-top: -4px; -} - -.input200 { - width: 200px; - margin-top: -4px; -} - -.input250 { - width: 250px; - margin-top: -4px; -} - -.input300 { - width: 300px; - margin-top: -4px; -} - -.input350 { - width: 350px; - margin-top: -4px; + background-color: #fff; } /* ======================================================================= @@ -2498,92 +2342,31 @@ browser.css /* ======================================================================= -formWizard.css +formWizard ========================================================================== */ - -fieldset.sectionwrap { - width: 800px; - padding: 5px; - text-align: left; - border-width: 0; -} - +.step, legend.legendStep { color: #ffffff; - margin-bottom: 0px; -} - -div.stepsguide { - margin-bottom: 15px; - overflow: hidden; - text-align: left; - cursor: pointer; -} - -div.stepsguide .step { - float: left; - width: 266px; - font: bold 24px Arial; } div.stepsguide .step p { - margin: 12px 0; - border-bottom: 4px solid #23AFDC; + border-color: #23AFDC; } -div.stepsguide .disabledstep { - color: #c4c4c4; +.disabledstep { + color: #646464; } div.stepsguide .disabledstep p { - border-bottom: 4px solid #1178B3; -} - -div.stepsguide .step .smalltext { - font-size: 13px; - font-weight: normal; -} - -div.formpaginate { - width: 800px; - margin-top: 1em; - overflow: auto; - font-weight: bold; - text-align: center; + border-color: #1178B3; } div.formpaginate .prev, div.formpaginate .next { - padding: 3px 6px; color: #fff; - cursor: hand; - cursor: pointer; background: #2265A1; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; } -.stepDiv { - padding: 15px; -} - -/* step 3 related */ -#customQuality { - display: block; - padding: 10px 0; - overflow: hidden; - clear: both; -} - -#customQualityWrapper div.component-group-desc { - float: left; - width: 165px; -} - #customQualityWrapper div.component-group-desc p { - width: 85%; - margin: .8em 0; - font-size: 1.2em; color: #666; } @@ -2629,10 +2412,7 @@ tablesorter.css .tablesorter th, .tablesorter td { - padding: 4px; - border-top: #222 1px solid; - border-left: #222 1px solid; - vertical-align: middle; + border-color: #222; } /* remove extra border from left edge */ @@ -2643,31 +2423,22 @@ tablesorter.css .tablesorter th { color: #fff; - text-align: center; text-shadow: -1px -1px 0 rgba(0,0,0,0.3); background-color: #15528F; - border-collapse: collapse; - font-weight: normal; } .tablesorter .tablesorter-header { - padding: 4px 18px 4px 18px; - cursor: pointer; - background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==); - background-position: center right; - background-repeat: no-repeat; + background: #15528F url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==) no-repeat center right; /* background-image: url(../images/tablesorter/bg.gif); */ } .tablesorter thead .tablesorter-headerDesc { - background-color: #297AB8; - background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7); + background: #297AB8 url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7) no-repeat center right; /* background-image: url(../images/tablesorter/asc.gif); */ } .tablesorter thead .tablesorter-headerAsc { - background-color: #297AB8; - background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7); + background: #297AB8 url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7) no-repeat center right; /* background-image: url(../images/tablesorter/desc.gif); */ } @@ -2730,10 +2501,9 @@ thead.tablesorter-stickyHeader { .tablesorter tfoot a { color:#fff; - text-decoration: none; } -#showListTable tbody { +#showListTable tbody { color: #000; } @@ -2872,6 +2642,25 @@ span.token-input-delete-token { margin: 0 1px; } +.step-one #searchResults .alt { + background-color: rgb(40, 40, 40); +} + +#addRootDirTable td label .filepath, +.grey-text { + color:#999 +} + +#newShowPortal #displayText .show-name, +#newShowPortal #displayText .show-dest, +#newShowPortal #displayText p { + color: rgb(200, 200, 200) +} + +#newShowPortal #displayText .show-name, +#newShowPortal #displayText .show-dest { + color: rgb(255, 255, 255) +} /* ======================================================================= jquery.confirm.css ========================================================================== */ diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css index a33900b2..5984405b 100644 --- a/gui/slick/css/light.css +++ b/gui/slick/css/light.css @@ -760,122 +760,38 @@ td.tvShow a:hover { /* ======================================================================= home_addShows.tmpl ========================================================================== */ - -#addShowPortal { - width: 700px; - padding: 10px 0; - margin-right: auto; - margin-left: auto; -} - -#addShowPortal a { - padding: 10px; -} - -div.button { - display: table-cell; - vertical-align: middle; - padding-left: 10px; -} - -div.buttontext { - display: table-cell; - padding-left: 20px; - text-align: left; - white-space: normal; -} - -div.buttontext h3 { - margin-top: 10px; -} - -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-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"); - width: 32px; - height: 32px; } /* ======================================================================= home_newShow.tmpl ========================================================================== */ -#addShowForm, #recommendedShowsForm { - margin-left: auto; - margin-right: auto; -} - -#newShowPortal { - width: 800px; - padding: 10px 0; - margin-right: auto; - margin-left: auto; -} - #displayText { - padding: 8px; - overflow: hidden; - font-size: 14px; background-color: #efefef; - border: 1px solid #dfdede; -} - -#searchResults input[type="radio"] { - vertical-align: -2px; + border-color: #dfdede; } /* ======================================================================= home_addExistingShow.tmpl ========================================================================== */ -.existingtabs { - padding: 1em 1.4em; -} - -ul#rootDirStaticList { - width: 90%; - margin-right: auto; - margin-left: auto; - text-align: left; -} - ul#rootDirStaticList li { - padding: 4px 5px 4px 5px; - margin: 2px; - list-style: none outside none; - cursor: pointer; background: url('../css/lib/images/ui-bg_highlight-soft_75_efefef_1x100.png') repeat-x scroll 50% 50% #EFEFEF; } -ul#rootDirStaticList li label { - margin-top: 5px; - margin-bottom: 5px; -} - -ul#rootDirStaticList li input[type="checkbox"] { - vertical-align: -2px; -} - /* ======================================================================= home_trendingShows.tmpl ========================================================================== */ @@ -1813,10 +1729,6 @@ body { color: #000; } -html * { - outline: 0 !important; -} - input[type="radio"] { margin: 2px 0px 0px; line-height: normal; @@ -2027,7 +1939,6 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn:hover { color: #333333; - text-decoration: none; background-color: #e6e6e6; *background-color: #d9d9d9; background-position: 0 -15px; @@ -2058,8 +1969,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; - background-image: none; + background: #e6e6e6 none; opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; @@ -2067,19 +1977,6 @@ fieldset[disabled] .navbar-default .btn-link:focus { box-shadow: none; } -.btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.btn-large [class^="icon-"] { - margin-top: 1px; -} - .btn-small { padding: 5px 9px; font-size: 11px; @@ -2341,58 +2238,12 @@ input sizing (for config pages) ========================================================================== */ #editAProvider optgroup { color: #eee; - background-color: #888; + background-color: #888; } #editAProvider optgroup option { color: #222; - background-color: #fff; -} - -#config select { - min-width: 0; - width: auto; - display: inline; - margin-top: -4px; -} - -.btn-inline { - margin-top: -3px; -} - -.input75 { - width: 75px; - margin-top: -4px; -} - -.input100 { - width: 100px; - margin-top: -4px; -} - -.input150 { - width: 150px; - margin-top: -4px; -} - -.input200 { - width: 200px; - margin-top: -4px; -} - -.input250 { - width: 250px; - margin-top: -4px; -} - -.input300 { - width: 300px; - margin-top: -4px; -} - -.input350 { - width: 350px; - margin-top: -4px; + background-color: #fff; } /* ======================================================================= @@ -2470,92 +2321,31 @@ browser.css /* ======================================================================= -formWizard.css +formWizard ========================================================================== */ - -fieldset.sectionwrap { - width: 800px; - padding: 5px; - text-align: left; - border-width: 0; -} - +.step, legend.legendStep { color: #57442b; - margin-bottom: 0px; -} - -div.stepsguide { - margin-bottom: 15px; - overflow: hidden; - text-align: left; - cursor: pointer; -} - -div.stepsguide .step { - float: left; - width: 266px; - font: bold 24px Arial; } div.stepsguide .step p { - margin: 12px 0; - border-bottom: 4px solid #57442b; + border-color: #57442b; } -div.stepsguide .disabledstep { +.disabledstep { color: #c4c4c4; } div.stepsguide .disabledstep p { - border-bottom: 4px solid #8a775e; -} - -div.stepsguide .step .smalltext { - font-size: 13px; - font-weight: normal; -} - -div.formpaginate { - width: 800px; - margin-top: 1em; - overflow: auto; - font-weight: bold; - text-align: center; + border-color: #8a775e; } div.formpaginate .prev, div.formpaginate .next { - padding: 3px 6px; color: #fff; - cursor: hand; - cursor: pointer; background: #57442b; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; } -.stepDiv { - padding: 15px; -} - -/* step 3 related */ -#customQuality { - display: block; - padding: 10px 0; - overflow: hidden; - clear: both; -} - -#customQualityWrapper div.component-group-desc { - float: left; - width: 165px; -} - #customQualityWrapper div.component-group-desc p { - width: 85%; - margin: .8em 0; - font-size: 1.2em; color: #666; } @@ -2575,10 +2365,7 @@ tablesorter.css .tablesorter th, .tablesorter td { - padding: 4px; - border-top: #fff 1px solid; - border-left: #fff 1px solid; - vertical-align: middle; + border-color: #fff; } /* remove extra border from left edge */ @@ -2589,32 +2376,23 @@ tablesorter.css .tablesorter th { color: #fff; - text-align: center; text-shadow: -1px -1px 0 rgba(0,0,0,0.3); background-color: #333; - border-collapse: collapse; - font-weight: normal; } .tablesorter .tablesorter-header { - padding: 4px 18px 4px 18px; - cursor: pointer; - background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==); - background-position: center right; - background-repeat: no-repeat; + background: #333 url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==) no-repeat center right; /* background-image: url(../images/tablesorter/bg.gif); */ } .tablesorter thead .tablesorter-headerDesc { - background-color: #555; - background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7); + background: #555 url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7) no-repeat center right; /* background-image: url(../images/tablesorter/asc.gif); */ } .tablesorter thead .tablesorter-headerAsc { - background-color: #555; - background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7); - /* background-image: url(../images/tablesorter/desc.gif); */ + background: #555 url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7) no-repeat center right; + /* background-image: url(../images/tablesorter/desc.gif); */ } .tablesorter thead .sorter-false { @@ -2676,7 +2454,6 @@ thead.tablesorter-stickyHeader { .tablesorter tfoot a { color:#fff; - text-decoration: none; } /* ======================================================================= @@ -2813,6 +2590,25 @@ span.token-input-delete-token { margin: 0 1px; } +.step-one #searchResults .alt { + background-color: rgb(245, 245, 245); +} + +#addRootDirTable td label .filepath, +.grey-text { + color:#666 +} + +#newShowPortal #displayText .show-name, +#newShowPortal #displayText .show-dest, +#newShowPortal #displayText p { + color: rgb(153, 153, 153); +} + +#newShowPortal #displayText .show-name, +#newShowPortal #displayText .show-dest { + color: rgb(87, 68, 43); +} /* ======================================================================= jquery.confirm.css ========================================================================== */ diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index ac24150b..07bf7bf7 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -511,7 +511,6 @@ home.tmpl border: 1px solid #ccc; overflow: hidden; height: 66px; - overflow: hidden; border-radius: 8px; vertical-align: top; width: 360px; @@ -792,31 +791,42 @@ home_addShows.tmpl ========================================================================== */ #addShowPortal { - width: 700px; + width: 750px; padding: 10px 0; margin-right: auto; margin-left: auto; } #addShowPortal a { - padding: 10px; +/* padding: 10px;*/ + padding: 0px 20px; + width: 360px; + + float: left; + margin: 0 15px 15px 0; } div.button { display: table-cell; vertical-align: middle; - padding-left: 10px; +/* padding-left: 10px;*/ } div.buttontext { display: table-cell; +/* padding-left: 20px; + padding: 10px 15px; +*/ + padding: 10px 0px 10px 15px; text-align: left; white-space: normal; } - +div.buttontext p { + margin: 0 +} div.buttontext h3 { - margin-top: 10px; + margin-top: 0px; } div.buttontext p { @@ -850,13 +860,19 @@ div.buttontext p { /* ======================================================================= home_newShow.tmpl ========================================================================== */ -#addShowForm, #recommendedShowsForm { +#addShowForm, +#newShowPortal, +fieldset.sectionwrap, +div.formpaginate { + width: 801px +} + +#addShowForm { margin-left: auto; margin-right: auto; } #newShowPortal { - width: 800px; padding: 10px 0; margin-right: auto; margin-left: auto; @@ -866,20 +882,44 @@ home_newShow.tmpl padding: 8px; overflow: hidden; font-size: 14px; - background-color: #efefef; - border: 1px solid #dfdede; + border: 1px solid; } #searchResults input[type="radio"] { vertical-align: -2px; } +#addShowForm #promptForSettings, +#addShowForm #rootDirStaticList input, +#addShowForm div.field-pair input, +#addShowForm div.field-pair select { + margin-right: 6px; +} + +#addShowForm #customQualityWrapper div.component-group-desc p { + font-size: 14px; +} + +#addShowForm #nameToSearch { + width: 460px; + margin-top: 0 +} + +#addShowForm #providedIndexer, +#addShowForm #indexerLangSelect { + margin-left: 7px +} + +#addShowForm #searchName { + margin-left: 10px +} + /* ======================================================================= home_addExistingShow.tmpl ========================================================================== */ .existingtabs { - padding: 1em 1.4em; + padding: 20px; } ul#rootDirStaticList { @@ -887,14 +927,15 @@ ul#rootDirStaticList { margin-right: auto; margin-left: auto; text-align: left; + list-style-type: none; + padding: 0 } ul#rootDirStaticList li { - padding: 4px 5px 4px 5px; - margin: 2px; + padding: 4px 10px; + margin: 2px 0; list-style: none outside none; cursor: pointer; - background: url('../css/lib/images/ui-bg_highlight-soft_75_efefef_1x100.png') repeat-x scroll 50% 50% #EFEFEF; } ul#rootDirStaticList li label { @@ -1537,15 +1578,27 @@ config*.tmpl color: #666; } -#config div.field-pair { - padding: 12px 0px; +.stepDiv #customQualityWrapper h4 { + margin-top: 6px; + padding: 0 0 } +.stepDiv div.field-pair { + padding: 0 0 10px +} + +#config div.field-pair { + padding: 12px 0 +} + +.stepDiv .component-desc select, +.stepDiv .component-desc input, #config div.field-pair select, #config div.field-pair input { margin-right: 15px; } +.stepDiv .component-desc input, #config div.field-pair input { float: left; } @@ -1554,6 +1607,11 @@ config*.tmpl padding-left: 20px; } +.stepDiv span.component-title.input { + line-height: 30px +} + +.stepDiv span.component-title, #config span.component-title { float: left; width: 172px; @@ -1562,6 +1620,11 @@ config*.tmpl font-weight: bold; } +#addShowForm .stepDiv span.component-desc { + width:578px; +} + +.stepDiv span.component-desc, #config span.component-desc { font-size: 12px; font-weight: normal; @@ -2297,9 +2360,9 @@ fieldset[disabled] .navbar-default .btn-link:focus { border-radius: 5px; } -.btn-large [class^="icon-"] { +/*.btn-large [class^="icon-"] { margin-top: 1px; -} +}*/ .btn-small { padding: 5px 9px; @@ -2680,45 +2743,46 @@ browser.css /* ======================================================================= -formWizard.css +formWizard ========================================================================== */ fieldset.sectionwrap { - width: 800px; - padding: 5px; + padding: 5px 0; text-align: left; border-width: 0; } +.step-one #searchResults legend.legendStep { + margin-top: 10px; +} + +div.stepsguide .step, legend.legendStep { - color: #57442b; - margin-bottom: 0px; + margin-bottom: 0; +} + +legend.legendStep p { + padding-left: 15px; } div.stepsguide { - margin-bottom: 15px; - overflow: hidden; text-align: left; cursor: pointer; } div.stepsguide .step { float: left; - width: 266px; + width: 267px; font: bold 24px Arial; } div.stepsguide .step p { - margin: 12px 0; - border-bottom: 4px solid #57442b; -} - -div.stepsguide .disabledstep { - color: #c4c4c4; + margin: 12px 0 0; + border-bottom: 5px solid; } div.stepsguide .disabledstep p { - border-bottom: 4px solid #8a775e; + border-bottom: 2px solid; } div.stepsguide .step .smalltext { @@ -2727,56 +2791,41 @@ div.stepsguide .step .smalltext { } div.formpaginate { - width: 800px; margin-top: 1em; - overflow: auto; font-weight: bold; text-align: center; } +.step-outer { + overflow: hidden +} + div.formpaginate .prev, div.formpaginate .next { padding: 3px 6px; - color: #fff; cursor: hand; cursor: pointer; - background: #57442b; -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .stepDiv { padding: 15px; } +.stepDiv.parent-folder { + padding: 15px 0 0; + width: 430px; + margin: 0px auto; +} -#tabs .nocheck, .stepDiv .nocheck { padding-left: 16px; } -#tabs label span.component-title, -.stepDiv label span.component-title { - padding-bottom: 6px; - float: left; - width: 172px; - margin-right: 10px; - font-size: 13px; - font-weight: bold; -} - -#tabs label span.component-desc, -.stepDiv label span.component-desc { - padding-bottom: 6px; - font-size: 12px; - font-weight: normal; - display:inline-block; - width:475px; -} - /* step 3 related */ #customQuality { display: block; - padding: 10px 0; + padding: 0 0 10px 0; overflow: hidden; clear: both; } @@ -2790,7 +2839,6 @@ div.formpaginate .prev, div.formpaginate .next { width: 85%; margin: .8em 0; font-size: 1.2em; - color: #666; } /* ======================================================================= @@ -2810,9 +2858,9 @@ tablesorter.css .tablesorter th, .tablesorter td { padding: 4px; - border-top: #fff 1px solid; - border-left: #fff 1px solid; - vertical-align: middle; + border-top: 1px solid; + border-left: 1px solid; + vertical-align: baseline; } /* remove extra border from left edge */ @@ -2822,10 +2870,7 @@ tablesorter.css } .tablesorter th { - color: #fff; text-align: center; - text-shadow: -1px -1px 0 rgba(0,0,0,0.3); - background-color: #333; border-collapse: collapse; font-weight: normal; } @@ -2833,22 +2878,7 @@ tablesorter.css .tablesorter .tablesorter-header { padding: 4px 18px 4px 18px; cursor: pointer; - background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==); - background-position: center right; - background-repeat: no-repeat; - /* background-image: url(../images/tablesorter/bg.gif); */ -} - -.tablesorter thead .tablesorter-headerDesc { - background-color: #555; - background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7); - /* background-image: url(../images/tablesorter/asc.gif); */ -} - -.tablesorter thead .tablesorter-headerAsc { - background-color: #555; - background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7); - /* background-image: url(../images/tablesorter/desc.gif); */ + vertical-align: middle; } .tablesorter thead .sorter-false { @@ -2909,7 +2939,6 @@ thead.tablesorter-stickyHeader { } .tablesorter tfoot a { - color:#fff; text-decoration: none; } @@ -3052,6 +3081,42 @@ span.token-input-delete-token { margin: 0 1px; } +.stepDiv #searchResults div { + line-height: 1.7; +} + +.stepDiv #searchResults #searchingAnim { + margin-right: 6px; +} + +.stepone-result-title { + font-weight: 600; + margin-left: 10px +} + +.stepone-result-date, +.stepone-result-db, +.stepone-result-overview { + margin-left: 5px +} +.stepone-result-db img { + margin-top: 3px; + vertical-align: top; +} +#newShowPortal #displayText .show-name, +#newShowPortal #displayText .show-dest, +#newShowPortal #displayText p { + margin: 0; +} +#newShowPortal #displayText .show-name, +#newShowPortal #displayText .show-dest { + font-weight: 600; +} + +#addRootDirTable td label .filepath { + font-weight: 900 +} + .boldest {font-weight: 900} .red-text {color:#d33} .clear-left {clear:left} diff --git a/gui/slick/interfaces/default/editShow.tmpl b/gui/slick/interfaces/default/editShow.tmpl index f89f3746..bdfc2735 100644 --- a/gui/slick/interfaces/default/editShow.tmpl +++ b/gui/slick/interfaces/default/editShow.tmpl @@ -65,7 +65,6 @@ Location:

-Quality: #set $qualities = $common.Quality.splitQuality(int($show.quality)) #set global $anyQualities = $qualities[0] #set global $bestQualities = $qualities[1] diff --git a/gui/slick/interfaces/default/home_addExistingShow.tmpl b/gui/slick/interfaces/default/home_addExistingShow.tmpl index 07774da1..e398b54d 100644 --- a/gui/slick/interfaces/default/home_addExistingShow.tmpl +++ b/gui/slick/interfaces/default/home_addExistingShow.tmpl @@ -1,17 +1,15 @@ #import os.path #import sickbeard #from sickbeard.common import * -#set global $title="Existing Show" -#set global $header="Existing Show" +#set global $title = 'Existing Show' +#set global $header = 'Existing Show' -#set global $sbPath="../.." +#set global $sbPath = '../..' -#set global $statpath="../.."# -#set global $topmenu="home"# +#set global $statpath = '../..' +#set global $topmenu = 'home' #import os.path -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") - -
+#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') @@ -21,7 +19,7 @@ -#if $varExists('header') +#if $varExists('header')

$header

-#else +#else

$title

#end if -
- -
- #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_rootDirs.tmpl") -
-
- #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_addShowOptions.tmpl") -
-
-
+ -

SickGear can add existing shows, using the current options, by using locally stored NFO/XML metadata to eliminate user interaction.
-If you would rather have SickGear prompt you to customize each show, then use the checkbox below.

+ -

+

Tip: shows are added quicker when usable show nfo and xml metadata is found

-
+

+ + +

-
Displaying folders within these directories which aren't already added to SickGear:
+
+ +
+
+#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_rootDirs.tmpl') +
+
+
+
+#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_addShowOptions.tmpl') +
+
+
- +
+
-
-
-
- +

The following parent folder(s) are scanned for existing shows. Toggle a folder to display shows

+ + + +

shows not known to SickGear are listed below...

+ +
+ +
+
-#include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') diff --git a/gui/slick/interfaces/default/home_addShows.tmpl b/gui/slick/interfaces/default/home_addShows.tmpl index 71272921..b82f59b4 100644 --- a/gui/slick/interfaces/default/home_addShows.tmpl +++ b/gui/slick/interfaces/default/home_addShows.tmpl @@ -1,16 +1,16 @@ #import os.path #import urllib #import sickbeard -#set global $title="Add Show" -#set global $header="Add Show" +#set global $title = 'Add Show' +#set global $header = 'Add Show' -#set global $sbPath="../.." +#set global $sbPath = '../..' -#set global $statpath="../.."# -#set global $topmenu="home"# +#set global $statpath = '../..' +#set global $topmenu = 'home' #import os.path -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') #if $varExists('header')

$header

@@ -18,46 +18,49 @@

$title

#end if -
+
- -
-
-

Add New Show

-

For shows that you haven't downloaded yet, this option finds a show on theTVDB.com and TVRage.com, creates a directory for its episodes, and adds it to SickGear.

-
- + +
+
+

Add New Show

+

Search a TV database for a show to add. A new folder will be created for episodes

+
+ -

- -
-
-

Add Trending Show

-

For shows that you haven't downloaded yet, this option lets you choose from a list of current trending shows with ratings to add, creates a directory for its episodes, and adds it to SickGear.

-
- + +
+
+

Add From Trending

+

Browse a current trending show list to add from. A folder for episodes will be created

+
+ -

- #if $sickbeard.USE_TRAKT == True: - -
-
-

Add Recommended Shows

-

For shows that you haven't downloaded yet, this option recommends shows to add based on your Trakt.tv show library, creates a directory for its episodes, and adds it to SickGear.

-
- + +
+
+

Add Existing Shows

+

Scan parent folders for shows and episode metadata to import into SickGear

+
+ -

- #end if - -
-
-

Add Existing Shows

-

Use this option to add shows that already have a folder created on your hard drive. SickGear will scan your existing metadata/episodes and add the show accordingly.

-
- +#if True == $sickbeard.USE_TRAKT: + +
+
+

Add Recommended

+

Browse recommendations based on your Trakt.tv show library to add to SickGear

+
+ +#else +
+

There's more... unlock another button to browse
+ recommended shows based on your Trakt.tv show
+ library by enabling Trakt in Config/Notifications/Social

+
+#end if +
-
+
 
- -#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') \ No newline at end of file diff --git a/gui/slick/interfaces/default/home_massAddTable.tmpl b/gui/slick/interfaces/default/home_massAddTable.tmpl index 920e5695..1f0faf79 100644 --- a/gui/slick/interfaces/default/home_massAddTable.tmpl +++ b/gui/slick/interfaces/default/home_massAddTable.tmpl @@ -2,10 +2,10 @@ #from sickbeard.helpers import anon_url - + - + @@ -31,7 +31,7 @@ #if $curDir['existing_info'][1] and $indexer > 0: - + #else: #end if diff --git a/gui/slick/interfaces/default/home_newShow.tmpl b/gui/slick/interfaces/default/home_newShow.tmpl index 715f8e90..5b8dd0dc 100644 --- a/gui/slick/interfaces/default/home_newShow.tmpl +++ b/gui/slick/interfaces/default/home_newShow.tmpl @@ -24,15 +24,17 @@

$title

#end if + +
aoeu

-
+ -
- Find a show on the TVDB or TVRAGE +
+

Find show at a TV database
@@ -48,10 +50,10 @@ #else   + * -   +  *   + +
+

* SickGear supports english episodes. The language choice is used for fetching metadata and episode filenames

-
- * This will only affect the language of the retrieved metadata file contents and episode filenames.
- This DOES NOT allow SickGear to download non-english TV episodes!
-
-

+
#end if
+
 
-
- Pick the parent folder +
+

Pick parent folder

 -
+
#if $provided_show_dir Pre-chosen Destination Folder: $provided_show_dir

@@ -82,13 +84,15 @@ #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_rootDirs.tmpl') #end if
+
 
-
- Customize options +
+

Set custom options
#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_addShowOptions.tmpl')
+
 
#for $curNextDir in $other_shows diff --git a/gui/slick/interfaces/default/home_recommendedShows.tmpl b/gui/slick/interfaces/default/home_recommendedShows.tmpl index de3afd08..5d5bdccd 100644 --- a/gui/slick/interfaces/default/home_recommendedShows.tmpl +++ b/gui/slick/interfaces/default/home_recommendedShows.tmpl @@ -12,7 +12,6 @@ #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") - @@ -24,35 +23,40 @@

$title

#end if + +

- + -
- Select a recommended show +
+

Select a recommended show

+
 
-
- Pick the parent folder +
+

Pick parent folder

 -
+
#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_rootDirs.tmpl")
+
 
-
- Customize options +
+

Set custom options
#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_addShowOptions.tmpl")
+
 
diff --git a/gui/slick/interfaces/default/inc_addShowOptions.tmpl b/gui/slick/interfaces/default/inc_addShowOptions.tmpl index 568346c3..6728a8ca 100644 --- a/gui/slick/interfaces/default/inc_addShowOptions.tmpl +++ b/gui/slick/interfaces/default/inc_addShowOptions.tmpl @@ -2,62 +2,77 @@ #from sickbeard.common import * #from sickbeard import subtitles - #if $sickbeard.USE_SUBTITLES: -
- - -
- #end if - -
- -
- -
- - -
+
+ +
- - -
+

Tip: The following options are editable later in the detail view of the show

+
-
- - -
+#if $sickbeard.USE_SUBTITLES: +
+ +
+#end if - #set $qualities = $Quality.splitQuality($sickbeard.QUALITY_DEFAULT) - #set global $anyQualities = $qualities[0] - #set global $bestQualities = $qualities[1] - #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_qualityChooser.tmpl") - -
-
- -
+
+ +
+ +
+ +
+ +
+ +
+ +#set $qualities = $Quality.splitQuality($sickbeard.QUALITY_DEFAULT) +#set global $anyQualities = $qualities[0] +#set global $bestQualities = $qualities[1] +#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_qualityChooser.tmpl") + +
+ +
diff --git a/gui/slick/interfaces/default/inc_qualityChooser.tmpl b/gui/slick/interfaces/default/inc_qualityChooser.tmpl index 5653aeab..8941e253 100644 --- a/gui/slick/interfaces/default/inc_qualityChooser.tmpl +++ b/gui/slick/interfaces/default/inc_qualityChooser.tmpl @@ -2,46 +2,48 @@ #from sickbeard.common import Quality, qualityPresets, qualityPresetStrings
-
-
-

One of the Initial quality selections must be obtained before SickGear will attempt to process the Archive selections.

-
+
+

One of the Initial quality selections must succeed before attempting to process Archive selections.

+
-
-

Initial

- #set $anyQualityList = filter(lambda x: x > $Quality.NONE, $Quality.qualityStrings) - -
+ +
+

Initial

+#set $anyQualityList = filter(lambda x: x > $Quality.NONE, $Quality.qualityStrings) + +
-
-

Archive

- #set $bestQualityList = filter(lambda x: x > $Quality.SDTV and x < $Quality.UNKNOWN, $Quality.qualityStrings) - -
-
+
+

Archive

+#set $bestQualityList = filter(lambda x: x > $Quality.SDTV and x < $Quality.UNKNOWN, $Quality.qualityStrings) + +
+ +
diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl index c0e23b42..e8156c30 100644 --- a/gui/slick/interfaces/default/inc_top.tmpl +++ b/gui/slick/interfaces/default/inc_top.tmpl @@ -7,7 +7,7 @@ - + SickGear - BRANCH:[$sickbeard.BRANCH] - $title
DirectoryShow Name (tvshow.nfo)Indexer
Parent\show folderShow name
(tvshow.nfo)		TV database
Manage DirectoriesManage Directories
$curDir['existing_info'][1]$curDir['existing_info'][1]?