diff --git a/gui/slick/js/ajaxNotifications.js b/gui/slick/js/ajaxNotifications.js index 80e2a359cbbc4ca11e7ca8d9973be386ec5f6099..11cf3bce413c66cb87617617c219415011430b66 100644 --- a/gui/slick/js/ajaxNotifications.js +++ b/gui/slick/js/ajaxNotifications.js @@ -39,5 +39,5 @@ function check_notifications() { $(document).ready(function(){ check_notifications(); - if(test) displayPNotify('notice', 'test', 'test<br/><i class="test-class">hello <b>world</b></i><ul><li>item 1</li><li>item 2</li></ul>'); + if(test) displayPNotify('notice', 'test', 'test<br><i class="test-class">hello <b>world</b></i><ul><li>item 1</li><li>item 2</li></ul>'); }); diff --git a/gui/slick/js/configSearch.js b/gui/slick/js/configSearch.js index eca621cb5d3506af396cc3760f5f9e4e5f02a445..efe80fb9b8a023bb3857ccc9f67162f7544446fe 100644 --- a/gui/slick/js/configSearch.js +++ b/gui/slick/js/configSearch.js @@ -154,7 +154,7 @@ $(document).ready(function(){ } else if ('rtorrent' == selectedProvider){ client = 'rTorrent'; $(torrent_paused_option).hide(); - $('#host_desc_torrent').text('URL to your rTorrent client (e.g. scgi://localhost:5000 <br/> or https://localhost/rutorrent/plugins/httprpc/action.php)'); + $('#host_desc_torrent').text('URL to your rTorrent client (e.g. scgi://localhost:5000 <br> or https://localhost/rutorrent/plugins/httprpc/action.php)'); $(torrent_verify_cert_option).show(); $(torrent_verify_deluge).hide(); $(torrent_verify_rtorrent).show(); diff --git a/gui/slick/js/confirmations.js b/gui/slick/js/confirmations.js index 2746732902d192ee5bd37f1985addd59ebf5493b..f20a64db08969da2c6277da096ed256b102b5ce0 100644 --- a/gui/slick/js/confirmations.js +++ b/gui/slick/js/confirmations.js @@ -47,7 +47,7 @@ $(document).ready(function () { var showname = document.getElementById("showtitle").getAttribute('data-showname'); $.confirm({ 'title' : 'Remove Show', - 'message' : 'Are you sure you want to remove <span class="footerhighlight">' + showname + '</span> from the database ?<br /><br /><input type="checkbox" id="deleteFiles"> <span class="red-text">Check to delete files as well. IRREVERSIBLE</span></input>', + 'message' : 'Are you sure you want to remove <span class="footerhighlight">' + showname + '</span> from the database ?<br><br><input type="checkbox" id="deleteFiles"> <span class="red-text">Check to delete files as well. IRREVERSIBLE</span></input>', 'buttons' : { 'Yes' : { 'class' : 'green', @@ -111,7 +111,7 @@ $(document).ready(function () { var target = $(this).attr('href'); $.confirm({ 'title' : 'Submit Errors', - 'message' : 'Are you sure you want to submit these errors ?<br /><br /><span class="red-text">Make sure SickRage is updated and trigger<br /> this error with debug enabled before submitting</span>', + 'message' : 'Are you sure you want to submit these errors ?<br><br><span class="red-text">Make sure SickRage is updated and trigger<br> this error with debug enabled before submitting</span>', 'buttons' : { 'Yes' : { 'class' : 'green', diff --git a/gui/slick/js/lib/pnotify.custom.min.js b/gui/slick/js/lib/pnotify.custom.min.js index f927d92712aa970d3baeabde56c84448bb888a33..b530874b9c8496d26425c0e3b3ca2d7fbddff6c0 100644 Binary files a/gui/slick/js/lib/pnotify.custom.min.js and b/gui/slick/js/lib/pnotify.custom.min.js differ diff --git a/gui/slick/js/new/displayShow.js b/gui/slick/js/new/displayShow.js index 413404fcb9f519b13c426b1525a9ab4b8d7a6687..061358d2e63c3f8281caf2dfcc460da9fb99a02b 100644 --- a/gui/slick/js/new/displayShow.js +++ b/gui/slick/js/new/displayShow.js @@ -259,7 +259,7 @@ $(document).ready(function(){ widgets: ['saveSort', 'stickyHeaders', 'columnSelector'], widgetOptions : { columnSelector_saveColumns: true, // jshint ignore:line - columnSelector_layout : '<br/><label><input type="checkbox">{name}</label>', // jshint ignore:line + columnSelector_layout : '<br><label><input type="checkbox">{name}</label>', // jshint ignore:line columnSelector_mediaquery: false, // jshint ignore:line columnSelector_cssChecked : 'checked' // jshint ignore:line } diff --git a/gui/slick/js/newShow.js b/gui/slick/js/newShow.js index c347253fb5164bc715aac310501c510bc0b0cbfe..65135532dd8651830c42b0f77f6c669234e9a2aa 100644 --- a/gui/slick/js/newShow.js +++ b/gui/slick/js/newShow.js @@ -58,7 +58,7 @@ $(document).ready(function () { resultStr += ' [' + obj[0] + ']'; } - resultStr += '<br />'; + resultStr += '<br>'; }); resultStr += '</ul>'; } diff --git a/gui/slick/views/apiBuilder.mako b/gui/slick/views/apiBuilder.mako index acf688a02d2d1a48fec9708c525fb36ac9643d62..1f4163eb863a2be36ff8f7656b6ec481a2078f2d 100644 --- a/gui/slick/views/apiBuilder.mako +++ b/gui/slick/views/apiBuilder.mako @@ -149,22 +149,22 @@ <h4>Playground</h4> - URL: <kbd id="command-${command_id}-base-url">/api/${apikey}/?cmd=${command}</kbd><br /> + URL: <kbd id="command-${command_id}-base-url">/api/${apikey}/?cmd=${command}</kbd><br> % if help['data']['requiredParameters']: - Required parameters: ${display_parameters_playground(help['data']['requiredParameters'], True, command_id)}<br /> + Required parameters: ${display_parameters_playground(help['data']['requiredParameters'], True, command_id)}<br> % endif % if help['data']['optionalParameters']: - Optional parameters: ${display_parameters_playground(help['data']['optionalParameters'], False, command_id)}<br /> + Optional parameters: ${display_parameters_playground(help['data']['optionalParameters'], False, command_id)}<br> % endif - <button class="btn btn-primary" data-action="api-call" data-command-name="${command_id}" data-base-url="command-${command_id}-base-url" data-target="#command-${command_id}-response" data-time="#command-${command_id}-time" data-url="#command-${command_id}-url">Call API</button><br /> + <button class="btn btn-primary" data-action="api-call" data-command-name="${command_id}" data-base-url="command-${command_id}-base-url" data-target="#command-${command_id}-response" data-time="#command-${command_id}-time" data-url="#command-${command_id}-url">Call API</button><br> <div class="result-wrapper hidden"> <div class="clearfix"> <span class="pull-left"> - Response: <strong id="command-${command_id}-time"></strong><br /> + Response: <strong id="command-${command_id}-time"></strong><br> URL: <kbd id="command-${command_id}-url"></kbd> </span> <span class="pull-right"> diff --git a/gui/slick/views/config.mako b/gui/slick/views/config.mako index 6cd206a1cd20ab1a23bfae1c3aae48d8e02ef06c..ac0e4addcc9002342f98bdc265e2ec07b4e2c5d5 100644 --- a/gui/slick/views/config.mako +++ b/gui/slick/views/config.mako @@ -27,9 +27,9 @@ <table class="infoTable" cellspacing="1" border="0" cellpadding="0" width="100%"> <tr><td class="infoTableHeader">SR Version: </td><td class="infoTableCell"> % if sickbeard.VERSION_NOTIFY: - BRANCH: (${sickbeard.BRANCH}) / COMMIT: (${sickbeard.CUR_COMMIT_HASH}) <!-- – build.date //--><br /> + BRANCH: (${sickbeard.BRANCH}) / COMMIT: (${sickbeard.CUR_COMMIT_HASH}) <!-- – build.date //--><br> % else: - You don't have version checking turned on. Please turn on "Check for Update" in Config > General.<br /> + You don't have version checking turned on. Please turn on "Check for Update" in Config > General.<br> % endif </td></tr> diff --git a/gui/slick/views/config_anime.mako b/gui/slick/views/config_anime.mako index e123aab5970fc312b3d63d4a41273ac2815894f7..bd83311e0e4f8fe71a7143d85379eab332bc06fd 100644 --- a/gui/slick/views/config_anime.mako +++ b/gui/slick/views/config_anime.mako @@ -90,7 +90,7 @@ </fieldset> </div><!-- /component-group //--> - <br/><input type="submit" class="btn config_submitter" value="Save Changes" /><br/> + <br><input type="submit" class="btn config_submitter" value="Save Changes" /><br> </div><!-- /config-components //--> diff --git a/gui/slick/views/config_backuprestore.mako b/gui/slick/views/config_backuprestore.mako index 51293caf1ab33a839a27d10255c9ebb49b76ec9c..1e2365b9d2265e8de0692d42d4963827887ed93c 100644 --- a/gui/slick/views/config_backuprestore.mako +++ b/gui/slick/views/config_backuprestore.mako @@ -45,12 +45,12 @@ <div class="field-pair"> Select the folder you wish to save your backup file to: - <br/><br/> + <br><br> <input type="text" name="backupDir" id="backupDir" class="form-control input-sm input350" /> <input class="btn btn-inline" type="button" value="Backup" id="Backup" /> - <br/> + <br> </div> <div class="Backup" id="Backup-result"></div> @@ -68,12 +68,12 @@ <div class="field-pair"> Select the backup file you wish to restore: - <br/><br/> + <br><br> <input type="text" name="backupFile" id="backupFile" class="form-control input-sm input350" /> <input class="btn btn-inline" type="button" value="Restore" id="Restore" /> - <br/> + <br> </div> <div class="Restore" id="Restore-result"></div> diff --git a/gui/slick/views/config_general.mako b/gui/slick/views/config_general.mako index 7a5b492446a74d65297035addf6b9d99254eda65..096874d1d0beab84e07a5036eac908f756e76cd0 100644 --- a/gui/slick/views/config_general.mako +++ b/gui/slick/views/config_general.mako @@ -491,7 +491,7 @@ <span class="component-title">Reverse proxy headers</span> <span class="component-desc"> <input type="checkbox" name="handle_reverse_proxy" id="handle_reverse_proxy" ${('', 'checked="checked"')[bool(sickbeard.HANDLE_REVERSE_PROXY)]}/> - <p>accept the following reverse proxy headers (advanced)...<br />(X-Forwarded-For, X-Forwarded-Host, and X-Forwarded-Proto)</p> + <p>accept the following reverse proxy headers (advanced)...<br>(X-Forwarded-For, X-Forwarded-Host, and X-Forwarded-Proto)</p> </span> </label> </div> @@ -773,7 +773,7 @@ </div><!-- /component-group3 //--> - <br/> + <br> <h6 class="pull-right"><b>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" /> diff --git a/gui/slick/views/config_notifications.mako b/gui/slick/views/config_notifications.mako index c2771c1a975210b701381bc5b86faa38ff312f03..eca63e13931966d37042f4ce3491a2ad7ca921f5 100644 --- a/gui/slick/views/config_notifications.mako +++ b/gui/slick/views/config_notifications.mako @@ -227,7 +227,7 @@ <span class="component-desc"> <input type="text" name="plex_server_host" id="plex_server_host" value="${re.sub(r'\b,\b', ', ', sickbeard.PLEX_SERVER_HOST)}" class="form-control input-sm input350" /> <div class="clear-left"> - <p>one or more hosts running Plex Media Server<br />(eg. 192.168.1.1:32400, 192.168.1.2:32400)</p> + <p>one or more hosts running Plex Media Server<br>(eg. 192.168.1.1:32400, 192.168.1.2:32400)</p> </div> </span> </label> @@ -295,7 +295,7 @@ <span class="component-desc"> <input type="text" name="plex_host" id="plex_host" value="${sickbeard.PLEX_HOST}" class="form-control input-sm input350" /> <div class="clear-left"> - <p>one or more hosts running Plex client<br />(eg. 192.168.1.100:3000, 192.168.1.101:3000)</p> + <p>one or more hosts running Plex client<br>(eg. 192.168.1.100:3000, 192.168.1.101:3000)</p> </div> </span> </label> @@ -1495,7 +1495,7 @@ <span class="component-title">Step One</span> </label> <label> - <span style="font-size: 11px;">Click the "Request Authorization" button.<br/> This will open a new page containing an auth key.<br/> <b>Note:</b> if nothing happens check your popup blocker.<br/></span> + <span style="font-size: 11px;">Click the "Request Authorization" button.<br> This will open a new page containing an auth key.<br> <b>Note:</b> if nothing happens check your popup blocker.<br></span> <input class="btn" type="button" value="Request Authorization" id="twitterStep1" /> </label> </div> @@ -1504,7 +1504,7 @@ <span class="component-title">Step Two</span> </label> <label> - <span style="font-size: 11px;">Enter the key Twitter gave you below, and click "Verify Key".<br/><br/></span> + <span style="font-size: 11px;">Enter the key Twitter gave you below, and click "Verify Key".<br><br></span> <input type="text" id="twitter_key" value="" class="form-control input-sm input350" /> <input class="btn btn-inline" type="button" value="Verify Key" id="twitterStep2" /> </label> @@ -1831,7 +1831,7 @@ </div><!-- /config-components //--> </form> - <br/><input type="submit" class="config_submitter btn" value="Save Changes" /><br/> + <br><input type="submit" class="config_submitter btn" value="Save Changes" /><br> </div> </div> diff --git a/gui/slick/views/config_postProcessing.mako b/gui/slick/views/config_postProcessing.mako index f5e3491ec46927945410083be063076fb34dc0ac..4ac11b9a7991b3985df5fbdd572f72d980bce058 100644 --- a/gui/slick/views/config_postProcessing.mako +++ b/gui/slick/views/config_postProcessing.mako @@ -236,7 +236,7 @@ <span class="component-desc">See <a href="https://github.com/SiCKRAGETV/sickrage-issues/wiki/Post-Processing#extra-scripts"><font color='red'><b>Wiki</b></font></a> for script arguments description and usage.</span> </label> </div> - <input type="submit" class="btn config_submitter" value="Save Changes" /><br/> + <input type="submit" class="btn config_submitter" value="Save Changes" /><br> </fieldset> </div><!-- /component-group1 //--> <div id="core-component-group2" class="component-group"> @@ -416,7 +416,7 @@ </tr> </tbody> </table> - <br/> + <br> </div> </div> @@ -438,7 +438,7 @@ <div class="example"> <span class="jumbo" id="naming_example"> </span> </div> - <br/> + <br> </div> <div id="naming_example_multi_div"> @@ -446,7 +446,7 @@ <div class="example"> <span class="jumbo" id="naming_example_multi"> </span> </div> - <br/> + <br> </div> <div class="field-pair"> @@ -624,7 +624,7 @@ </tr> </tbody> </table> - <br/> + <br> </div> </div><!-- /naming_abd_custom --> @@ -633,7 +633,7 @@ <div class="example"> <span class="jumbo" id="naming_abd_example"> </span> </div> - <br/> + <br> </div> </div><!-- /naming_abd_different --> @@ -801,7 +801,7 @@ </tr> </tbody> </table> - <br/> + <br> </div> </div><!-- /naming_sports_custom --> @@ -810,7 +810,7 @@ <div class="example"> <span class="jumbo" id="naming_sports_example"> </span> </div> - <br/> + <br> </div> </div><!-- /naming_sports_different --> @@ -974,7 +974,7 @@ </tr> </tbody> </table> - <br/> + <br> </div> </div><!-- /naming_anime_custom --> @@ -996,7 +996,7 @@ <div class="example"> <span class="jumbo" id="naming_example_anime"> </span> </div> - <br/> + <br> </div> <div id="naming_example_multi_anime_div"> @@ -1004,7 +1004,7 @@ <div class="example"> <span class="jumbo" id="naming_example_multi_anime"> </span> </div> - <br/> + <br> </div> <div class="field-pair"> @@ -1046,7 +1046,7 @@ </div><!-- /naming_anime_different --> <div></div> - <input type="submit" class="btn config_submitter" value="Save Changes" /><br/> + <input type="submit" class="btn config_submitter" value="Save Changes" /><br> </fieldset> </div><!-- /component-group2 //--> @@ -1112,13 +1112,13 @@ </div> % endfor - <div class="clearfix"></div><br/> + <div class="clearfix"></div><br> - <input type="submit" class="btn config_submitter" value="Save Changes" /><br/> + <input type="submit" class="btn config_submitter" value="Save Changes" /><br> </fieldset> </div><!-- /component-group3 //--> - <br/> + <br> <h6 class="pull-right"><b>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" /> diff --git a/gui/slick/views/config_providers.mako b/gui/slick/views/config_providers.mako index d5478b073e8accff5cac205eb811d3a3b82888c8..acc35b3f0949026ca0df18b034373b392d081588 100644 --- a/gui/slick/views/config_providers.mako +++ b/gui/slick/views/config_providers.mako @@ -59,7 +59,7 @@ $('#config-components').tabs(); % if not sickbeard.USE_NZBS or not sickbeard.USE_TORRENTS: <blockquote style="margin: 20px 0;">NZB/Torrent providers can be toggled in <b><a href="${srRoot}/config/search">Search Settings</a></b></blockquote> % else: - <br/> + <br> % endif <div> @@ -90,7 +90,7 @@ $('#config-components').tabs(); % endfor </ul> <input type="hidden" name="provider_order" id="provider_order" value="${" ".join([x.getID()+':'+str(int(x.isEnabled())) for x in sickbeard.providers.sortedProviderList()])}"/> - <br/><input type="submit" class="btn config_submitter" value="Save Changes" /><br/> + <br><input type="submit" class="btn config_submitter" value="Save Changes" /><br> </fieldset> </div><!-- /component-group1 //--> @@ -586,7 +586,7 @@ $('#config-components').tabs(); <!-- end div for editing providers --> - <input type="submit" class="btn config_submitter" value="Save Changes" /><br/> + <input type="submit" class="btn config_submitter" value="Save Changes" /><br> </fieldset> </div><!-- /component-group2 //--> @@ -595,7 +595,7 @@ $('#config-components').tabs(); <div id="core-component-group3" class="component-group"> <div class="component-group-desc"> - <h3>Configure Custom<br />Newznab Providers</h3> + <h3>Configure Custom<br>Newznab Providers</h3> <p>Add and setup or remove custom Newznab providers.</p> </div> @@ -732,7 +732,7 @@ $('#config-components').tabs(); </div><!-- /component-group4 //--> % endif - <br/><input type="submit" class="btn config_submitter_refresh" value="Save Changes" /><br/> + <br><input type="submit" class="btn config_submitter_refresh" value="Save Changes" /><br> </div><!-- /config-components //--> diff --git a/gui/slick/views/config_search.mako b/gui/slick/views/config_search.mako index d8b1e4914d3476b07e2af1eaf0a8a61ebab22a29..3560645ce19e606e6dbd6259173fd474ccd0e395 100644 --- a/gui/slick/views/config_search.mako +++ b/gui/slick/views/config_search.mako @@ -105,7 +105,7 @@ <span class="component-title">Ignore words</span> <span class="component-desc"> <input type="text" name="ignore_words" value="${sickbeard.IGNORE_WORDS}" class="form-control input-sm input350" /> - <div class="clear-left">results with one or more word from this list will be ignored<br /> + <div class="clear-left">results with one or more word from this list will be ignored<br> separate words with a comma, e.g. "word1,word2,word3" </div> </span> @@ -117,7 +117,7 @@ <span class="component-title">Require words</span> <span class="component-desc"> <input type="text" name="require_words" value="${sickbeard.REQUIRE_WORDS}" class="form-control input-sm input350" /> - <div class="clear-left">results with no word from this list will be ignored<br /> + <div class="clear-left">results with no word from this list will be ignored<br> separate words with a comma, e.g. "word1,word2,word3" </div> </span> @@ -129,8 +129,8 @@ <span class="component-title">Ignore language names in subbed results</span> <span class="component-desc"> <input type="text" name="ignored_subs_list" value="${sickbeard.IGNORED_SUBS_LIST}" class="form-control input-sm input350" /> - <div class="clear-left">Ignore subbed releases based on language names <br /> - Example: "dk" will ignore words: dksub, dksubs, dksubbed, dksubed <br /> + <div class="clear-left">Ignore subbed releases based on language names <br> + Example: "dk" will ignore words: dksub, dksubs, dksubbed, dksubed <br> separate languages with a comma, e.g. "lang1,lang2,lang3 </div> </span> @@ -420,7 +420,7 @@ <div class="testNotification" id="testSABnzbd_result">Click below to test</div> <input class="btn" type="button" value="Test SABnzbd" id="testSABnzbd" class="btn test-button"/> - <input type="submit" class="btn config_submitter" value="Save Changes" /><br/> + <input type="submit" class="btn config_submitter" value="Save Changes" /><br> </div><!-- /content_use_nzbs //--> @@ -472,7 +472,7 @@ </div> <div></div> - <input type="submit" class="btn config_submitter" value="Save Changes" /><br/> + <input type="submit" class="btn config_submitter" value="Save Changes" /><br> </div> </div> @@ -613,13 +613,13 @@ <div class="testNotification" id="test_torrent_result">Click below to test</div> <input class="btn" type="button" value="Test Connection" id="test_torrent" class="btn test-button"/> - <input type="submit" class="btn config_submitter" value="Save Changes" /><br/> + <input type="submit" class="btn config_submitter" value="Save Changes" /><br> </div> </div><!-- /content_use_torrents //--> </fieldset> </div><!-- /component-group3 //--> - <br/> + <br> <h6 class="pull-right"><b>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" /> diff --git a/gui/slick/views/config_subtitles.mako b/gui/slick/views/config_subtitles.mako index 28cf9a36921a08105d4daba25a3cfe1353abfc4f..940d7eb876e2737337ae11f1a006efefc230b287 100644 --- a/gui/slick/views/config_subtitles.mako +++ b/gui/slick/views/config_subtitles.mako @@ -146,7 +146,7 @@ $('#subtitles_dir').fileBrowser({ title: 'Select Subtitles Download Directory' } </label> </div> - <br/><input type="submit" class="btn config_submitter" value="Save Changes" /><br/> + <br><input type="submit" class="btn config_submitter" value="Save Changes" /><br> </div> </fieldset> </div><!-- /component-group1 //--> @@ -175,7 +175,7 @@ $('#subtitles_dir').fileBrowser({ title: 'Select Subtitles Download Directory' } </ul> <input type="hidden" name="service_order" id="service_order" value="<%" ".join(['%s:%d' % (x['name'], x['enabled']) for x in sickbeard.subtitles.sortedServiceList()])%>"/> - <br/><input type="submit" class="btn config_submitter" value="Save Changes" /><br/> + <br><input type="submit" class="btn config_submitter" value="Save Changes" /><br> </fieldset> </div><!-- /component-group2 //--> <div id="core-component-group3" class="component-group"> @@ -211,7 +211,7 @@ $('#subtitles_dir').fileBrowser({ title: 'Select Subtitles Download Directory' } </label> </div> % endfor - <br/><input type="submit" class="btn config_submitter" value="Save Changes" /><br/> + <br><input type="submit" class="btn config_submitter" value="Save Changes" /><br> </fieldset> </div><!-- /component-group3 //--> </div><!-- /config-components //--> diff --git a/gui/slick/views/editShow.mako b/gui/slick/views/editShow.mako index d8e9cc47b7809329748f96756325ba5d53dff2fb..2bee5ca1f8162dde46467f1d3d76f7c54ea6c8c6 100644 --- a/gui/slick/views/editShow.mako +++ b/gui/slick/views/editShow.mako @@ -134,7 +134,7 @@ <label for="airbydate"> <span class="component-title">Air by date</span> <span class="component-desc"> - <input type="checkbox" id="airbydate" name="air_by_date" ${('', 'checked="checked"')[show.air_by_date == 1]} /> check if the show is released as Show.03.02.2010 rather than Show.S02E03.<br /> + <input type="checkbox" id="airbydate" name="air_by_date" ${('', 'checked="checked"')[show.air_by_date == 1]} /> check if the show is released as Show.03.02.2010 rather than Show.S02E03.<br> <span style="color:red">In case of an air date conflict between regular and special episodes, the later will be ignored.</span> </span> </label> @@ -144,7 +144,7 @@ <label for="anime"> <span class="component-title">Anime</span> <span class="component-desc"> - <input type="checkbox" id="anime" name="anime" ${('', 'checked="checked"')[show.is_anime == 1]}> check if the show is Anime and episodes are released as Show.265 rather than Show.S02E03<br /> + <input type="checkbox" id="anime" name="anime" ${('', 'checked="checked"')[show.is_anime == 1]}> check if the show is Anime and episodes are released as Show.265 rather than Show.S02E03<br> % if show.is_anime: <%include file="/inc_blackwhitelist.mako"/> % endif @@ -156,7 +156,7 @@ <label for="sports"> <span class="component-title">Sports</span> <span class="component-desc"> - <input type="checkbox" id="sports" name="sports" ${('', 'checked="checked"')[show.sports == 1]}/> check if the show is a sporting or MMA event released as Show.03.02.2010 rather than Show.S02E03<br /> + <input type="checkbox" id="sports" name="sports" ${('', 'checked="checked"')[show.sports == 1]}/> check if the show is a sporting or MMA event released as Show.03.02.2010 rather than Show.S02E03<br> <span style="color:red">In case of an air date conflict between regular and special episodes, the later will be ignored.</span> </span> </label> @@ -184,7 +184,7 @@ <label for="dvdorder"> <span class="component-title">DVD Order</span> <span class="component-desc"> - <input type="checkbox" id="dvdorder" name="dvdorder" ${('', 'checked="checked"')[show.dvdorder == 1]} /> use the DVD order instead of the air order<br /> + <input type="checkbox" id="dvdorder" name="dvdorder" ${('', 'checked="checked"')[show.dvdorder == 1]} /> use the DVD order instead of the air order<br> <div class="clear-left"><p>A "Force Full Update" is necessary, and if you have existing episodes you need to sort them manually.</p></div> </span> </label> @@ -203,7 +203,7 @@ <label for="rls_ignore_words"> <span class="component-title">Ignored Words</span> <span class="component-desc"> - <input type="text" id="rls_ignore_words" name="rls_ignore_words" id="rls_ignore_words" value="${show.rls_ignore_words}" class="form-control form-control-inline input-sm input350" /><br /> + <input type="text" id="rls_ignore_words" name="rls_ignore_words" id="rls_ignore_words" value="${show.rls_ignore_words}" class="form-control form-control-inline input-sm input350" /><br> <div class="clear-left"> <p>comma-separated <i>e.g. "word1,word2,word3"</i></> <p>Search results with one or more words from this list will be ignored.</p> @@ -216,7 +216,7 @@ <label for="rls_require_words"> <span class="component-title">Required Words</span> <span class="component-desc"> - <input type="text" id="rls_require_words" name="rls_require_words" id="rls_require_words" value="${show.rls_require_words}" class="form-control form-control-inline input-sm input350" /><br /> + <input type="text" id="rls_require_words" name="rls_require_words" id="rls_require_words" value="${show.rls_require_words}" class="form-control form-control-inline input-sm input350" /><br> <div class="clear-left"> <p>comma-separated <i>e.g. "word1,word2,word3"</i></p> <p>Search results with no words from this list will be ignored.</p> @@ -229,7 +229,7 @@ <label for="SceneName"> <span class="component-title">Scene Exception</span> <span class="component-desc"> - <input type="text" id="SceneName" class="form-control form-control-inline input-sm input200" /><input class="btn btn-inline" type="button" value="Add" id="addSceneName" /><br /><br /> + <input type="text" id="SceneName" class="form-control form-control-inline input-sm input200" /><input class="btn btn-inline" type="button" value="Add" id="addSceneName" /><br><br> <div class="pull-left"> <select id="exceptions_list" name="exceptions_list" multiple="multiple" style="min-width:200px;height:99px;"> % for cur_exception in show.exceptions: @@ -249,7 +249,7 @@ </div> - <br /> + <br> <input id="submit" type="submit" value="Save Changes" class="btn pull-left config_submitter button"> </form> </div> diff --git a/gui/slick/views/home_addExistingShow.mako b/gui/slick/views/home_addExistingShow.mako index 3e029e48659fdf575bd963712fc2c4a0b528b295..c4f59585b206e193b59fc80eec271abe521efaf9 100644 --- a/gui/slick/views/home_addExistingShow.mako +++ b/gui/slick/views/home_addExistingShow.mako @@ -36,7 +36,7 @@ <%include file="/inc_addShowOptions.mako"/> </div> </div> - <br /> + <br> <p>SickRage can add existing shows, using the current options, by using locally stored NFO/XML metadata to eliminate user interaction. If you would rather have SickRage prompt you to customize each show, then use the checkbox below.</p> @@ -48,10 +48,10 @@ <p><b>Displaying folders within these directories which aren't already added to SickRage:</b></p> <ul id="rootDirStaticList"><li></li></ul> - <br /> + <br> <div id="tableDiv"></div> - <br /> - <br /> + <br> + <br> <input class="btn btn-primary" type="button" value="Submit" id="submitShowDirs" /> </form> diff --git a/gui/slick/views/home_addShows.mako b/gui/slick/views/home_addShows.mako index c06e1e2b4316674af9272148f64edb6a7eb96d1c..16da9f75c1dac61cf22c99dbb32ae7c387ede771 100644 --- a/gui/slick/views/home_addShows.mako +++ b/gui/slick/views/home_addShows.mako @@ -20,7 +20,7 @@ </div> </a> - <br/><br/> + <br><br> % if sickbeard.USE_TRAKT == True: <a href="${srRoot}/home/addShows/trendingShows/" id="btnNewShow" class="btn btn-large"> <div class="button"><div class="icon-addtrendingshow"></div></div> @@ -30,7 +30,7 @@ </div> </a> - <br/><br/> + <br><br> <a href="${srRoot}/home/addShows/recommendedShows/" id="btnNewShow" class="btn btn-large"> <div class="button"><div class="icon-addrecommendedshow"></div></div> @@ -40,7 +40,7 @@ </div> </a> - <br/><br/> + <br><br> % endif <a href="${srRoot}/home/addShows/popularShows/" id="btnNewShow" class="btn btn-large"> @@ -51,7 +51,7 @@ </div> </a> - <br/><br/> + <br><br> <a href="${srRoot}/home/addShows/existingShows/" id="btnExistingShow" class="btn btn-large"> <div class="button"><div class="icon-addexistingshow"></div></div> diff --git a/gui/slick/views/home_newShow.mako b/gui/slick/views/home_newShow.mako index 0a13df2591ecbc1da377a737920e03ae6bebdcbb..62a72a4736e1b239eebdab8dce4ea551fc191e9c 100644 --- a/gui/slick/views/home_newShow.mako +++ b/gui/slick/views/home_newShow.mako @@ -27,7 +27,7 @@ <div id="core-component-group1" class="tab-pane active component-group"> <div id="displayText">aoeu</div> - <br /> + <br> <form id="addShowForm" method="post" action="${srRoot}/home/addShows/addNewShow" accept-charset="utf-8"> @@ -60,10 +60,10 @@ <input class="btn btn-inline" type="button" id="searchName" value="Search" /> - <br /><br /> - <b>*</b> This will only affect the language of the retrieved metadata file contents and episode filenames.<br /> - This <b>DOES NOT</b> allow SickRage to download non-english TV episodes!<br /><br /> - <div id="searchResults" style="height: 100%;"><br/></div> + <br><br> + <b>*</b> This will only affect the language of the retrieved metadata file contents and episode filenames.<br> + This <b>DOES NOT</b> allow SickRage to download non-english TV episodes!<br><br> + <div id="searchResults" style="height: 100%;"><br></div> % endif </div> @@ -74,8 +74,8 @@ <div class="stepDiv"> % if provided_show_dir: - Pre-chosen Destination Folder: <b>${provided_show_dir}</b> <br /> - <input type="hidden" id="fullShowPath" name="fullShowPath" value="${provided_show_dir}" /><br /> + Pre-chosen Destination Folder: <b>${provided_show_dir}</b> <br> + <input type="hidden" id="fullShowPath" name="fullShowPath" value="${provided_show_dir}" /><br> % else: <%include file="/inc_rootDirs.mako"/> % endif @@ -95,7 +95,7 @@ <input type="hidden" name="skipShow" id="skipShow" value="" /> </form> -<br /> +<br> <div style="width: 100%; text-align: center;"> <input class="btn" type="button" id="addShowButton" value="Add Show" disabled="disabled" /> diff --git a/gui/slick/views/home_popularShows.mako b/gui/slick/views/home_popularShows.mako index 17fdc4498d61ac1fa1e1bf79393216d1150637c7..3b5b5ed9491392e8bb4fa6c1bb641ebe17afb621 100644 --- a/gui/slick/views/home_popularShows.mako +++ b/gui/slick/views/home_popularShows.mako @@ -6,7 +6,7 @@ %> <%block name="content"> <h2>Popular Shows</h2> -<br /> +<br> % if not popular_shows: <h3>Fetching of IMDB Data failed. Are you online?</h3> diff --git a/gui/slick/views/home_recommendedShows.mako b/gui/slick/views/home_recommendedShows.mako index f1ede43278fa67abcc7e8f250d2293186fe5970a..f5d77e8ea164704c4cc0b8c1ccc3cbd3b007fd03 100644 --- a/gui/slick/views/home_recommendedShows.mako +++ b/gui/slick/views/home_recommendedShows.mako @@ -44,7 +44,7 @@ </select> </div> -<br /> +<br> <div id="trendingShows"></div> -<br /> +<br> </%block> diff --git a/gui/slick/views/home_trendingShows.mako b/gui/slick/views/home_trendingShows.mako index a6aa74f07e755e26005a0c10fbba84da72832761..a49b019d8d265f3b5842e8d0df765da3680273bf 100644 --- a/gui/slick/views/home_trendingShows.mako +++ b/gui/slick/views/home_trendingShows.mako @@ -50,7 +50,7 @@ </select> </div> -<br /> +<br> <div id="trendingShows"></div> -<br /> +<br> </%block> diff --git a/gui/slick/views/inc_blackwhitelist.mako b/gui/slick/views/inc_blackwhitelist.mako index 0b088b327f878aee871180c2065fb2ae055a5210..0aa539466b38fd0c448da28a85dbf7f2c3e8fc5d 100644 --- a/gui/slick/views/inc_blackwhitelist.mako +++ b/gui/slick/views/inc_blackwhitelist.mako @@ -19,7 +19,7 @@ <option value="${keyword}">${keyword}</option> % endfor </select> - <br/> + <br> <input class="btn" id="removeW" value="Remove" type="button"/> </div> <div class="blackwhitelist pool"> @@ -31,7 +31,7 @@ % endif % endfor </select> - <br/> + <br> <input class="btn" id="addW" value="Add to Whitelist" type="button"/> <input class="btn" id="addB" value="Add to Blacklist" type="button"/> </div> @@ -42,7 +42,7 @@ <option value="${keyword}">${keyword}</option> % endfor </select> - <br/> + <br> <input class="btn" id="removeB" value="Remove" type="button"/> </div> </div> diff --git a/gui/slick/views/manage.mako b/gui/slick/views/manage.mako index e7f0ba82301e6a6eec793c5d8513645be6465fb8..cb82645283f1acfa43188ad620d7763104ad80ff 100644 --- a/gui/slick/views/manage.mako +++ b/gui/slick/views/manage.mako @@ -21,7 +21,7 @@ <table id="massUpdateTable" class="sickbeardTable tablesorter" cellspacing="1" border="0" cellpadding="0"> <thead> <tr> - <th class="col-checkbox">Edit<br/><input type="checkbox" class="bulkCheck" id="editCheck" /></th> + <th class="col-checkbox">Edit<br><input type="checkbox" class="bulkCheck" id="editCheck" /></th> <th class="nowrap" style="text-align: left;">Show Name</th> <th class="col-quality">Quality</th> <th class="col-legend">Sports</th> @@ -33,15 +33,15 @@ <th class="col-legend">Subtitle</th> <th class="col-legend">Default Ep<br>Status</th> <th class="col-legend">Status</th> - <th width="1%">Update<br/><input type="checkbox" class="bulkCheck" id="updateCheck" /></th> - <th width="1%">Rescan<br/><input type="checkbox" class="bulkCheck" id="refreshCheck" /></th> - <th width="1%">Rename<br/><input type="checkbox" class="bulkCheck" id="renameCheck" /></th> + <th width="1%">Update<br><input type="checkbox" class="bulkCheck" id="updateCheck" /></th> + <th width="1%">Rescan<br><input type="checkbox" class="bulkCheck" id="refreshCheck" /></th> + <th width="1%">Rename<br><input type="checkbox" class="bulkCheck" id="renameCheck" /></th> % if sickbeard.USE_SUBTITLES: - <th width="1%">Search Subtitle<br/><input type="checkbox" class="bulkCheck" id="subtitleCheck" /></th> + <th width="1%">Search Subtitle<br><input type="checkbox" class="bulkCheck" id="subtitleCheck" /></th> % endif <!-- <th>Force Metadata Regen <input type="checkbox" class="bulkCheck" id="metadataCheck" /></th>//--> - <th width="1%">Delete<br/><input type="checkbox" class="bulkCheck" id="deleteCheck" /></th> - <th width="1%">Remove<br/><input type="checkbox" class="bulkCheck" id="removeCheck" /></th> + <th width="1%">Delete<br><input type="checkbox" class="bulkCheck" id="deleteCheck" /></th> + <th width="1%">Remove<br><input type="checkbox" class="bulkCheck" id="removeCheck" /></th> </tr> </thead> diff --git a/gui/slick/views/manage_backlogOverview.mako b/gui/slick/views/manage_backlogOverview.mako index db2eca31046389ee7914da2b2ba65c24dbcc703d..637c9d1143f8c681b1f8242e1d685a78bc0e9fdd 100644 --- a/gui/slick/views/manage_backlogOverview.mako +++ b/gui/slick/views/manage_backlogOverview.mako @@ -30,7 +30,7 @@ <div class="h2footer pull-right"> <span class="listing-key wanted">Wanted: <b>${totalWanted}</b></span> <span class="listing-key qual">Low Quality: <b>${totalQual}</b></span> -</div><br/> +</div><br> <div class="float-left"> Jump to Show @@ -51,7 +51,7 @@ Jump to Show % endif <tr class="seasonheader" id="show-${curShow.indexerid}"> <td colspan="3" class="align-left"> - <br/><h2><a href="${srRoot}/home/displayShow?show=${curShow.indexerid}">${curShow.name}</a></h2> + <br><h2><a href="${srRoot}/home/displayShow?show=${curShow.indexerid}">${curShow.name}</a></h2> <div class="pull-right"> <span class="listing-key wanted">Wanted: <b>${showCounts[curShow.indexerid][Overview.WANTED]}</b></span> <span class="listing-key qual">Low Quality: <b>${showCounts[curShow.indexerid][Overview.QUAL]}</b></span> diff --git a/gui/slick/views/manage_episodeStatuses.mako b/gui/slick/views/manage_episodeStatuses.mako index e26bfdbe841c5fa88c8d1d19bf6a4e09e4229981..ebf0cdff4f3766b851b3e27341edb20f34633736 100644 --- a/gui/slick/views/manage_episodeStatuses.mako +++ b/gui/slick/views/manage_episodeStatuses.mako @@ -20,7 +20,7 @@ % if whichStatus: <h2>None of your episodes have status ${common.statusStrings[int(whichStatus)]}</h2> -<br /> +<br> % endif <form action="${srRoot}/manage/episodeStatuses" method="get"> @@ -41,7 +41,7 @@ Manage episodes with status <select name="whichStatus" class="form-control form- <h2>Shows containing ${common.statusStrings[int(whichStatus)]} episodes</h2> -<br /> +<br> <% if int(whichStatus) in [common.IGNORED, common.SNATCHED] + common.Quality.DOWNLOADED + common.Quality.ARCHIVED: @@ -77,7 +77,7 @@ Set checked shows/episodes to <select name="newStatus" class="form-control form- <button type="button" class="btn btn-xs selectAllShows">Select all</a></button> <button type="button" class="btn btn-xs unselectAllShows">Clear all</a></button> </div> -<br /> +<br> <table class="sickbeardTable manageTable" cellspacing="1" border="0" cellpadding="0"> % for cur_indexer_id in sorted_show_ids: diff --git a/gui/slick/views/manage_failedDownloads.mako b/gui/slick/views/manage_failedDownloads.mako index 759c930705ea555b1cea87f69385b94d9ded88f0..dbce4121fb9d23fd30ccc4bca0662a2da22b5915 100644 --- a/gui/slick/views/manage_failedDownloads.mako +++ b/gui/slick/views/manage_failedDownloads.mako @@ -35,7 +35,7 @@ <th class="nowrap" width="75%" style="text-align: left;">Release</th> <th width="10%">Size</th> <th width="14%">Provider</th> - <th width="1%">Remove<br /> + <th width="1%">Remove<br> <input type="checkbox" class="bulkCheck" id="removeCheck" /> </th> </tr> diff --git a/gui/slick/views/manage_manageSearches.mako b/gui/slick/views/manage_manageSearches.mako index 78e3d36a79c87df0950a90d509cb00f96fd4554c..e3caf400a321675cff1cb5f4b58377af69d2cd8d 100644 --- a/gui/slick/views/manage_manageSearches.mako +++ b/gui/slick/views/manage_manageSearches.mako @@ -21,28 +21,28 @@ <a class="btn" href="${srRoot}/manage/manageSearches/forceBacklog"><i class="icon-exclamation-sign"></i> Force</a> <a class="btn" href="${srRoot}/manage/manageSearches/pauseBacklog?paused=${('1', '0')[bool(backlogPaused)]}"><i class="icon-${('paused', 'play')[bool(backlogPaused)]}"></i> ${('pause', 'Unpause')[bool(backlogPaused)]}</a> % if not backlogRunning: - Not in progress<br /> + Not in progress<br> % else: ${('', 'Paused:')[bool(backlogPaused)]} - Currently running<br /> + Currently running<br> % endif -<br /> +<br> <h3>Daily Search:</h3> <a class="btn" href="${srRoot}/manage/manageSearches/forceSearch"><i class="icon-exclamation-sign"></i> Force</a> -${('Not in progress', 'In Progress')[dailySearchStatus]}<br /> -<br /> +${('Not in progress', 'In Progress')[dailySearchStatus]}<br> +<br> <h3>Find Propers Search:</h3> <a class="btn ${('disabled', '')[bool(sickbeard.DOWNLOAD_PROPERS)]}" href="${srRoot}/manage/manageSearches/forceFindPropers"><i class="icon-exclamation-sign"></i> Force</a> % if not sickbeard.DOWNLOAD_PROPERS: - Propers search disabled <br /> + Propers search disabled <br> % elif not findPropersStatus: - Not in progress<br /> + Not in progress<br> % else: - In Progress<br /> + In Progress<br> % endif -<br /> +<br> <h3>Search Queue:</h3> Backlog: <i>${queueLength['backlog']} pending items</i></br> diff --git a/gui/slick/views/manage_massEdit.mako b/gui/slick/views/manage_massEdit.mako index 4f28b08963298930a7982a239f78d4047e74f1a8..2167823607e27093390babb75cb7e484eebf838a 100644 --- a/gui/slick/views/manage_massEdit.mako +++ b/gui/slick/views/manage_massEdit.mako @@ -39,8 +39,8 @@ <div class="component-group"> <h3>Main Settings</h3> - ==> <u>Changing any settings marked with (<span class="separator">*</span>) will force a refresh of the selected shows.</u><br /> - <br /> + ==> <u>Changing any settings marked with (<span class="separator">*</span>) will force a refresh of the selected shows.</u><br> + <br> <fieldset class="component-group-list"> @@ -49,7 +49,7 @@ <span class="component-title">Selected Shows</span> <span class="component-desc"> % for curName in sorted(showNames): - <span style="font-size: 14px;">${curName}</span><br /> + <span style="font-size: 14px;">${curName}</span><br> % endfor </span> </label> @@ -142,7 +142,7 @@ <option value="keep" ${('', 'selected="selected"')[archive_firstmatch_value == None]}>< Keep ></option> <option value="enable" ${('', 'selected="selected"')[archive_firstmatch_value == 1]}>Yes</option> <option value="disable" ${('', 'selected="selected"')[archive_firstmatch_value == 0]}>No</option> - </select><br /> + </select><br> Archive episode after the first best match is found from your archive quality list. </span> </label> @@ -156,7 +156,7 @@ <option value="keep" ${('', 'selected="selected"')[flatten_folders_value == None]}>< Keep ></option> <option value="enable" ${('', 'selected="selected"')[flatten_folders_value == 0]}>Yes</option> <option value="disable" ${('', 'selected="selected"')[flatten_folders_value == 1]}>No</option> - </select><br /> + </select><br> Group episodes by season folder (set to "No" to store in a single folder). </span> </label> @@ -185,7 +185,7 @@ % for curStatus in [WANTED, SKIPPED, IGNORED]: <option value="${curStatus}" ${('', 'selected="selected"')[curStatus == default_ep_status_value]}>${statusStrings[curStatus]}</option> % endfor - </select><br /> + </select><br> This will set the status for future episodes. </span> </label> @@ -199,7 +199,7 @@ <option value="keep" ${('', 'selected="selected"')[scene_value == None]}>< Keep ></option> <option value="enable" ${('', 'selected="selected"')[scene_value == 1]}>Yes</option> <option value="disable" ${('', 'selected="selected"')[scene_value == 0]}>No</option> - </select><br /> + </select><br> Search by scene numbering (set to "No" to search by indexer numbering). </span> </label> @@ -213,7 +213,7 @@ <option value="keep" ${('', 'selected="selected"')[anime_value == None]}>< Keep ></option> <option value="enable" ${('', 'selected="selected"')[anime_value == 1]}>Yes</option> <option value="disable" ${('', 'selected="selected"')[anime_value == 0]}>No</option> - </select><br /> + </select><br> Set if these shows are Anime and episodes are released as Show.265 rather than Show.S02E03 </span> </label> @@ -227,8 +227,8 @@ <option value="keep" ${('', 'selected="selected"')[sports_value == None]}>< Keep ></option> <option value="enable" ${('', 'selected="selected"')[sports_value == 1]}>Yes</option> <option value="disable" ${('', 'selected="selected"')[sports_value == 0]}>No</option> - </select><br /> - Set if these shows are sporting or MMA events released as Show.03.02.2010 rather than Show.S02E03.<br /> + </select><br> + Set if these shows are sporting or MMA events released as Show.03.02.2010 rather than Show.S02E03.<br> <span style="color:red">In case of an air date conflict between regular and special episodes, the later will be ignored.</span> </span> </label> @@ -242,8 +242,8 @@ <option value="keep" ${('', 'selected="selected"')[air_by_date_value == None]}>< Keep ></option> <option value="enable" ${('', 'selected="selected"')[air_by_date_value == 1]}>Yes</option> <option value="disable" ${('', 'selected="selected"')[air_by_date_value == 0]}>No</option> - </select><br /> - Set if these shows are released as Show.03.02.2010 rather than Show.S02E03.<br /> + </select><br> + Set if these shows are released as Show.03.02.2010 rather than Show.S02E03.<br> <span style="color:red">In case of an air date conflict between regular and special episodes, the later will be ignored.</span> </span> </label> @@ -257,7 +257,7 @@ <option value="keep" ${('', 'selected="selected"')[subtitles_value == None]}>< Keep ></option> <option value="enable" ${('', 'selected="selected"')[subtitles_value == 1]}>Yes</option> <option value="disable" ${('', 'selected="selected"')[subtitles_value == 0]}>No</option> - </select><br /> + </select><br> Search for subtitles. </span> </label> diff --git a/gui/slick/views/manage_subtitleMissed.mako b/gui/slick/views/manage_subtitleMissed.mako index c5367207098f4366a1d6bbe99bf04f4630ef0eaf..5337fd8e6fbbaceb2573498f4d4c64b403d437f0 100644 --- a/gui/slick/views/manage_subtitleMissed.mako +++ b/gui/slick/views/manage_subtitleMissed.mako @@ -22,7 +22,7 @@ % if whichSubs: <h2>All of your episodes have ${subsLanguage} subtitles.</h2> -<br /> +<br> % endif <form action="${srRoot}/manage/subtitleMissed" method="get"> @@ -42,13 +42,13 @@ subtitles <form action="${srRoot}/manage/downloadSubtitleMissed" method="post"> <h2>Episodes without ${subsLanguage} subtitles.</h2> -<br /> +<br> Download missed subtitles for selected episodes <input class="btn btn-inline" type="submit" value="Go" /> <div> <button type="button" class="btn btn-xs selectAllShows">Select all</a></button> <button type="button" class="btn btn-xs unselectAllShows">Clear all</a></button> </div> -<br /> +<br> <table class="sickbeardTable manageTable" cellspacing="1" border="0" cellpadding="0"> % for cur_indexer_id in sorted_show_ids: <tr id="${cur_indexer_id}"> diff --git a/gui/slick/views/restart.mako b/gui/slick/views/restart.mako index 67510c016e01f8d415b6389602de236b20886b7c..6c53fb34009f69583c88751caf9675a86e74c35b 100644 --- a/gui/slick/views/restart.mako +++ b/gui/slick/views/restart.mako @@ -49,7 +49,7 @@ sbDefaultPage = "${sbDefaultPage}"; %> <% themeSpinner = ('', '-dark')['dark' == themeSpinner] %> <h2>Performing Restart</h2> -<br /> +<br> <div id="shut_down_message"> Waiting for SickRage to shut down: <img src="${srRoot}/images/loading16${themeSpinner}.gif" height="16" width="16" id="shut_down_loading" /> diff --git a/gui/slick/views/schedule.mako b/gui/slick/views/schedule.mako index 6f6e69472c5d8f926f8d42951d3be3e21af67356..921ab74661cc868a5390bf54daa372db3f36650f 100644 --- a/gui/slick/views/schedule.mako +++ b/gui/slick/views/schedule.mako @@ -196,7 +196,7 @@ show_div = 'ep_listing listing-default' %> % if 'show' == sort: - <br /><br /> + <br><br> % endif % for cur_result in results: @@ -238,17 +238,17 @@ % elif 'date' == sort: % if cur_segment != cur_ep_airdate: % if cur_ep_enddate < today and cur_ep_airdate != today.date() and not missed_header: - <br /><h2 class="day">Missed</h2> + <br><h2 class="day">Missed</h2> <% missed_header = True %> % elif cur_ep_airdate >= next_week.date() and not too_late_header: - <br /><h2 class="day">Later</h2> + <br><h2 class="day">Later</h2> <% too_late_header = True %> % elif cur_ep_enddate >= today and cur_ep_airdate < next_week.date(): % if cur_ep_airdate == today.date(): - <br /><h2 class="day">${datetime.date.fromordinal(cur_ep_airdate.toordinal()).strftime('%A').decode(sickbeard.SYS_ENCODING).capitalize()}<span style="font-size: 14px; vertical-align: top;">[Today]</span></h2> + <br><h2 class="day">${datetime.date.fromordinal(cur_ep_airdate.toordinal()).strftime('%A').decode(sickbeard.SYS_ENCODING).capitalize()}<span style="font-size: 14px; vertical-align: top;">[Today]</span></h2> <% today_header = True %> % else: - <br /><h2 class="day">${datetime.date.fromordinal(cur_ep_airdate.toordinal()).strftime('%A').decode(sickbeard.SYS_ENCODING).capitalize()}</h2> + <br><h2 class="day">${datetime.date.fromordinal(cur_ep_airdate.toordinal()).strftime('%A').decode(sickbeard.SYS_ENCODING).capitalize()}</h2> % endif % endif <% cur_segment = cur_ep_airdate %> @@ -256,7 +256,7 @@ % if cur_ep_airdate == today.date() and not today_header: <div> - <br /><h2 class="day">${datetime.date.fromordinal(cur_ep_airdate.toordinal()).strftime('%A').decode(sickbeard.SYS_ENCODING).capitalize()} <span style="font-size: 14px; vertical-align: top;">[Today]</span></h2> + <br><h2 class="day">${datetime.date.fromordinal(cur_ep_airdate.toordinal()).strftime('%A').decode(sickbeard.SYS_ENCODING).capitalize()} <span style="font-size: 14px; vertical-align: top;">[Today]</span></h2> <% today_header = True %> % endif diff --git a/gui/slick/views/testRename.mako b/gui/slick/views/testRename.mako index f7410d50049bb48c8330fefecf96f3d14c3c7d73..fb43c9d7739fca6e2f1b7ed003f864c79750af99 100644 --- a/gui/slick/views/testRename.mako +++ b/gui/slick/views/testRename.mako @@ -49,7 +49,7 @@ </thead> </table> -<br/> +<br> <input type="submit" value="Rename Selected" class="btn btn-success"> <a href="/home/displayShow?show=${show.indexerid}" class="btn btn-danger">Cancel Rename</a> <table id="testRenameTable" class="sickbeardTable" cellspacing="1" border="0" cellpadding="0"> @@ -64,7 +64,7 @@ <thead> <tr class="seasonheader" id="season-${cur_ep_obj.season}"> <td colspan="4"> - <br/> + <br> <h2>${('Season '+str(cur_ep_obj.season), 'Specials')[int(cur_ep_obj.season) == 0]}</h2> </td> </tr> @@ -98,6 +98,6 @@ if len(epList) > 1: </tbody> % endfor -</table><br /> +</table><br> <input type="submit" value="Rename Selected" class="btn btn-success"> <a href="/home/displayShow?show=${show.indexerid}" class="btn btn-danger">Cancel Rename</a> </%block> diff --git a/gui/slick/views/viewlogs.mako b/gui/slick/views/viewlogs.mako index c6c809cd8efcd6c9c8450b8f9f4c3dc97c03d6fa..cda4163c94dc5250995e434adcacc004f17de30c 100644 --- a/gui/slick/views/viewlogs.mako +++ b/gui/slick/views/viewlogs.mako @@ -33,10 +33,10 @@ Filter log by: <select name="logFilter" id="logFilter" class="form-control form- Search log by: <input type="text" name="logSearch" placeholder="clear to reset" id="logSearch" value="${('', logSearch)[bool(logSearch)]}" class="form-control form-control-inline input-sm" /> </div> -<br /> +<br> <div class="align-left"><pre> ${logLines} </pre> </div> -<br /> +<br> </%block> diff --git a/readme.md b/readme.md index 9e6029d1b1a7134a30880f32d2b839e0345f3226..f7e3af8a8663eceb055a9c17291c4a80d4a07891 100644 --- a/readme.md +++ b/readme.md @@ -41,7 +41,7 @@ Automatic Video Library Manager for TV Shows. It watches for new episodes of you ##### [Wiki](https://github.com/SiCKRAGETV/SickRage/wiki) #### Important -Before using this with your existing database (sickbeard.db) please make a backup copy of it and delete any other database files such as cache.db and failed.db if present<br/> +Before using this with your existing database (sickbeard.db) please make a backup copy of it and delete any other database files such as cache.db and failed.db if present<br> We HIGHLY recommend starting out with no database files at all to make this a fresh start but the choice is at your own risk #### Supported providers diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index a00506dddc229f7b8ccb82d15891ee44f48f44a5..bb15f56950b6d63dea742a771f7bb51ad180ea47 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -177,8 +177,8 @@ class BaseHandler(RequestHandler): elif self.settings.get("debug") and "exc_info" in kwargs: exc_info = kwargs["exc_info"] - trace_info = ''.join(["%s<br/>" % line for line in traceback.format_exception(*exc_info)]) - request_info = ''.join(["<strong>%s</strong>: %s<br/>" % (k, self.request.__dict__[k]) for k in + trace_info = ''.join(["%s<br>" % line for line in traceback.format_exception(*exc_info)]) + request_info = ''.join(["<strong>%s</strong>: %s<br>" % (k, self.request.__dict__[k]) for k in self.request.__dict__.keys()]) error = exc_info[1] @@ -874,7 +874,7 @@ class Home(WebRoot): finalResult += "Test KODI notice sent successfully to " + urllib.unquote_plus(curHost) else: finalResult += "Test KODI notice failed to " + urllib.unquote_plus(curHost) - finalResult += "<br />\n" + finalResult += "<br>\n" return finalResult @@ -891,7 +891,7 @@ class Home(WebRoot): finalResult += 'Successful test notice sent to Plex client ... ' + urllib.unquote_plus(curHost) else: finalResult += 'Test failed for Plex client ... ' + urllib.unquote_plus(curHost) - finalResult += '<br />' + '\n' + finalResult += '<br>' + '\n' ui.notifications.message('Tested Plex client(s): ', urllib.unquote_plus(host.replace(',', ', '))) @@ -912,7 +912,7 @@ class Home(WebRoot): finalResult += 'Test failed, No Plex Media Server host specified' else: finalResult += 'Test failed for Plex server(s) ... ' + urllib.unquote_plus(curResult.replace(',', ', ')) - finalResult += '<br />' + '\n' + finalResult += '<br>' + '\n' ui.notifications.message('Tested Plex Media Server host(s): ', urllib.unquote_plus(host.replace(',', ', '))) @@ -1309,7 +1309,7 @@ class Home(WebRoot): if season == -1: season = "*" out.append("S" + str(season) + ": " + ", ".join(names)) - return "<br/>".join(out) + return "<br>".join(out) def editShow(self, show=None, location=None, anyQualities=[], bestQualities=[], exceptions_list=[], flatten_folders=None, paused=None, directCall=False, air_by_date=None, sports=None, dvdorder=None, @@ -1748,7 +1748,7 @@ class Home(WebRoot): myDB.mass_action(sql_l) if int(status) == WANTED and not showObj.paused: - msg = "Backlog was automatically started for the following seasons of <b>" + showObj.name + "</b>:<br />" + msg = "Backlog was automatically started for the following seasons of <b>" + showObj.name + "</b>:<br>" msg += '<ul>' for season, segment in segments.iteritems(): @@ -1767,7 +1767,7 @@ class Home(WebRoot): logger.log(u"Some episodes were set to wanted, but " + showObj.name + " is paused. Not adding to Backlog until show is unpaused") if int(status) == FAILED: - msg = "Retrying Search was automatically started for the following season of <b>" + showObj.name + "</b>:<br />" + msg = "Retrying Search was automatically started for the following season of <b>" + showObj.name + "</b>:<br>" msg += '<ul>' for season, segment in segments.iteritems(): @@ -2200,7 +2200,7 @@ class HomePostProcess(Home): if quiet is not None and int(quiet) == 1: return result - result = result.replace("\n", "<br />\n") + result = result.replace("\n", "<br>\n") return self._genericMessage("Postprocessing results", result) @@ -3349,22 +3349,22 @@ class Manage(Home, WebRoot): messageDetail = "" if updates: - messageDetail += "<br /><b>Updates</b><br /><ul><li>" + messageDetail += "<br><b>Updates</b><br><ul><li>" messageDetail += "</li><li>".join(updates) messageDetail += "</li></ul>" if refreshes: - messageDetail += "<br /><b>Refreshes</b><br /><ul><li>" + messageDetail += "<br><b>Refreshes</b><br><ul><li>" messageDetail += "</li><li>".join(refreshes) messageDetail += "</li></ul>" if renames: - messageDetail += "<br /><b>Renames</b><br /><ul><li>" + messageDetail += "<br><b>Renames</b><br><ul><li>" messageDetail += "</li><li>".join(renames) messageDetail += "</li></ul>" if subtitles: - messageDetail += "<br /><b>Subtitles</b><br /><ul><li>" + messageDetail += "<br><b>Subtitles</b><br><ul><li>" messageDetail += "</li><li>".join(subtitles) messageDetail += "</li></ul>" @@ -3393,7 +3393,7 @@ class Manage(Home, WebRoot): if helpers.check_url(webui_url + 'download/'): webui_url += 'download/' else: - info_download_station = '<p>To have a better experience please set the Download Station alias as <code>download</code>, you can check this setting in the Synology DSM <b>Control Panel</b> > <b>Application Portal</b>. Make sure you allow DSM to be embedded with iFrames too in <b>Control Panel</b> > <b>DSM Settings</b> > <b>Security</b>.</p><br/><p>There is more information about this available <a href="https://github.com/midgetspy/Sick-Beard/pull/338">here</a>.</p><br/>' + info_download_station = '<p>To have a better experience please set the Download Station alias as <code>download</code>, you can check this setting in the Synology DSM <b>Control Panel</b> > <b>Application Portal</b>. Make sure you allow DSM to be embedded with iFrames too in <b>Control Panel</b> > <b>DSM Settings</b> > <b>Security</b>.</p><br><p>There is more information about this available <a href="https://github.com/midgetspy/Sick-Beard/pull/338">here</a>.</p><br>' if not sickbeard.TORRENT_PASSWORD == "" and not sickbeard.TORRENT_USERNAME == "": webui_url = re.sub('://', '://' + str(sickbeard.TORRENT_USERNAME) + ':' + str(sickbeard.TORRENT_PASSWORD) + '@', webui_url) @@ -3737,7 +3737,7 @@ class ConfigGeneral(Config): for x in results: logger.log(x, logger.ERROR) ui.notifications.error('Error(s) Saving Configuration', - '<br />\n'.join(results)) + '<br>\n'.join(results)) else: ui.notifications.message('Configuration Saved', ek(os.path.join, sickbeard.CONFIG_FILE)) @@ -3779,7 +3779,7 @@ class ConfigBackupRestore(Config): else: finalResult += "You need to choose a folder to save your backup to!" - finalResult += "<br />\n" + finalResult += "<br>\n" return finalResult @@ -3800,7 +3800,7 @@ class ConfigBackupRestore(Config): else: finalResult += "You need to select a backup file to restore!" - finalResult += "<br />\n" + finalResult += "<br>\n" return finalResult @@ -3900,7 +3900,7 @@ class ConfigSearch(Config): for x in results: logger.log(x, logger.ERROR) ui.notifications.error('Error(s) Saving Configuration', - '<br />\n'.join(results)) + '<br>\n'.join(results)) else: ui.notifications.message('Configuration Saved', ek(os.path.join, sickbeard.CONFIG_FILE)) @@ -4027,7 +4027,7 @@ class ConfigPostProcessing(Config): for x in results: logger.log(x, logger.WARNING) ui.notifications.error('Error(s) Saving Configuration', - '<br />\n'.join(results)) + '<br>\n'.join(results)) else: ui.notifications.message('Configuration Saved', ek(os.path.join, sickbeard.CONFIG_FILE)) @@ -4579,7 +4579,7 @@ class ConfigProviders(Config): for x in results: logger.log(x, logger.ERROR) ui.notifications.error('Error(s) Saving Configuration', - '<br />\n'.join(results)) + '<br>\n'.join(results)) else: ui.notifications.message('Configuration Saved', ek(os.path.join, sickbeard.CONFIG_FILE)) @@ -4811,7 +4811,7 @@ class ConfigNotifications(Config): for x in results: logger.log(x, logger.ERROR) ui.notifications.error('Error(s) Saving Configuration', - '<br />\n'.join(results)) + '<br>\n'.join(results)) else: ui.notifications.message('Configuration Saved', ek(os.path.join, sickbeard.CONFIG_FILE)) @@ -4871,7 +4871,7 @@ class ConfigSubtitles(Config): for x in results: logger.log(x, logger.ERROR) ui.notifications.error('Error(s) Saving Configuration', - '<br />\n'.join(results)) + '<br>\n'.join(results)) else: ui.notifications.message('Configuration Saved', ek(os.path.join, sickbeard.CONFIG_FILE)) @@ -4906,7 +4906,7 @@ class ConfigAnime(Config): for x in results: logger.log(x, logger.ERROR) ui.notifications.error('Error(s) Saving Configuration', - '<br />\n'.join(results)) + '<br>\n'.join(results)) else: ui.notifications.message('Configuration Saved', ek(os.path.join, sickbeard.CONFIG_FILE))