Merge branch 'feature/OverhaulConfigPostprocessing' into develop

This commit is contained in:
JackDandy 2014-11-19 17:21:12 +00:00
commit d24d6888ad
6 changed files with 2025 additions and 1884 deletions

View file

@ -4,6 +4,7 @@
* Remove redundant references from Config/Help & Info * Remove redundant references from Config/Help & Info
* Fix poster preview on small poster layout * Fix poster preview on small poster layout
* Change overhaul Config/Anime to be in line with General Configuration * Change overhaul Config/Anime to be in line with General Configuration
* Change descriptions and layout on Config/Anime page
* Remove output of source code line when warnings highlight libraries not used with IMDb * Remove output of source code line when warnings highlight libraries not used with IMDb
* Add dropdown on Add Trending Shows to display all shows, shows not in library, or shows in library * Add dropdown on Add Trending Shows to display all shows, shows not in library, or shows in library
* Change Help and Info icon sprites to color and text of Arguments if unused * Change Help and Info icon sprites to color and text of Arguments if unused
@ -18,9 +19,16 @@
* Add option to treat anime releases that lack a quality tag as HDTV instead of "unknown" * Add option to treat anime releases that lack a quality tag as HDTV instead of "unknown"
* Remove old version checking code that no longer applies to SickGear's release system * Remove old version checking code that no longer applies to SickGear's release system
* Fix pnotify notifications going full page * Fix pnotify notifications going full page
* Change overhaul Config Post Processing to be in line with General Configuration
* Change rearrange Config Post Processing items into sections for easier use
* Fix CSS overriding link colors on config pages
* Change Config Post Processing texts and descriptions throughout
* Fix Config Post Processing info icons in "Naming Legends"
* Change Config Post Processing naming sample lines to be more available
* Add Config Post Processing failed downloads Sabnzbd setup guide
* Fix Config Post Processing "Anime name pattern" custom javascript validation
[develop changelog] [develop changelog]
* Change descriptions and layout on Config/Anime page
### 0.3.1 (2014-11-19 16:40:00 UTC) ### 0.3.1 (2014-11-19 16:40:00 UTC)

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -199,6 +199,10 @@ inc_top.tmpl
background: #dcdcdc url("../css/lib/images/ui-bg_highlight-soft_75_dcdcdc_1x100.png") 50% top repeat-x; background: #dcdcdc url("../css/lib/images/ui-bg_highlight-soft_75_dcdcdc_1x100.png") 50% top repeat-x;
} }
.ui-widget-content a {
text-decoration: none;
}
.ui-widget-header { .ui-widget-header {
background: #ffffff url("../css/lib/images/ui-bg_flat_0_ffffff_40x100.png") 50% 50% repeat-x; background: #ffffff url("../css/lib/images/ui-bg_flat_0_ffffff_40x100.png") 50% 50% repeat-x;
} }
@ -1660,8 +1664,21 @@ select .selected {
config_postProcessing.tmpl config_postProcessing.tmpl
========================================================================== */ ========================================================================== */
#config .episode-sample {
width: 240px;
margin-right: 10px;
border: 1px solid;
}
#config .episode-sample h3 {
margin: 10px;
font-size: 18px;
line-height: 24px;
}
#config div.example { #config div.example {
padding: 10px; background-color: #efefef; padding: 10px;
border: 1px solid;
} }
.Key { .Key {
@ -1709,43 +1726,47 @@ div.metadata_options_wrapper {
} }
div.metadata_example_wrapper { div.metadata_example_wrapper {
float: right; margin-left: 220px;
width: 325px; }
div.metadata_options_wrapper h4,
div.metadata_example_wrapper h4 {
margin: 0 0 10px;
} }
div.metadata_options { div.metadata_options {
padding: 7px;
overflow: auto; overflow: auto;
background: #f5f1e4; background: #f5f1e4;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
div.metadata_options label:hover { div.metadata_options label:hover {
color: #fff;
background-color: #57442b;
cursor: pointer; cursor: pointer;
} }
div.metadata_options label { div.metadata_options label {
display: block;
padding-left: 7px;
line-height: 20px;
color: #036; color: #036;
} }
div.metadata_example { div.metadata_example label {
padding: 8px; cursor: pointer;
font-weight: 600;
} }
div.metadata_options label,
div.metadata_example label { div.metadata_example label {
display: block;
line-height: 21px; line-height: 21px;
color: #000; display: block;
cursor: pointer; padding: 3px;
margin: 0px;
}
div.metadata_options input {
margin-right: 3px;
vertical-align: baseline;
} }
div.metadataDiv .disabled { div.metadataDiv .disabled {
color: #ccc; font-weight: normal;
} }
.notifier-icon { .notifier-icon {
@ -1753,11 +1774,6 @@ div.metadataDiv .disabled {
margin: 6px 4px 0px 0px; margin: 6px 4px 0px 0px;
} }
.warning {
border-color: #F89406;
background: url("../images/warning16.png") no-repeat right 5px center #fff;
}
/* ======================================================================= /* =======================================================================
manage*.tmpl manage*.tmpl
========================================================================== */ ========================================================================== */
@ -3006,10 +3022,31 @@ span.token-input-delete-token {
margin: 0 1px; margin: 0 1px;
} }
.boldest {font-weight: 900}
.red-text {color:#d33} .red-text {color:#d33}
.clear-left {clear:left} .clear-left {clear:left}
.float-left {float:left}
.nextline-block {display:block} .nextline-block {display:block}
#failed-guide,
#failed-guide .title,
#failed-guide li {margin:0; padding:0}
#failed-guide .title {list-style-type: none}
#failed-guide li {margin-left:15px}
.icon-info-sign {
display: block;
width: 16px;
height: 16px;
margin: 2px 5px;
float: left;
}
.pp .component-group-list.right,
.pp .field-pair.right {
margin: 0 0 0 250px;
}
.trakt-image { .trakt-image {
display: block; display: block;
width: 100%; width: 100%;
@ -3117,10 +3154,10 @@ pnotify.css
========================================================================== */ ========================================================================== */
.ui-pnotify-sticker { .ui-pnotify-sticker {
margin-top: -12px; margin-top: -12px;
} }
.ui-pnotify-closer { .ui-pnotify-closer {
margin-top: -12px; margin-top: -12px;
margin-right: -10px; margin-right: -10px;
} }

File diff suppressed because it is too large Load diff

View file

@ -230,26 +230,26 @@ $(document).ready(function () {
$.get(sbRoot + '/config/postProcessing/isNamingValid', {pattern: pattern, multi: multi, anime_type: anime_type}, $.get(sbRoot + '/config/postProcessing/isNamingValid', {pattern: pattern, multi: multi, anime_type: anime_type},
function (data) { function (data) {
if (data == "invalid") { if (data == "invalid") {
$('#naming_pattern').qtip('option', { $('#naming_anime_pattern').qtip('option', {
'content.text': 'This pattern is invalid.', 'content.text': 'This pattern is invalid.',
'style.classes': 'qtip-rounded qtip-shadow qtip-red' 'style.classes': 'qtip-rounded qtip-shadow qtip-red'
}); });
$('#naming_pattern').qtip('toggle', true); $('#naming_anime_pattern').qtip('toggle', true);
$('#naming_pattern').css('background-color', '#FFDDDD'); $('#naming_anime_pattern').css('background-color', '#FFDDDD');
} else if (data == "seasonfolders") { } else if (data == "seasonfolders") {
$('#naming_pattern').qtip('option', { $('#naming_anime_pattern').qtip('option', {
'content.text': 'This pattern would be invalid without the folders, using it will force "Flatten" off for all shows.', 'content.text': 'This pattern would be invalid without the folders, using it will force "Flatten" off for all shows.',
'style.classes': 'qtip-rounded qtip-shadow qtip-red' 'style.classes': 'qtip-rounded qtip-shadow qtip-red'
}); });
$('#naming_pattern').qtip('toggle', true); $('#naming_anime_pattern').qtip('toggle', true);
$('#naming_pattern').css('background-color', '#FFFFDD'); $('#naming_anime_pattern').css('background-color', '#FFFFDD');
} else { } else {
$('#naming_pattern').qtip('option', { $('#naming_anime_pattern').qtip('option', {
'content.text': 'This pattern is valid.', 'content.text': 'This pattern is valid.',
'style.classes': 'qtip-rounded qtip-shadow qtip-green' 'style.classes': 'qtip-rounded qtip-shadow qtip-green'
}); });
$('#naming_pattern').qtip('toggle', false); $('#naming_anime_pattern').qtip('toggle', false);
$('#naming_pattern').css('background-color', '#FFFFFF'); $('#naming_anime_pattern').css('background-color', '#FFFFFF');
} }
}); });
} }