From f40196e8e57500352f7c4fd3f07ad2b9908f8c6e Mon Sep 17 00:00:00 2001
From: JackDandy <jackdandy@users.noreply.github.com>
Date: Mon, 16 Feb 2015 04:03:59 +0000
Subject: [PATCH] Add max-width to prevent ui glitch on Pull request and Branch
 Version selectors on config/General/Advanced.

Change <input> tags to html5 and add max-width css.
---
 CHANGES.md                                    |  1 +
 gui/slick/css/style.css                       |  7 +-
 .../interfaces/default/config_general.tmpl    | 86 +++++++++----------
 3 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e675c884..a7878caa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -59,6 +59,7 @@
 * Change when picking a best result to only test items that have a size specifier against the failed history
 * Add anime release groups to add new show options page
 * Add setting "Update shows during hour" to General Config/Misc
+* Add max-width to prevent ui glitch on Pull request and Branch Version selectors on config/General/Advanced and change <input> tags to html5
 
 [develop changelog]
 * Change uT params from unicode to str.format as magnet URLs worked but sending files in POST bodies failed
diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css
index d425d5c1..85699822 100644
--- a/gui/slick/css/style.css
+++ b/gui/slick/css/style.css
@@ -2350,6 +2350,10 @@ div.blackwhitelist.anidb, div.blackwhitelist.manual {
 	padding-bottom: 10px;
 }
 
+.max300 {
+	max-width: 300px;
+}
+
 /* =======================================================================
 bootstrap Overrides
 ========================================================================== */
@@ -3446,4 +3450,5 @@ pnotify.css
 .ui-pnotify-closer {
 	margin-top: -12px;
 	margin-right: -10px;
-}
\ No newline at end of file
+}
+
diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl
index 9b7d12a2..2488d8fd 100644
--- a/gui/slick/interfaces/default/config_general.tmpl
+++ b/gui/slick/interfaces/default/config_general.tmpl
@@ -57,7 +57,7 @@
 							<label for="launch_browser">
 								<span class="component-title">Launch browser</span>
 								<span class="component-desc">
-									<input type="checkbox" name="launch_browser" id="launch_browser" #if $sickbeard.LAUNCH_BROWSER then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="launch_browser" id="launch_browser" #if $sickbeard.LAUNCH_BROWSER then 'checked="checked"' else ''#>
 									<p>open the SickGear home page on startup</p>
 								</span>
 							</label>
@@ -67,7 +67,7 @@
 							<label for="update_shows_on_start">
 								<span class="component-title">Update shows on startup</span>
 								<span class="component-desc">
-									<input type="checkbox" name="update_shows_on_start" id="update_shows_on_start" #if $sickbeard.UPDATE_SHOWS_ON_START then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="update_shows_on_start" id="update_shows_on_start" #if $sickbeard.UPDATE_SHOWS_ON_START then 'checked="checked"' else ''#>
 									<p>with show data; episode plot, images, air and end dates, etc. Disable for a quicker startup. Show data is scheduled to update during hour <span class="show_update_hour_value">$sickbeard.SHOW_UPDATE_HOUR</span>.</p>
 								</span>
 							</label>
@@ -77,7 +77,7 @@
 							<label for="show_update_hour">
 								<span class="component-title">Update shows during hour</span>
 								<span class="component-desc">
-									<input type="number" name="show_update_hour" id="show_update_hour" value="$sickbeard.SHOW_UPDATE_HOUR" class="form-control input-sm input75" />
+									<input type="number" name="show_update_hour" id="show_update_hour" value="$sickbeard.SHOW_UPDATE_HOUR" class="form-control input-sm input75">
 									<p>(0 ... 23) with show data; episode plot, images, air and end dates, etc.</p>
 								</span>
 							</label>
@@ -87,11 +87,11 @@
 							<span class="component-title">Send to trash for actions</span>
 							<span class="component-desc">
 								<label for="trash_remove_show" class="nextline-block">
