From 6cfd18533594b6f0ea5380b4275a8039e6246a3a Mon Sep 17 00:00:00 2001 From: JackDandy Date: Wed, 13 May 2015 20:43:03 +0100 Subject: [PATCH] Change "Archive" to "Upgrade to" in Edit show and other places and improve related texts for clarity. --- CHANGES.md | 1 + gui/slick/css/style.css | 4 ++-- gui/slick/interfaces/default/apiBuilder.tmpl | 2 +- gui/slick/interfaces/default/displayShow.tmpl | 4 ++-- gui/slick/interfaces/default/editShow.tmpl | 4 ++-- gui/slick/interfaces/default/inc_qualityChooser.tmpl | 4 ++-- gui/slick/interfaces/default/manage_massEdit.tmpl | 6 +++--- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1f30a594..1376cec4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -58,6 +58,7 @@ * 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 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] * Fix issue, when adding existing shows, set its default group to ensure it now appears on the show list page diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index 3d887513..8a6bff57 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -3542,11 +3542,11 @@ div.formpaginate .prev, div.formpaginate .next{ #customQualityWrapper div.component-group-desc{ float:left; - width:165px + width:172px; + padding:0 } #customQualityWrapper div.component-group-desc p{ - width:85%; margin:.8em 0; font-size:1.2em } diff --git a/gui/slick/interfaces/default/apiBuilder.tmpl b/gui/slick/interfaces/default/apiBuilder.tmpl index c169fe2d..750d5936 100644 --- a/gui/slick/interfaces/default/apiBuilder.tmpl +++ b/gui/slick/interfaces/default/apiBuilder.tmpl @@ -202,7 +202,7 @@ addOption("quality", "HD720p", "&initial=hdtv|hdwebdl|hdbluray"); addOption("quality", "HD1080p", "&initial=fullhdtv|fullhdwebdl|fullhdbluray"); addOption("quality", "ANY", "&initial=sdtv|sddvd|hdtv|fullhdtv|hdwebdl|fullhdwebdl|hdbluray|fullhdbluray|unknown"); endOptGroup("quality"); -addOptGroup("quality", "Inital (Custom)"); +addOptGroup("quality", "Initial (Custom)"); addList("quality", "SD TV", "&initial=sdtv", "quality-archive"); addList("quality", "SD DVD", "&initial=sddvd", "quality-archive"); addList("quality", "HD TV", "&initial=hdtv", "quality-archive"); diff --git a/gui/slick/interfaces/default/displayShow.tmpl b/gui/slick/interfaces/default/displayShow.tmpl index a5f03439..5f544fb4 100644 --- a/gui/slick/interfaces/default/displayShow.tmpl +++ b/gui/slick/interfaces/default/displayShow.tmpl @@ -286,7 +286,7 @@ #end if #if $bestQualities
- Replace with + Upgrade to #echo ', '.join([$Quality.qualityStrings[$x] for $x in sorted($bestQualities)])# @@ -310,7 +310,7 @@ Paused #end if #if ($anyQualities + $bestQualities) and int($show.archive_firstmatch) - Archive first match + End upgrade on first match #end if #if $show.exceptions Scene names diff --git a/gui/slick/interfaces/default/editShow.tmpl b/gui/slick/interfaces/default/editShow.tmpl index 0863f764..b78ecee5 100644 --- a/gui/slick/interfaces/default/editShow.tmpl +++ b/gui/slick/interfaces/default/editShow.tmpl @@ -84,10 +84,10 @@ #if $anyQualities + $bestQualities
diff --git a/gui/slick/interfaces/default/inc_qualityChooser.tmpl b/gui/slick/interfaces/default/inc_qualityChooser.tmpl index 699274b7..103a89f5 100644 --- a/gui/slick/interfaces/default/inc_qualityChooser.tmpl +++ b/gui/slick/interfaces/default/inc_qualityChooser.tmpl @@ -21,7 +21,7 @@
-

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

+

An Initial quality episode must be found before an Upgrade to selection is considered.

@@ -36,7 +36,7 @@
-

Archive

+

Upgrade to

#set $bestQualityList = filter(lambda x: x > $Quality.SDTV and x < $Quality.UNKNOWN, $Quality.qualityStrings) #for $curQuality in sorted($anyQualityList): @@ -71,7 +71,7 @@
-

Archive

+

Upgrade to

#set $bestQualityList = filter(lambda x: x > $common.Quality.SDTV, $common.Quality.qualityStrings)