monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-07 10:33:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #358 from JackDandy/feature/ChangeShowEditWordingArchive

Browse source 
Change "Archive" to "Upgrade to" in Edit show and other places and im…
This commit is contained in:
JackDandy 2015-05-13 22:33:17 +01:00
commit 6016c5198e
7 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -58,6 +58,7 @@
* Change improve threading of generic_queue, show_queue and search_queue * Change improve threading of generic_queue, show_queue and search_queue
* Change disable the Force buttons on the Manage Searches page while a search is running * Change disable the Force buttons on the Manage Searches page while a search is running
* Change staggered periods of testing and updating of all shows "ended" status up to 460 days * Change staggered periods of testing and updating of all shows "ended" status up to 460 days
* Change "Archive" to "Upgrade to" in Edit show and other places and improve related texts for clarity
[develop changelog] [develop changelog]
* Fix issue, when adding existing shows, set its default group to ensure it now appears on the show list page * Fix issue, when adding existing shows, set its default group to ensure it now appears on the show list page

4
gui/slick/css/style.css
View file

@ -3542,11 +3542,11 @@ div.formpaginate .prev, div.formpaginate .next{
#customQualityWrapper div.component-group-desc{ #customQualityWrapper div.component-group-desc{
float:left; float:left;
width:165px width:172px;
padding:0
} }
#customQualityWrapper div.component-group-desc p{ #customQualityWrapper div.component-group-desc p{
width:85%;
margin:.8em 0; margin:.8em 0;
font-size:1.2em font-size:1.2em
} }

2
gui/slick/interfaces/default/apiBuilder.tmpl
View file

@ -202,7 +202,7 @@ addOption("quality", "HD720p", "&initial=hdtv|hdwebdl|hdbluray");
addOption("quality", "HD1080p", "&initial=fullhdtv|fullhdwebdl|fullhdbluray"); addOption("quality", "HD1080p", "&initial=fullhdtv|fullhdwebdl|fullhdbluray");
addOption("quality", "ANY", "&initial=sdtv|sddvd|hdtv|fullhdtv|hdwebdl|fullhdwebdl|hdbluray|fullhdbluray|unknown"); addOption("quality", "ANY", "&initial=sdtv|sddvd|hdtv|fullhdtv|hdwebdl|fullhdwebdl|hdbluray|fullhdbluray|unknown");
endOptGroup("quality"); endOptGroup("quality");
addOptGroup("quality", "Inital (Custom)"); addOptGroup("quality", "Initial (Custom)");
addList("quality", "SD TV", "&initial=sdtv", "quality-archive"); addList("quality", "SD TV", "&initial=sdtv", "quality-archive");
addList("quality", "SD DVD", "&initial=sddvd", "quality-archive"); addList("quality", "SD DVD", "&initial=sddvd", "quality-archive");
addList("quality", "HD TV", "&initial=hdtv", "quality-archive"); addList("quality", "HD TV", "&initial=hdtv", "quality-archive");

4
gui/slick/interfaces/default/displayShow.tmpl
View file

@ -286,7 +286,7 @@
#end if #end if
#if $bestQualities #if $bestQualities
<div> <div>
<span class="details-title">Replace with</span> <span class="details-title">Upgrade to</span>
<span class="details-info"> <span class="details-info">
#echo ', '.join([$Quality.qualityStrings[$x] for $x in sorted($bestQualities)])# #echo ', '.join([$Quality.qualityStrings[$x] for $x in sorted($bestQualities)])#
</span> </span>
@ -310,7 +310,7 @@
<span class="label label-paused">Paused</span> <span class="label label-paused">Paused</span>
#end if #end if
#if ($anyQualities + $bestQualities) and int($show.archive_firstmatch) #if ($anyQualities + $bestQualities) and int($show.archive_firstmatch)
<span class="label">Archive first match</span> <span class="label">End upgrade on first match</span>
#end if #end if
#if $show.exceptions #if $show.exceptions
<span class="label addQTip" title="$exceptions_string.replace(', ', '<br />')">Scene names</span> <span class="label addQTip" title="$exceptions_string.replace(', ', '<br />')">Scene names</span>

4
gui/slick/interfaces/default/editShow.tmpl
View file