-									<input type="checkbox" name="trash_remove_show" id="trash_remove_show" #if $sickbeard.TRASH_REMOVE_SHOW then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="trash_remove_show" id="trash_remove_show" #if $sickbeard.TRASH_REMOVE_SHOW then 'checked="checked"' else ''#>
 									<p>when using show "Remove" and delete files</p>
 								</label>
 								<label for="trash_rotate_logs" class="nextline-block">
-									<input type="checkbox" name="trash_rotate_logs" id="trash_rotate_logs" #if $sickbeard.TRASH_ROTATE_LOGS then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="trash_rotate_logs" id="trash_rotate_logs" #if $sickbeard.TRASH_ROTATE_LOGS then 'checked="checked"' else ''#>
 									<p>on scheduled deletes of the oldest log files</p>
 								</label>
 								<div class="clear-left"><p>selected actions use trash (recycle bin) instead of the default permanent delete</p></div>
@@ -102,7 +102,7 @@
 							<label for="log_dir">
 								<span class="component-title">Log file folder location</span>
 								<span class="component-desc">
-									<input type="text" name="log_dir" id="log_dir" value="$sickbeard.ACTUAL_LOG_DIR" class="form-control input-sm input350" />
+									<input type="text" name="log_dir" id="log_dir" value="$sickbeard.ACTUAL_LOG_DIR" class="form-control input-sm input350">
 								</span>
 							</label>
 						</div>
@@ -126,7 +126,7 @@
 							<label for="indexer_timeout">
 								<span class="component-title">Timeout show indexer at</span>
 								<span class="component-desc">
-									<input type="text" name="indexer_timeout" id="indexer_timeout" value="$sickbeard.INDEXER_TIMEOUT" class="form-control input-sm input75" />
+									<input type="text" name="indexer_timeout" id="indexer_timeout" value="$sickbeard.INDEXER_TIMEOUT" class="form-control input-sm input75">
 									<p>seconds of inactivity when finding new shows (default:10)</p>
 								</span>
 							</label>
@@ -142,7 +142,7 @@
 							</label>
 						</div>
 
-						<input type="submit" class="btn config_submitter" value="Save Changes" />
+						<input type="submit" class="btn config_submitter" value="Save Changes">
 					</fieldset>
 				</div>
 				<div class="component-group">
@@ -157,7 +157,7 @@
 							<label for="version_notify">
 								<span class="component-title">Check software updates</span>
 								<span class="component-desc">
-									<input type="checkbox" name="version_notify" id="version_notify" #if $sickbeard.VERSION_NOTIFY then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="version_notify" id="version_notify" #if $sickbeard.VERSION_NOTIFY then 'checked="checked"' else ''#>
 									<p>and display notifications when updates are available.
 									Checks are run on startup and at the frequency set below*</p>
 								</span>
@@ -168,7 +168,7 @@
 							<label for="auto_update">
 								<span class="component-title">Automatically update</span>
 								<span class="component-desc">
-									<input type="checkbox" name="auto_update" id="auto_update" #if $sickbeard.AUTO_UPDATE then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="auto_update" id="auto_update" #if $sickbeard.AUTO_UPDATE then 'checked="checked"' else ''#>
 									<p>fetch and install software updates.
 									Updates are run on startup and in the background at the frequency set below*</p>
 								</span>
@@ -179,7 +179,7 @@
 							<label>
 								<span class="component-title">Check the server every*</span>
 								<span class="component-desc">
-									<input type="text" name="update_frequency" id="update_frequency" value="$sickbeard.UPDATE_FREQUENCY" class="form-control input-sm input75" />
+									<input type="text" name="update_frequency" id="update_frequency" value="$sickbeard.UPDATE_FREQUENCY" class="form-control input-sm input75">
 									<p>hours for software updates (default:12)</p>
 								</span>
 							</label>
@@ -189,13 +189,13 @@
 							<label for="notify_on_update">
 								<span class="component-title">Notify on software update</span>
 								<span class="component-desc">
