monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-11 05:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'feature/FixTrendingShowsVars' into develop

Browse source
This commit is contained in:
JackDandy 2014-11-15 22:16:25 +00:00
commit c681ead67a
2 changed files with 55 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -10,6 +10,7 @@
* Change sharper looking heart image on the Add Show page * Change sharper looking heart image on the Add Show page
* Change Add Show on Add Trending Show Page to use the full Add New Show flow * Change Add Show on Add Trending Show Page to use the full Add New Show flow
* Fix adding shows with titles that contain "&" on Add Trending Show page * Fix adding shows with titles that contain "&" on Add Trending Show page
* Fix unset vars on Add New Shows Page used in the Add Existing Shows context
### 0.3.0 (2014-11-12 14:30:00 UTC) ### 0.3.0 (2014-11-12 14:30:00 UTC)

103
gui/slick/interfaces/default/home_newShow.tmpl
View file

@ -2,27 +2,27 @@
#import sickbeard #import sickbeard
#from sickbeard.helpers import anon_url #from sickbeard.helpers import anon_url
#set global $header="New Show" #set global $header = 'New Show'
#set global $title="New Show" #set global $title = 'New Show'
#set global $sbPath="../.." #set global $sbPath = '../..'
#set global $statpath="../.."# #set global $statpath = '../..'
#set global $topmenu="home"# #set global $topmenu = 'home'
#import os.path #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')
<script type="text/javascript" src="$sbRoot/js/formwizard.js?$sbPID"></script> <script type="text/javascript" src="$sbRoot/js/formwizard.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script> <script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/newShow.js?$sbPID"></script> <script type="text/javascript" src="$sbRoot/js/newShow.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/addShowOptions.js?$sbPID"></script> <script type="text/javascript" src="$sbRoot/js/addShowOptions.js?$sbPID"></script>
#if $varExists('header') #if $varExists('header')
<h1 class="header">$header</h1> <h1 class="header">$header</h1>
#else #else
<h1 class="title">$title</h1> <h1 class="title">$title</h1>
#end if #end if
<div id="newShowPortal"> <div id="newShowPortal">
@ -31,20 +31,21 @@
<form id="addShowForm" method="post" action="$sbRoot/home/addShows/addNewShow" accept-charset="utf-8" style="width: 800px;"> <form id="addShowForm" method="post" action="$sbRoot/home/addShows/addNewShow" accept-charset="utf-8" style="width: 800px;">
<fieldset class="sectionwrap"> <fieldset class="sectionwrap">
<legend class="legendStep">Find a show on the TVDB or TVRAGE</legend> <legend class="legendStep">Find a show on the TVDB or TVRAGE</legend>
<div class="stepDiv"> <div class="stepDiv">
<input type="hidden" id="indexer_timeout" value="$sickbeard.INDEXER_TIMEOUT" /> <input type="hidden" id="indexer_timeout" value="$sickbeard.INDEXER_TIMEOUT" />
#if $use_provided_info: #if $use_provided_info
Show retrieved from existing metadata: <a href="<%= anon_url(sickbeard.indexerApi(provided_indexer).config['show_url'], provided_indexer_id) %>">$provided_indexer_name</a> #set $provided_indexer_local = $provided_indexer
#set $provided_indexer_id_local = $provided_indexer_id
Show retrieved from existing metadata: <a href="<%= anon_url(sickbeard.indexerApi(provided_indexer_local).config['show_url'], provided_indexer_id_local) %>">$provided_indexer_name</a>
<input type="hidden" name="indexerLang" value="en" /> <input type="hidden" name="indexerLang" value="en" />
<input type="hidden" name="whichSeries" value="$provided_indexer_id" /> <input type="hidden" name="whichSeries" value="$provided_indexer_id" />
<input type="hidden" id="providedName" value="$provided_indexer_name" /> <input type="hidden" id="providedName" value="$provided_indexer_name" />
<input type="hidden" id="providedIndexer" value="$provided_indexer" /> <input type="hidden" id="providedIndexer" value="$provided_indexer" />
#else: #else
<input type="text" id="nameToSearch" value="$default_show_name" class="form-control form-control-inline input-sm input350" /> <input type="text" id="nameToSearch" value="$default_show_name" class="form-control form-control-inline input-sm input350" />
&nbsp; &nbsp;
<select name="indexerLang" id="indexerLangSelect" class="form-control form-control-inline input-sm"> <select name="indexerLang" id="indexerLangSelect" class="form-control form-control-inline input-sm">
@ -53,9 +54,9 @@
&nbsp; &nbsp;
<select name="providedIndexer" id="providedIndexer" class="form-control form-control-inline input-sm"> <select name="providedIndexer" id="providedIndexer" class="form-control form-control-inline input-sm">
<option value="0" #if $provided_indexer == 0 then "selected=\"selected\"" else ""#>All Indexers</option> <option value="0" #if $provided_indexer == 0 then "selected=\"selected\"" else ""#>All Indexers</option>
#for $indexer in $indexers #for $indexer in $indexers
<option value="$indexer" #if $provided_indexer == $indexer then "selected=\"selected\"" else ""#>$indexers[$indexer]</option> <option value="$indexer" #if $provided_indexer == $indexer then "selected=\"selected\"" else ""#>$indexers[$indexer]</option>
#end for #end for
</select> </select>
&nbsp; &nbsp;
<input class="btn btn-inline" type="button" id="searchName" value="Search" /> <input class="btn btn-inline" type="button" id="searchName" value="Search" />
@ -65,48 +66,48 @@
This <b>DOES NOT</b> allow SickGear to download non-english TV episodes!<br /> This <b>DOES NOT</b> allow SickGear to download non-english TV episodes!<br />
<br /> <br />
<div id="searchResults" style="height: 100%;"><br/></div> <div id="searchResults" style="height: 100%;"><br/></div>
#end if #end if
</div> </div>
</fieldset> </fieldset>
<fieldset class="sectionwrap"> <fieldset class="sectionwrap">
<legend class="legendStep">Pick the parent folder</legend> <legend class="legendStep">Pick the parent folder</legend>
<div class="stepDiv"> <div class="stepDiv">
#if $provided_show_dir: #if $provided_show_dir
Pre-chosen Destination Folder: <b>$provided_show_dir</b> <br /> Pre-chosen Destination Folder: <b>$provided_show_dir</b> <br />
<input type="hidden" id="fullShowPath" name="fullShowPath" value="$provided_show_dir" /><br /> <input type="hidden" id="fullShowPath" name="fullShowPath" value="$provided_show_dir" /><br />
#else #else
#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_rootDirs.tmpl')
#end if #end if
</div>
</fieldset>
<fieldset class="sectionwrap">
<legend class="legendStep">Customize options</legend>
<div class="stepDiv">
#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_addShowOptions.tmpl")
</div> </div>
</fieldset> </fieldset>
#for $curNextDir in $other_shows: <fieldset class="sectionwrap">
<input type="hidden" name="other_shows" value="$curNextDir" /> <legend class="legendStep">Customize options</legend>
#end for <div class="stepDiv">
<input type="hidden" name="skipShow" id="skipShow" value="" /> #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_addShowOptions.tmpl')
</div>
</fieldset>
#for $curNextDir in $other_shows
<input type="hidden" name="other_shows" value="$curNextDir" />
#end for
<input type="hidden" name="skipShow" id="skipShow" value="" />
</form> </form>
<br /> <br />
<div style="width: 100%; text-align: center;"> <div style="width: 100%; text-align: center;">
<input class="btn" type="button" id="addShowButton" value="Add Show" disabled="disabled" /> <input class="btn" type="button" id="addShowButton" value="Add Show" disabled="disabled" />
#if $provided_show_dir: #if $provided_show_dir
<input class="btn" type="button" id="skipShowButton" value="Skip Show" /> <input class="btn" type="button" id="skipShowButton" value="Skip Show" />
#end if #end if
</div> </div>
<script type="text/javascript" src="$sbRoot/js/rootDirs.js?$sbPID"></script> <script type="text/javascript" src="$sbRoot/js/rootDirs.js?$sbPID"></script>
</div></div> </div></div>
#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')