@ -84,10 +84,10 @@
#if $anyQualities + $bestQualities #if $anyQualities + $bestQualities
<div class="field-pair"> <div class="field-pair">
<label for="archive_firstmatch"> <label for="archive_firstmatch">
<span class="component-title">Archive on first match</span> <span class="component-title">End upgrade on first match</span>
<span class="component-desc"> <span class="component-desc">
<input type="checkbox" name="archive_firstmatch" id="archive_firstmatch"#if $show.archive_firstmatch == 1 then $html_checked else ''#> <input type="checkbox" name="archive_firstmatch" id="archive_firstmatch"#if $show.archive_firstmatch == 1 then $html_checked else ''#>
<p>enable to have the episode archived after the first best match is found from your archive quality list</p> <p>mark an episode complete after the first best match is found from the <em>Upgrade to</em> quality list</p>
</span> </span>
</label> </label>
</div> </div>

4
gui/slick/interfaces/default/inc_qualityChooser.tmpl
View file

@ -21,7 +21,7 @@
<div id="customQualityWrapper"> <div id="customQualityWrapper">
<div id="customQuality"> <div id="customQuality">
<div class="component-group-desc"> <div class="component-group-desc">
<p>One of the <em>Initial</em> quality selections must succeed before attempting to process <em>Archive</em> selections.</p> <p>An <em>Initial</em> quality episode must be found before an <em>Upgrade to</em> selection is considered.</p>
</div> </div>
<span class="component-desc"> <span class="component-desc">
@ -36,7 +36,7 @@
</div> </div>
<div style="float:left"> <div style="float:left">
<h4 class="jumbo">Archive</h4> <h4 class="jumbo">Upgrade to</h4>
#set $bestQualityList = filter(lambda x: x > $Quality.SDTV and x < $Quality.UNKNOWN, $Quality.qualityStrings) #set $bestQualityList = filter(lambda x: x > $Quality.SDTV and x < $Quality.UNKNOWN, $Quality.qualityStrings)
<select id="bestQualities" name="bestQualities" multiple="multiple" size="$len($bestQualityList)" class="form-control form-control-inline input-sm"> <select id="bestQualities" name="bestQualities" multiple="multiple" size="$len($bestQualityList)" class="form-control form-control-inline input-sm">
#for $curQuality in sorted($bestQualityList): #for $curQuality in sorted($bestQualityList):

6
gui/slick/interfaces/default/manage_massEdit.tmpl
View file

@ -62,7 +62,7 @@
<div id="customQuality"> <div id="customQuality">
<div class="manageCustom pull-left"> <div class="manageCustom pull-left">
<h4>Inital</h4> <h4 style="font-size:14px">Initial</h4>
#set $anyQualityList = filter(lambda x: x > $common.Quality.NONE, $common.Quality.qualityStrings) #set $anyQualityList = filter(lambda x: x > $common.Quality.NONE, $common.Quality.qualityStrings)
<select id="anyQualities" name="anyQualities" multiple="multiple" size="len($anyQualityList)"> <select id="anyQualities" name="anyQualities" multiple="multiple" size="len($anyQualityList)">
#for $curQuality in sorted($anyQualityList): #for $curQuality in sorted($anyQualityList):
@ -71,7 +71,7 @@
</select> </select>
</div> </div>
<div class="manageCustom pull-left"> <div class="manageCustom pull-left">
<h4>Archive</h4> <h4 style="font-size:14px">Upgrade to</h4>
#set $bestQualityList = filter(lambda x: x > $common.Quality.SDTV, $common.Quality.qualityStrings) #set $bestQualityList = filter(lambda x: x > $common.Quality.SDTV, $common.Quality.qualityStrings)
<select id="bestQualities" name="bestQualities" multiple="multiple" size="len($bestQualityList)"> <select id="bestQualities" name="bestQualities" multiple="multiple" size="len($bestQualityList)">
#for $curQuality in sorted($bestQualityList): #for $curQuality in sorted($bestQualityList):
@ -88,7 +88,7 @@
#set $isDisabled = $isSelected #set $isDisabled = $isSelected
#if $archive_firstmatch_value##set $isDisabled = ''##else##set $isEnabled = ''##end if# #if $archive_firstmatch_value##set $isDisabled = ''##else##set $isEnabled = ''##end if#
<div class="optionWrapper clearfix"> <div class="optionWrapper clearfix">
<span class="selectTitle">Archive on first match</span> <span class="selectTitle">End upgrade on first match</span>
<div class="selectChoices"> <div class="selectChoices">
<select id="edit_archive_firstmatch" name="archive_firstmatch" class="form-control form-control-inline input-sm"> <select id="edit_archive_firstmatch" name="archive_firstmatch" class="form-control form-control-inline input-sm">
<option value="keep">&lt; keep &gt;</option> <option value="keep">&lt; keep &gt;</option>