-									<input type="checkbox" name="notify_on_update" id="notify_on_update" #if $sickbeard.NOTIFY_ON_UPDATE then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="notify_on_update" id="notify_on_update" #if $sickbeard.NOTIFY_ON_UPDATE then 'checked="checked"' else ''#>
 									<p>send a message to all enabled notifiers when SickGear has been updated</p>
 								</span>
 							</label>
 						</div>
 
-						<input type="submit" class="btn config_submitter" value="Save Changes" />
+						<input type="submit" class="btn config_submitter" value="Save Changes">
 					</fieldset>
 
 				</div>
@@ -229,7 +229,7 @@
 							<label for="home_search_focus">
 								<span class="component-title">Give show list search focus</span>
 								<span class="component-desc">
-									<input type="checkbox" name="home_search_focus" id="home_search_focus" #if $sickbeard.HOME_SEARCH_FOCUS then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="home_search_focus" id="home_search_focus" #if $sickbeard.HOME_SEARCH_FOCUS then 'checked="checked"' else ''#>
 									<p>page refresh on "Show List" will start search box focused</p>
 								</span>
 							</label>
@@ -239,7 +239,7 @@
 							<label for="sort_article">
 								<span class="component-title">Sort with "The", "A", "An"</span>
 								<span class="component-desc">
-									<input type="checkbox" name="sort_article" id="sort_article" #if $sickbeard.SORT_ARTICLE then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="sort_article" id="sort_article" #if $sickbeard.SORT_ARTICLE then 'checked="checked"' else ''#>
 									<p>include articles ("The", "A", "An") when sorting show lists</p>
 								</span>
 							</label>
@@ -249,7 +249,7 @@
 							<label for="fuzzy_dating">
 								<span class="component-title">Display fuzzy dates</span>
 								<span class="component-desc">
-									<input type="checkbox" name="fuzzy_dating" id="fuzzy_dating" class="viewIf datePresets" #if $sickbeard.FUZZY_DATING == True then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="fuzzy_dating" id="fuzzy_dating" class="viewIf datePresets" #if $sickbeard.FUZZY_DATING == True then 'checked="checked"' else ''#>
 									<p>move absolute dates into tooltips and display e.g. "Last Thu", "On Tue"</p>
 								</span>
 							</label>
@@ -258,7 +258,7 @@
 							<label for="trim_zero">
 								<span class="component-title">Trim date and time</span>
 								<span class="component-desc">
-									<input type="checkbox" name="trim_zero" id="trim_zero" #if True == $sickbeard.TRIM_ZERO then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="trim_zero" id="trim_zero" #if True == $sickbeard.TRIM_ZERO then 'checked="checked"' else ''#>
 									<p>display minimalist date and time i.e. <del>02:00</del> = 2:00, <del>02:00pm</del> = 2pm, <del>03 Jan</del> = 3 Jan</p>
 								</span>
 							</label>
@@ -303,16 +303,16 @@
 							<span class="component-title">Timezone:</span>
 							<span class="component-desc">
 								<label for="local" class="space-right">
-									<input type="radio" name="timezone_display" id="local" value="local" #if "local" == $sickbeard.TIMEZONE_DISPLAY then 'checked="checked"' else ''# />local
+									<input type="radio" name="timezone_display" id="local" value="local" #if "local" == $sickbeard.TIMEZONE_DISPLAY then 'checked="checked"' else ''#>local
 								</label>
 								<label for="network">
-									<input type="radio" name="timezone_display" id="network" value="network" #if "network" == $sickbeard.TIMEZONE_DISPLAY then 'checked="checked"' else ''# />network
+									<input type="radio" name="timezone_display" id="network" value="network" #if "network" == $sickbeard.TIMEZONE_DISPLAY then 'checked="checked"' else ''#>network
 								</label>
 								<div class="clear-left"><p>display dates and times in either your timezone or the shows network timezone</p></div>
 							</span>
 						</div>
 
-						<input type="submit" class="btn config_submitter" value="Save Changes" />
+						<input type="submit" class="btn config_submitter" value="Save Changes">
 
 					</fieldset>
 
@@ -332,7 +332,7 @@
 							<label for="use_api">
 								<span class="component-title">Enable API</span>
 								<span class="component-desc">
-									<input type="checkbox" name="use_api" class="enabler" id="use_api" #if $sickbeard.USE_API then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="use_api" class="enabler" id="use_api" #if $sickbeard.USE_API then 'checked="checked"' else ''#>
 									<p>allow the use of the SickGear API</p>
 								</span>
 							</label>
@@ -342,7 +342,7 @@
 							<label for="api_key">
 								<span class="component-title">API key</span>
 								<span class="component-desc">
-									<input type="text" name="api_key" id="api_key" value="$sickbeard.API_KEY" class="form-control input-sm input300" readonly="readonly" />
+									<input type="text" name="api_key" id="api_key" value="$sickbeard.API_KEY" class="form-control input-sm input300" readonly="readonly">
 									<input class="btn btn-inline" type="button" id="generate_new_apikey" value="Generate">
 									<div class="clear-left"><p>used to give 3rd party programs limited access to SickGear</p></div>
 								</span>
@@ -354,7 +354,7 @@
 							<label for="web_log">
 								<span class="component-title">HTTP logs</span>
 								<span class="component-desc">
-									<input type="checkbox" name="web_log" id="web_log" #if $sickbeard.WEB_LOG then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="web_log" id="web_log" #if $sickbeard.WEB_LOG then 'checked="checked"' else ''#>
 									<p>enable logs from the internal Tornado web server</p>
 								</span>
 							</label>
@@ -364,7 +364,7 @@
 							<label for="web_username">
 								<span class="component-title">HTTP username</span>
 								<span class="component-desc">
-									<input type="text" name="web_username" id="web_username" value="$sickbeard.WEB_USERNAME" class="form-control input-sm input300" />
+									<input type="text" name="web_username" id="web_username" value="$sickbeard.WEB_USERNAME" class="form-control input-sm input300">
 									<p>set blank for no login</p>
 								</span>
 							</label>
@@ -374,7 +374,7 @@
 							<label for="web_password">
 								<span class="component-title">HTTP password</span>
 								<span class="component-desc">
-									<input type="password" name="web_password" id="web_password" value="$sickbeard.WEB_PASSWORD" class="form-control input-sm input300" />
+									<input type="password" name="web_password" id="web_password" value="$sickbeard.WEB_PASSWORD" class="form-control input-sm input300">
 									<p>blank = no authentication</span>
 							</label>
 						</div>
@@ -383,7 +383,7 @@
 							<label for="web_port">
 								<span class="component-title">HTTP port</span>
 								<span class="component-desc">
-									<input type="text" name="web_port" id="web_port" value="$sickbeard.WEB_PORT" class="form-control input-sm input100" />
+									<input type="text" name="web_port" id="web_port" value="$sickbeard.WEB_PORT" class="form-control input-sm input100">
 									<p>web port to browse and access SickGear (default:8081)</p>
 								</span>
 							</label>
@@ -393,7 +393,7 @@
 							<label for="web_ipv6">
 								<span class="component-title">Listen on IPv6</span>
 								<span class="component-desc">
-									<input type="checkbox" name="web_ipv6" id="web_ipv6" #if $sickbeard.WEB_IPV6 then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="web_ipv6" id="web_ipv6" #if $sickbeard.WEB_IPV6 then 'checked="checked"' else ''#>
 									<p>attempt binding to any available IPv6 address</p>
 								</span>
 							</label>
@@ -403,7 +403,7 @@
 							<label for="enable_https">
 								<span class="component-title">Enable HTTPS</span>
 								<span class="component-desc">
-									<input type="checkbox" name="enable_https" class="enabler" id="enable_https" #if $sickbeard.ENABLE_HTTPS then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="enable_https" class="enabler" id="enable_https" #if $sickbeard.ENABLE_HTTPS then 'checked="checked"' else ''#>
 									<p>enable access to the web interface using a HTTPS address</p>
 								</span>
 							</label>
@@ -413,7 +413,7 @@
 								<label for="https_cert">
 									<span class="component-title">HTTPS certificate</span>
 									<span class="component-desc">
-										<input type="text" name="https_cert" id="https_cert" value="$sickbeard.HTTPS_CERT" class="form-control input-sm input300" />
+										<input type="text" name="https_cert" id="https_cert" value="$sickbeard.HTTPS_CERT" class="form-control input-sm input300">
 										<div class="clear-left"><p>file name or path to HTTPS certificate</p></div>
 									</span>
 								</label>
@@ -422,7 +422,7 @@
 								<label for="https_key">
 									<span class="component-title">HTTPS key</span>
 									<span class="component-desc">
-										<input type="text" name="https_key" id="https_key" value="$sickbeard.HTTPS_KEY" class="form-control input-sm input300" />
+										<input type="text" name="https_key" id="https_key" value="$sickbeard.HTTPS_KEY" class="form-control input-sm input300">
 										<div class="clear-left"><p>file name or path to HTTPS key</p></div>
 									</span>
 								</label>
@@ -433,13 +433,13 @@
 							<label for="handle_reverse_proxy">
 								<span class="component-title">Reverse proxy headers</span>
 								<span class="component-desc">
-									<input type="checkbox" name="handle_reverse_proxy" id="handle_reverse_proxy" #if $sickbeard.HANDLE_REVERSE_PROXY then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="handle_reverse_proxy" id="handle_reverse_proxy" #if $sickbeard.HANDLE_REVERSE_PROXY then 'checked="checked"' else ''#>
 									<p>accept the following reverse proxy headers (advanced)...<br />(X-Forwarded-For, X-Forwarded-Host, and X-Forwarded-Proto)</p>
 								</span>
 							</label>
 						</div>
 
-						<input type="submit" class="btn config_submitter" value="Save Changes" />
+						<input type="submit" class="btn config_submitter" value="Save Changes">
 
 					</fieldset>
 
@@ -460,7 +460,7 @@
 							<label>
 								<span class="component-title">Branch version:</span>
 								<span class="component-desc">
-									<select id="branchVersion" class="form-control form-control-inline input-sm pull-left">
+									<select id="branchVersion" class="form-control form-control-inline input-sm pull-left max300">
 #for $cur_branch in $sickbeard.versionCheckScheduler.action.list_remote_branches():
 										<option value="$cur_branch" #if $cur_branch == $sickbeard.BRANCH then 'selected="selected"' else ''#>$cur_branch</option>
 #end for
@@ -477,7 +477,7 @@
 								<label>
 									<span class="component-title">Pull request:</span>
 									<span class="component-desc">
-										<select id="pullRequestVersion" class="form-control form-control-inline input-sm pull-left">
+										<select id="pullRequestVersion" class="form-control form-control-inline input-sm pull-left max300">
 										#for $cur_branch in $pulls:
 											<option value="$cur_branch.fetch_name()" #if $cur_branch == $sickbeard.BRANCH then 'selected="selected"' else ''#>$cur_branch</option>
 										#end for
@@ -493,7 +493,7 @@
 							<label for="git_remote">
 								<span class="component-title">Git remote for branch</span>
 								<span class="component-desc">
-									<input type="text" name="git_remote" id="git_remote" value="$sickbeard.GIT_REMOTE" class="form-control input-sm input300" />
+									<input type="text" name="git_remote" id="git_remote" value="$sickbeard.GIT_REMOTE" class="form-control input-sm input300">
 									<div class="clear-left"><p>default:origin. Access repo configured remotes (save then refresh browser)</p></div>
 								</span>
 							</label>
@@ -503,7 +503,7 @@
 							<label>
 								<span class="component-title">Git executable path</span>
 								<span class="component-desc">
-									<input type="text" name="git_path" value="$sickbeard.GIT_PATH" class="form-control input-sm input300" />
+									<input type="text" name="git_path" value="$sickbeard.GIT_PATH" class="form-control input-sm input300">
 									<div class="clear-left"><p>only needed if OS is unable to locate git from env</p></div>
 								</span>
 							</label>
@@ -527,7 +527,7 @@
 							<label>
 								<span class="component-title">Anonymous redirect</span>
 								<span class="component-desc">
-									<input type="text" name="anon_redirect" value="$sickbeard.ANON_REDIRECT" class="form-control input-sm input300" />
+									<input type="text" name="anon_redirect" value="$sickbeard.ANON_REDIRECT" class="form-control input-sm input300">
 									<div class="clear-left"><p>backlink protection via anonymizer service, must end in "?"</p></div>
 								</span>
 							</label>
@@ -537,7 +537,7 @@
 							<label for="encryption_version">
 								<span class="component-title">Encrypt passwords</span>
 								<span class="component-desc">
-									<input type="checkbox" name="encryption_version" id="encryption_version" #if $sickbeard.ENCRYPTION_VERSION then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="encryption_version" id="encryption_version" #if $sickbeard.ENCRYPTION_VERSION then 'checked="checked"' else ''#>
 									<p>in the <code>config.ini</code> file.
 									<b>Warning:</b> Passwords must only contain <a target="_blank" href="<%= anon_url('http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters') %>">ASCII characters</a></p>
 								</span>
@@ -548,7 +548,7 @@
 							<label for="calendar_unprotected">
 								<span class="component-title">Unprotected calendar</span>
 								<span class="component-desc">
-									<input type="checkbox" name="calendar_unprotected" id="calendar_unprotected" #if $sickbeard.CALENDAR_UNPROTECTED then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="calendar_unprotected" id="calendar_unprotected" #if $sickbeard.CALENDAR_UNPROTECTED then 'checked="checked"' else ''#>
 									<p>allow subscribing to the calendar without user and password.
 									Some services like Google Calendar only work this way</p>
 								</span>
@@ -560,7 +560,7 @@
 							<label>
 								<span class="component-title">Proxy host</span>
 								<span class="component-desc">
-									<input type="text" name="proxy_setting" value="$sickbeard.PROXY_SETTING" class="form-control input-sm input300" />
+									<input type="text" name="proxy_setting" value="$sickbeard.PROXY_SETTING" class="form-control input-sm input300">
 									<p>blank to disable</p>
 									<div class="clear-left"><p>proxy address for connecting to providers (use 'PAC:Url' for PAC support)</p></div>
 							</label>
@@ -570,19 +570,19 @@
 							<label for="proxy_indexers">
 								<span class="component-title">Use proxy for indexers</span>
 								<span class="component-desc">
-									<input type="checkbox" name="proxy_indexers" id="proxy_indexers" #if True == $sickbeard.PROXY_INDEXERS then 'checked="checked"' else ''#/>
+									<input type="checkbox" name="proxy_indexers" id="proxy_indexers" #if True == $sickbeard.PROXY_INDEXERS then 'checked="checked"' else ''#>
 									<p>use proxy host for connecting to indexers (thetvdb, tvrage)</p>
 								</span>
 							</label>
 						</div>
 
-						<input type="submit" class="btn config_submitter" value="Save Changes" />
+						<input type="submit" class="btn config_submitter" value="Save Changes">
 					</fieldset>
 				</div><!-- /component-group3 //-->
 
 				<br/>
 				<h6 class="pull-right"><b class="boldest">All non-absolute folder locations are relative to <span class="path">$sickbeard.DATA_DIR</span></b></h6>
-				<input type="submit" class="btn pull-left config_submitter button" value="Save Changes" />
+				<input type="submit" class="btn pull-left config_submitter button" value="Save Changes">
 
 			</div><!-- /config-components -->