diff --git a/CHANGES.md b/CHANGES.md index 79b28bc5..02708a13 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,45 @@ +### 0.5.0 (2014-12-21 11:40:00 UTC) + +* Fix searches freezing due to unescaped ignored or required words +* Add failed database to unit tests tear down function +* Fix purging of database files in tear down function during unit tests +* Add ability to auto focus Search Show box on Home page and control this option via General Config/Interface +* Change some provider images. Add a few new images +* Remove redundant Coming Eps template code used in the old UI +* Change update Plex notifier (port from SickBeard) +* Change Plex notifications to allow authenticated library updates (port from mmccurdy07/Sick-Beard) +* Change Config/Notifications/Plex logo and description (adapted port from mmccurdy07/Sick-Beard) +* Add ability for CSS/JS to target a specific page and layout +* Remove legacy sickbeard updater and build automation code +* Fix multiple instances of SG being able to start +* Fix garbled text appearing during startup in console +* Fix startup code order and general re-factoring (adapted from midgetspy/Sick-Beard) +* Add database migration code +* Change KickassTorrents provider URLs +* Fix missing Content-Type headers for posters and banners +* Remove config Backup & Restore +* Fix article removal for sorting on Display Show, and API pages +* Fix visual positioning of sprites on Config page +* Fix missing navbar gradients for all browsers +* Update qTip2 to v2.2.1 +* Overhaul all Add Show pages +* Fix Display Show next/previous when show list is split +* Change Display Show next/previous when show list is not split to loop around +* Fix SQL statements that have dynamic table names to use proper syntax +* Fix port checking code preventing startup directly after a SG restart +* Add a link from the footer number of snatched to episode snatched overview page. The link to the + Episode Overview page is available on all pages except on the Episode Overview page +* Change the default state for all check boxes on the Episode Overview page to not checked +* Add validation to Go button to ensure at least one item is checked on Episode Overview page +* Add highlight to current status text in header on Episode Overview page +* Fix table alignment on homepage +* Fix duplicate entries in cache database +* Fix network sorting on home page +* Fix restart issue +* Fix to use new TorrentDay URLs +* Fix typo in menu item Manage/Update XBMC + + ### 0.4.0 (2014-12-04 10:50:00 UTC) * Change footer stats to not add newlines when copy/pasting from them diff --git a/SickBeard.py b/SickBeard.py index 96c87f25..d9522c57 100755 --- a/SickBeard.py +++ b/SickBeard.py @@ -226,13 +226,13 @@ class SickGear(object): if self.runAsDaemon: pid_dir = os.path.dirname(self.PIDFILE) if not os.access(pid_dir, os.F_OK): - sys.exit("PID dir: " + pid_dir + " doesn't exist. Exiting.") + sys.exit(u"PID dir: %s doesn't exist. Exiting." % pid_dir) if not os.access(pid_dir, os.W_OK): - sys.exit("PID dir: " + pid_dir + " must be writable (write permissions). Exiting.") + sys.exit(u'PID dir: %s must be writable (write permissions). Exiting.' % pid_dir) else: if self.consoleLogging: - sys.stdout.write("Not running in daemon mode. PID file creation disabled.\n") + print u'Not running in daemon mode. PID file creation disabled' self.CREATEPID = False @@ -244,34 +244,28 @@ class SickGear(object): if not os.access(sickbeard.DATA_DIR, os.F_OK): try: os.makedirs(sickbeard.DATA_DIR, 0744) - except os.error, e: - raise SystemExit("Unable to create datadir '" + sickbeard.DATA_DIR + "'") + except os.error: + sys.exit(u'Unable to create data directory: %s + Exiting.' % sickbeard.DATA_DIR) # Make sure we can write to the data dir if not os.access(sickbeard.DATA_DIR, os.W_OK): - raise SystemExit("Datadir must be writeable '" + sickbeard.DATA_DIR + "'") + sys.exit(u'Data directory: %s must be writable (write permissions). Exiting.' % sickbeard.DATA_DIR) # Make sure we can write to the config file if not os.access(sickbeard.CONFIG_FILE, os.W_OK): if os.path.isfile(sickbeard.CONFIG_FILE): - raise SystemExit("Config file '" + sickbeard.CONFIG_FILE + "' must be writeable.") + sys.exit(u'Config file: %s must be writeable (write permissions). Exiting.' % sickbeard.CONFIG_FILE) elif not os.access(os.path.dirname(sickbeard.CONFIG_FILE), os.W_OK): - raise SystemExit( - "Config file root dir '" + os.path.dirname(sickbeard.CONFIG_FILE) + "' must be writeable.") - - # Check if we need to perform a restore first - restoreDir = os.path.join(sickbeard.DATA_DIR, 'restore') - if os.path.exists(restoreDir): - if self.restore(restoreDir, sickbeard.DATA_DIR): - logger.log(u"Restore successful...") - else: - logger.log(u"Restore FAILED!", logger.ERROR) - + sys.exit(u'Config file directory: %s must be writeable (write permissions). Exiting' + % os.path.dirname(sickbeard.CONFIG_FILE)) os.chdir(sickbeard.DATA_DIR) + if self.consoleLogging: + print u'Starting up SickGear from %s' % sickbeard.CONFIG_FILE + # Load the config and publish it to the sickbeard package if not os.path.isfile(sickbeard.CONFIG_FILE): - logger.log(u"Unable to find '" + sickbeard.CONFIG_FILE + "' , all settings will be default!", logger.ERROR) + print u'Unable to find "%s", all settings will be default!' % sickbeard.CONFIG_FILE sickbeard.CFG = ConfigObj(sickbeard.CONFIG_FILE) @@ -279,15 +273,13 @@ class SickGear(object): if CUR_DB_VERSION > 0: if CUR_DB_VERSION < MIN_DB_VERSION: - raise SystemExit("Your database version (" + str( - CUR_DB_VERSION) + ") is too old to migrate from with this version of SickGear (" + str( - MIN_DB_VERSION) + ").\n" + \ - "Upgrade using a previous version of SB first, or start with no database file to begin fresh.") + print u'Your database version (%s) is too old to migrate from with this version of SickGear' \ + % CUR_DB_VERSION + sys.exit(u'Upgrade using a previous version of SG first, or start with no database file to begin fresh') if CUR_DB_VERSION > MAX_DB_VERSION: - raise SystemExit("Your database version (" + str( - CUR_DB_VERSION) + ") has been incremented past what this version of SickGear supports (" + str( - MAX_DB_VERSION) + ").\n" + \ - "If you have used other forks of SB, your database may be unusable due to their modifications.") + print u'Your database version (%s) has been incremented past what this version of SickGear supports' \ + % CUR_DB_VERSION + sys.exit(u'If you have used other forks of SB, your database may be unusable due to their modifications') # Initialize the config and our threads sickbeard.initialize(consoleLogging=self.consoleLogging) @@ -298,9 +290,6 @@ class SickGear(object): # Get PID sickbeard.PID = os.getpid() - # Build from the DB to start with - self.loadShowsFromDB() - if self.forcedPort: logger.log(u"Forcing web server to port " + str(self.forcedPort)) self.startPort = self.forcedPort @@ -339,9 +328,12 @@ class SickGear(object): # start web server try: + # used to check if existing SG instances have been started + sickbeard.helpers.wait_for_free_port(self.web_options['host'], self.web_options['port']) + self.webserver = WebServer(self.web_options) self.webserver.start() - except IOError: + except Exception: logger.log(u"Unable to start web server, is something else running on port %d?" % self.startPort, logger.ERROR) if sickbeard.LAUNCH_BROWSER and not self.runAsDaemon: @@ -349,8 +341,16 @@ class SickGear(object): sickbeard.launchBrowser(self.startPort) os._exit(1) - if self.consoleLogging: - print "Starting up SickGear " + sickbeard.BRANCH + " from " + sickbeard.CONFIG_FILE + # Check if we need to perform a restore first + restoreDir = os.path.join(sickbeard.DATA_DIR, 'restore') + if os.path.exists(restoreDir): + if self.restore(restoreDir, sickbeard.DATA_DIR): + logger.log(u"Restore successful...") + else: + logger.log_error_and_exit(u"Restore FAILED!", logger.ERROR) + + # Build from the DB to start with + self.loadShowsFromDB() # Fire up all our threads sickbeard.start() @@ -503,17 +503,6 @@ class SickGear(object): if install_type in ('git', 'source'): popen_list = [sys.executable, sickbeard.MY_FULLNAME] - elif install_type == 'win': - if hasattr(sys, 'frozen'): - # c:\dir\to\updater.exe 12345 c:\dir\to\sickbeard.exe - popen_list = [os.path.join(sickbeard.PROG_DIR, 'updater.exe'), str(sickbeard.PID), - sys.executable] - else: - logger.log(u"Unknown SB launch method, please file a bug report about this", logger.ERROR) - popen_list = [sys.executable, os.path.join(sickbeard.PROG_DIR, 'updater.py'), - str(sickbeard.PID), - sys.executable, - sickbeard.MY_FULLNAME] if popen_list: popen_list += sickbeard.MY_ARGS diff --git a/TODO.txt b/TODO.txt deleted file mode 100644 index ba720e0e..00000000 --- a/TODO.txt +++ /dev/null @@ -1,24 +0,0 @@ -2014-10-02 --Move the sql from the *.tmpl files --Add anidb indexer --Add supplemental data from anidb during postprocessing --Fix grabbing non-propers as propers for certain air-by-date shows --Add prefer torrents/usenet and allow custom delay between grabs from torrents/usenet --Better postprocessing handling for torrents - -2014-10-07 --Add release groups/require words/ignore words to add show page --Add 'add show and add another show' button to add show page --Change the hardcoded global ignore words to optional - -2014-10-08 --Add login page for http auth as opposed to browser dialog box - -2014-10-13 --Fix broken backlog --Fix season searches - -2014-10-21 --Remove qtip from config providers and go back to tab --Find out why superfish & supersubs js breaks provider sorting --Ability to save poster sorting and asc/desc in config diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index d72fb0cf..b78b3bc9 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -171,11 +171,6 @@ inc_top.tmpl background: url("../images/ico/favicon-16x16.png") 0 0 no-repeat; } -[class^="icon16-"], -[class*=" icon16-"] { - background-image: url("../images/glyphicons-config.png"); -} - .ui-autocomplete-loading { background: white url("../images/loading16.gif") right center no-repeat; } @@ -538,10 +533,6 @@ home.tmpl margin-right: 5px; } -.search { - margin-bottom: 10px; -} - .ui-progressbar { height: 20px; line-height: 18px; @@ -782,122 +773,38 @@ td.tvShow a:hover { /* ======================================================================= home_addShows.tmpl ========================================================================== */ - -#addShowPortal { - width: 700px; - padding: 10px 0; - margin-right: auto; - margin-left: auto; -} - -#addShowPortal a { - padding: 10px; -} - -div.button { - display: table-cell; - vertical-align: middle; - padding-left: 10px; -} - -div.buttontext { - display: table-cell; - padding-left: 20px; - text-align: left; - white-space: normal; -} - -div.buttontext h3 { - margin-top: 10px; -} - -div.buttontext p { - font-size: 13px; -} - .icon-addnewshow { background-image: url("../images/addshows/add-new32-white.png"); - width: 32px; - height: 32px; } .icon-addtrendingshow { background-image: url("../images/addshows/add-trending32-white.png"); - width: 32px; - height: 32px; } .icon-addrecommendedshow { background-image: url("../images/addshows/add-trakt32-white.png"); - width: 32px; - height: 32px; } .icon-addexistingshow { background-image: url("../images/addshows/add-existing32-white.png"); - width: 32px; - height: 32px; } /* ======================================================================= home_newShow.tmpl ========================================================================== */ -#addShowForm, #recommendedShowsForm { - margin-left: auto; - margin-right: auto; -} - -#newShowPortal { - width: 800px; - padding: 10px 0; - margin-right: auto; - margin-left: auto; -} - #displayText { - padding: 8px; - overflow: hidden; - font-size: 14px; - background-color: #3d3d3d; - border: 1px solid #111; -} - -#searchResults input[type="radio"] { - vertical-align: -2px; + background-color: rgb(17, 120, 179); + border: 0; } /* ======================================================================= home_addExistingShow.tmpl ========================================================================== */ -.existingtabs { - padding: 1em 1.4em; -} - -ul#rootDirStaticList { - width: 90%; - margin-right: auto; - margin-left: auto; - text-align: left; -} - ul#rootDirStaticList li { - padding: 4px 5px 4px 5px; - margin: 2px; - list-style: none outside none; - cursor: pointer; background: #3d3d3d; } -ul#rootDirStaticList li label { - margin-top: 5px; - margin-bottom: 5px; -} - -ul#rootDirStaticList li input[type="checkbox"] { - vertical-align: -2px; -} - /* ======================================================================= home_trendingShows.tmpl ========================================================================== */ @@ -1541,32 +1448,6 @@ select .selected { border-top: 1px dotted #666666; } -[class^="icon16-"], [class*=" icon16-"] { - background-image: url("../images/glyphicons-config.png"); - background-repeat: no-repeat; - display: inline-block; - height: 16px; - vertical-align: text-top; - width: 16px; - margin-top: 1px; -} - -.icon16-github { - background-position: 0 0; -} -.icon16-mirc { - background-position: -26px 0; -} -.icon16-sg { - background-position: -52px 0; -} -.icon16-web { - background-position: -78px 0; -} -.icon16-win { - background-position: -104px 0; -} - /* ======================================================================= config_postProcessing.tmpl ========================================================================== */ @@ -1869,11 +1750,6 @@ body { background-color: #222; } -html * { - outline: 0 !important; -} - - input[type="radio"] { margin: 2px 0px 0px; line-height: normal; @@ -1897,8 +1773,12 @@ input, textarea, select, .uneditable-input { .navbar-default { background-color: #15528F; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#297AB8', endColorstr='#15528F'); - background: -webkit-gradient(linear, left top, left bottom, from(#297AB8), to(#15528F)); - background: -moz-linear-gradient(top, #297AB8, #15528F); + background-image: -ms-linear-gradient(top, #297AB8 0%, #15528F 100%); + background-image: -moz-linear-gradient(top, #297AB8 0%, #15528F 100%); + background-image: -o-linear-gradient(top, #297AB8 0%, #15528F 100%); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #297AB8), color-stop(1, #15528F)); + background-image: -webkit-linear-gradient(top, #297AB8 0%, #15528F 100%); + background-image: linear-gradient(to bottom, #297AB8 0%, #15528F 100%); border-color: #3e3f3a; } @@ -2033,12 +1913,6 @@ fieldset[disabled] .navbar-default .btn-link:focus { color: #000000; } -.form-control-inline { - min-width: 0; - width: auto; - display: inline; -} - .btn { color: #fff; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.75); @@ -2083,7 +1957,6 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn:hover { color: #fff; - text-decoration: none; background-color: #2672B6; *background-color: #2672B6; background-position: 0 -150px; @@ -2116,8 +1989,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #15528F; - background-image: none; + background: #15528F none; opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; @@ -2125,19 +1997,6 @@ fieldset[disabled] .navbar-default .btn-link:focus { box-shadow: none; } -.btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.btn-large [class^="icon-"] { - margin-top: 1px; -} - .btn-small { padding: 5px 9px; font-size: 11px; @@ -2397,60 +2256,16 @@ pre { /* ======================================================================= input sizing (for config pages) ========================================================================== */ +#pickShow optgroup, #editAProvider optgroup { color: #eee; - background-color: rgb(51, 51, 51); + background-color: rgb(51, 51, 51); } +#pickShow optgroup option, #editAProvider optgroup option { color: #222; - background-color: #fff; -} - -#config select { - min-width: 0; - width: auto; - display: inline; - margin-top: -4px; -} - -.btn-inline { - margin-top: -3px; -} - -.input75 { - width: 75px; - margin-top: -4px; -} - -.input100 { - width: 100px; - margin-top: -4px; -} - -.input150 { - width: 150px; - margin-top: -4px; -} - -.input200 { - width: 200px; - margin-top: -4px; -} - -.input250 { - width: 250px; - margin-top: -4px; -} - -.input300 { - width: 300px; - margin-top: -4px; -} - -.input350 { - width: 350px; - margin-top: -4px; + background-color: #fff; } /* ======================================================================= @@ -2529,92 +2344,31 @@ browser.css /* ======================================================================= -formWizard.css +formWizard ========================================================================== */ - -fieldset.sectionwrap { - width: 800px; - padding: 5px; - text-align: left; - border-width: 0; -} - +.step, legend.legendStep { color: #ffffff; - margin-bottom: 0px; -} - -div.stepsguide { - margin-bottom: 15px; - overflow: hidden; - text-align: left; - cursor: pointer; -} - -div.stepsguide .step { - float: left; - width: 266px; - font: bold 24px Arial; } div.stepsguide .step p { - margin: 12px 0; - border-bottom: 4px solid #23AFDC; + border-color: #23AFDC; } -div.stepsguide .disabledstep { - color: #c4c4c4; +.disabledstep { + color: #646464; } div.stepsguide .disabledstep p { - border-bottom: 4px solid #1178B3; -} - -div.stepsguide .step .smalltext { - font-size: 13px; - font-weight: normal; -} - -div.formpaginate { - width: 800px; - margin-top: 1em; - overflow: auto; - font-weight: bold; - text-align: center; + border-color: #1178B3; } div.formpaginate .prev, div.formpaginate .next { - padding: 3px 6px; color: #fff; - cursor: hand; - cursor: pointer; background: #2265A1; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; } -.stepDiv { - padding: 15px; -} - -/* step 3 related */ -#customQuality { - display: block; - padding: 10px 0; - overflow: hidden; - clear: both; -} - -#customQualityWrapper div.component-group-desc { - float: left; - width: 165px; -} - #customQualityWrapper div.component-group-desc p { - width: 85%; - margin: .8em 0; - font-size: 1.2em; color: #666; } @@ -2660,10 +2414,7 @@ tablesorter.css .tablesorter th, .tablesorter td { - padding: 4px; - border-top: #222 1px solid; - border-left: #222 1px solid; - vertical-align: middle; + border-color: #222; } /* remove extra border from left edge */ @@ -2674,31 +2425,22 @@ tablesorter.css .tablesorter th { color: #fff; - text-align: center; text-shadow: -1px -1px 0 rgba(0,0,0,0.3); background-color: #15528F; - border-collapse: collapse; - font-weight: normal; } .tablesorter .tablesorter-header { - padding: 4px 18px 4px 18px; - cursor: pointer; - background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==); - background-position: center right; - background-repeat: no-repeat; + background: #15528F url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==) no-repeat center right; /* background-image: url(../images/tablesorter/bg.gif); */ } .tablesorter thead .tablesorter-headerDesc { - background-color: #297AB8; - background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7); + background: #297AB8 url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7) no-repeat center right; /* background-image: url(../images/tablesorter/asc.gif); */ } .tablesorter thead .tablesorter-headerAsc { - background-color: #297AB8; - background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7); + background: #297AB8 url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7) no-repeat center right; /* background-image: url(../images/tablesorter/desc.gif); */ } @@ -2761,10 +2503,9 @@ thead.tablesorter-stickyHeader { .tablesorter tfoot a { color:#fff; - text-decoration: none; } -#showListTable tbody { +#showListTable tbody { color: #000; } @@ -2903,6 +2644,25 @@ span.token-input-delete-token { margin: 0 1px; } +.step-one #searchResults .alt { + background-color: rgb(40, 40, 40); +} + +#addRootDirTable td label .filepath, +.grey-text { + color:#999 +} + +#newShowPortal #displayText .show-name, +#newShowPortal #displayText .show-dest, +#newShowPortal #displayText p { + color: rgb(200, 200, 200) +} + +#newShowPortal #displayText .show-name, +#newShowPortal #displayText .show-dest { + color: rgb(255, 255, 255) +} /* ======================================================================= jquery.confirm.css ========================================================================== */ diff --git a/gui/slick/css/lib/jquery.qtip-2.0.1.min.css b/gui/slick/css/lib/jquery.qtip-2.0.1.min.css deleted file mode 100644 index 584c0719..00000000 --- a/gui/slick/css/lib/jquery.qtip-2.0.1.min.css +++ /dev/null @@ -1 +0,0 @@ -/*! qTip2 v2.0.1 (includes: svg ajax tips modal viewport imagemap ie6 / basic css3) | qtip2.com | Licensed MIT, GPL | Mon Dec 31 2012 14:55:17 */.qtip,.qtip{position:absolute;left:-28000px;top:-28000px;display:none;max-width:600px;min-width:50px;font-size:10.5px;line-height:12px;direction:ltr}.qtip-content{position:relative;padding:5px 9px;overflow:hidden;text-align:left;word-wrap:break-word}.qtip-titlebar{position:relative;padding:5px 35px 5px 10px;overflow:hidden;border-width:0 0 1px;font-weight:700}.qtip-titlebar+.qtip-content{border-top-width:0!important}.qtip-close{position:absolute;right:-9px;top:-9px;cursor:pointer;outline:medium none;border-width:1px;border-style:solid;border-color:transparent}.qtip-titlebar .qtip-close{right:4px;top:50%;margin-top:-9px}* html .qtip-titlebar .qtip-close{top:16px}.qtip-titlebar .ui-icon,.qtip-icon .ui-icon{display:block;text-indent:-1000em;direction:ltr;vertical-align:middle}.qtip-icon,.qtip-icon .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;text-decoration:none}.qtip-icon .ui-icon{width:18px;height:14px;text-align:center;text-indent:0;font:normal bold 10px/13px Tahoma,sans-serif;color:inherit;background:transparent none no-repeat -100em -100em}.qtip-focus{}.qtip-hover{}.qtip-default{border-width:1px;border-style:solid;border-color:#F1D031;background-color:#FFFFA3;color:#555}.qtip-default .qtip-titlebar{background-color:#FFEF93}.qtip-default .qtip-icon{border-color:#CCC;background:#F1F1F1;color:#777}.qtip-default .qtip-titlebar .qtip-close{border-color:#AAA;color:#111}/*! Light tooltip style */.qtip-light{background-color:#fff;border-color:#E2E2E2;color:#454545}.qtip-light .qtip-titlebar{background-color:#f1f1f1}/*! Dark tooltip style */.qtip-dark{background-color:#505050;border-color:#303030;color:#f3f3f3}.qtip-dark .qtip-titlebar{background-color:#404040}.qtip-dark .qtip-icon{border-color:#444}.qtip-dark .qtip-titlebar .ui-state-hover{border-color:#303030}/*! Cream tooltip style */.qtip-cream{background-color:#FBF7AA;border-color:#F9E98E;color:#A27D35}.qtip-cream .qtip-titlebar{background-color:#F0DE7D}.qtip-cream .qtip-close .qtip-icon{background-position:-82px 0}/*! Red tooltip style */.qtip-red{background-color:#F78B83;border-color:#D95252;color:#912323}.qtip-red .qtip-titlebar{background-color:#F06D65}.qtip-red .qtip-close .qtip-icon{background-position:-102px 0}.qtip-red .qtip-icon{border-color:#D95252}.qtip-red .qtip-titlebar .ui-state-hover{border-color:#D95252}/*! Green tooltip style */.qtip-green{background-color:#CAED9E;border-color:#90D93F;color:#3F6219}.qtip-green .qtip-titlebar{background-color:#B0DE78}.qtip-green .qtip-close .qtip-icon{background-position:-42px 0}/*! Blue tooltip style */.qtip-blue{background-color:#E5F6FE;border-color:#ADD9ED;color:#5E99BD}.qtip-blue .qtip-titlebar{background-color:#D0E9F5}.qtip-blue .qtip-close .qtip-icon{background-position:-2px 0}.qtip-shadow{-webkit-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);-moz-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);box-shadow:1px 1px 3px 1px rgba(0,0,0,.15)}.qtip-rounded,.qtip-tipsy,.qtip-bootstrap{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.qtip-youtube{-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 3px #333;-moz-box-shadow:0 0 3px #333;box-shadow:0 0 3px #333;color:#fff;border-width:0;background:#4A4A4A;background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#4A4A4A),color-stop(100%,black));background-image:-webkit-linear-gradient(top,#4A4A4A 0,black 100%);background-image:-moz-linear-gradient(top,#4A4A4A 0,black 100%);background-image:-ms-linear-gradient(top,#4A4A4A 0,black 100%);background-image:-o-linear-gradient(top,#4A4A4A 0,black 100%)}.qtip-youtube .qtip-titlebar{background-color:#4A4A4A;background-color:rgba(0,0,0,0)}.qtip-youtube .qtip-content{padding:.75em;font:12px arial,sans-serif;filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr=#4a4a4a, EndColorStr=#000000);-ms-filter:"progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr=#4a4a4a, EndColorStr=#000000);"}.qtip-youtube .qtip-icon{border-color:#222}.qtip-youtube .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-jtools{background:#232323;background:rgba(0,0,0,.7);background-image:-webkit-gradient(linear,left top,left bottom,from(#717171),to(#232323));background-image:-moz-linear-gradient(top,#717171,#232323);background-image:-webkit-linear-gradient(top,#717171,#232323);background-image:-ms-linear-gradient(top,#717171,#232323);background-image:-o-linear-gradient(top,#717171,#232323);border:2px solid #ddd;border:2px solid rgba(241,241,241,1);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 12px #333;-moz-box-shadow:0 0 12px #333;box-shadow:0 0 12px #333}.qtip-jtools .qtip-titlebar{background-color:transparent;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171, endColorstr=#4A4A4A);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171, endColorstr=#4A4A4A)"}.qtip-jtools .qtip-content{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A, endColorstr=#232323);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A, endColorstr=#232323)"}.qtip-jtools .qtip-titlebar,.qtip-jtools .qtip-content{background:transparent;color:#fff;border:0 dashed transparent}.qtip-jtools .qtip-icon{border-color:#555}.qtip-jtools .qtip-titlebar .ui-state-hover{border-color:#333}.qtip-cluetip{-webkit-box-shadow:4px 4px 5px rgba(0,0,0,.4);-moz-box-shadow:4px 4px 5px rgba(0,0,0,.4);box-shadow:4px 4px 5px rgba(0,0,0,.4);background-color:#D9D9C2;color:#111;border:0 dashed transparent}.qtip-cluetip .qtip-titlebar{background-color:#87876A;color:#fff;border:0 dashed transparent}.qtip-cluetip .qtip-icon{border-color:#808064}.qtip-cluetip .qtip-titlebar .ui-state-hover{border-color:#696952;color:#696952}.qtip-tipsy{background:#000;background:rgba(0,0,0,.87);color:#fff;border:0 solid transparent;font-size:11px;font-family:'Lucida Grande',sans-serif;font-weight:700;line-height:16px;text-shadow:0 1px black}.qtip-tipsy .qtip-titlebar{padding:6px 35px 0 10;background-color:transparent}.qtip-tipsy .qtip-content{padding:6px 10}.qtip-tipsy .qtip-icon{border-color:#222;text-shadow:none}.qtip-tipsy .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-tipped{border:3px solid #959FA9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-color:#F9F9F9;color:#454545;font-weight:400;font-family:serif}.qtip-tipped .qtip-titlebar{border-bottom-width:0;color:#fff;background:#3A79B8;background-image:-webkit-gradient(linear,left top,left bottom,from(#3A79B8),to(#2E629D));background-image:-webkit-linear-gradient(top,#3A79B8,#2E629D);background-image:-moz-linear-gradient(top,#3A79B8,#2E629D);background-image:-ms-linear-gradient(top,#3A79B8,#2E629D);background-image:-o-linear-gradient(top,#3A79B8,#2E629D);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8, endColorstr=#2E629D);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8, endColorstr=#2E629D)"}.qtip-tipped .qtip-icon{border:2px solid #285589;background:#285589}.qtip-tipped .qtip-icon .ui-icon{background-color:#FBFBFB;color:#555}.qtip-bootstrap{font-size:14px;line-height:20px;color:#333;padding:1px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.qtip-bootstrap .qtip-titlebar{padding:8px 14px;margin:0;font-size:14px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.qtip-bootstrap .qtip-titlebar .qtip-close{right:11px;top:45%;border-style:none}.qtip-bootstrap .qtip-content{padding:9px 14px}.qtip-bootstrap .qtip-icon{background:transparent}.qtip-bootstrap .qtip-icon .ui-icon{width:auto;height:auto;float:right;font-size:20px;font-weight:700;line-height:18px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.qtip-bootstrap .qtip-icon .ui-icon:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}.qtip:not(.ie9haxors) div.qtip-content,.qtip:not(.ie9haxors) div.qtip-titlebar{filter:none;-ms-filter:none}.qtip .qtip-tip{margin:0 auto;overflow:hidden;z-index:10}.qtip .qtip-tip,.qtip .qtip-tip .qtip-vml{position:absolute;color:#123456;background:transparent;border:0 dashed transparent}.qtip .qtip-tip canvas{top:0;left:0}.qtip .qtip-tip .qtip-vml{behavior:url(#default#VML);display:inline-block;visibility:visible}#qtip-overlay{position:fixed;left:-10000em;top:-10000em}#qtip-overlay.blurs{cursor:pointer}#qtip-overlay div{position:absolute;left:0;top:0;width:100%;height:100%;background-color:#000;opacity:.7;filter:alpha(opacity=70);-ms-filter:"alpha(Opacity=70)"}.qtipmodal-ie6fix{position:absolute!important} \ No newline at end of file diff --git a/gui/slick/css/lib/jquery.qtip-2.2.1.min.css b/gui/slick/css/lib/jquery.qtip-2.2.1.min.css new file mode 100644 index 00000000..ac501ed1 --- /dev/null +++ b/gui/slick/css/lib/jquery.qtip-2.2.1.min.css @@ -0,0 +1,3 @@ +/* qTip2 v2.2.1 | Plugins: tips viewport imagemap svg modal ie6 | Styles: core basic css3 | qtip2.com | Licensed MIT | Sat Sep 06 2014 18:25:07 */ + +.qtip{position:absolute;left:-28000px;top:-28000px;display:none;max-width:280px;min-width:50px;font-size:10.5px;line-height:12px;direction:ltr;box-shadow:none;padding:0}.qtip-content{position:relative;padding:5px 9px;overflow:hidden;text-align:left;word-wrap:break-word}.qtip-titlebar{position:relative;padding:5px 35px 5px 10px;overflow:hidden;border-width:0 0 1px;font-weight:700}.qtip-titlebar+.qtip-content{border-top-width:0!important}.qtip-close{position:absolute;right:-9px;top:-9px;z-index:11;cursor:pointer;outline:medium none;border:1px solid transparent}.qtip-titlebar .qtip-close{right:4px;top:50%;margin-top:-9px}* html .qtip-titlebar .qtip-close{top:16px}.qtip-titlebar .ui-icon,.qtip-icon .ui-icon{display:block;text-indent:-1000em;direction:ltr}.qtip-icon,.qtip-icon .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;text-decoration:none}.qtip-icon .ui-icon{width:18px;height:14px;line-height:14px;text-align:center;text-indent:0;font:400 bold 10px/13px Tahoma,sans-serif;color:inherit;background:transparent none no-repeat -100em -100em}.qtip-focus{}.qtip-hover{}.qtip-default{border:1px solid #F1D031;background-color:#FFFFA3;color:#555}.qtip-default .qtip-titlebar{background-color:#FFEF93}.qtip-default .qtip-icon{border-color:#CCC;background:#F1F1F1;color:#777}.qtip-default .qtip-titlebar .qtip-close{border-color:#AAA;color:#111} .qtip-light{background-color:#fff;border-color:#E2E2E2;color:#454545}.qtip-light .qtip-titlebar{background-color:#f1f1f1} .qtip-dark{background-color:#505050;border-color:#303030;color:#f3f3f3}.qtip-dark .qtip-titlebar{background-color:#404040}.qtip-dark .qtip-icon{border-color:#444}.qtip-dark .qtip-titlebar .ui-state-hover{border-color:#303030} .qtip-cream{background-color:#FBF7AA;border-color:#F9E98E;color:#A27D35}.qtip-cream .qtip-titlebar{background-color:#F0DE7D}.qtip-cream .qtip-close .qtip-icon{background-position:-82px 0} .qtip-red{background-color:#F78B83;border-color:#D95252;color:#912323}.qtip-red .qtip-titlebar{background-color:#F06D65}.qtip-red .qtip-close .qtip-icon{background-position:-102px 0}.qtip-red .qtip-icon{border-color:#D95252}.qtip-red .qtip-titlebar .ui-state-hover{border-color:#D95252} .qtip-green{background-color:#CAED9E;border-color:#90D93F;color:#3F6219}.qtip-green .qtip-titlebar{background-color:#B0DE78}.qtip-green .qtip-close .qtip-icon{background-position:-42px 0} .qtip-blue{background-color:#E5F6FE;border-color:#ADD9ED;color:#5E99BD}.qtip-blue .qtip-titlebar{background-color:#D0E9F5}.qtip-blue .qtip-close .qtip-icon{background-position:-2px 0}.qtip-shadow{-webkit-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);-moz-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);box-shadow:1px 1px 3px 1px rgba(0,0,0,.15)}.qtip-rounded,.qtip-tipsy,.qtip-bootstrap{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.qtip-rounded .qtip-titlebar{-moz-border-radius:4px 4px 0 0;-webkit-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.qtip-youtube{-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 3px #333;-moz-box-shadow:0 0 3px #333;box-shadow:0 0 3px #333;color:#fff;border:0 solid transparent;background:#4A4A4A;background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#4A4A4A),color-stop(100%,#000));background-image:-webkit-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-moz-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-ms-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-o-linear-gradient(top,#4A4A4A 0,#000 100%)}.qtip-youtube .qtip-titlebar{background-color:#4A4A4A;background-color:rgba(0,0,0,0)}.qtip-youtube .qtip-content{padding:.75em;font:12px arial,sans-serif;filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr=#4a4a4a, EndColorStr=#000000);-ms-filter:"progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr=#4a4a4a, EndColorStr=#000000);"}.qtip-youtube .qtip-icon{border-color:#222}.qtip-youtube .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-jtools{background:#232323;background:rgba(0,0,0,.7);background-image:-webkit-gradient(linear,left top,left bottom,from(#717171),to(#232323));background-image:-moz-linear-gradient(top,#717171,#232323);background-image:-webkit-linear-gradient(top,#717171,#232323);background-image:-ms-linear-gradient(top,#717171,#232323);background-image:-o-linear-gradient(top,#717171,#232323);border:2px solid #ddd;border:2px solid rgba(241,241,241,1);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 12px #333;-moz-box-shadow:0 0 12px #333;box-shadow:0 0 12px #333}.qtip-jtools .qtip-titlebar{background-color:transparent;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171, endColorstr=#4A4A4A);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171, endColorstr=#4A4A4A)"}.qtip-jtools .qtip-content{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A, endColorstr=#232323);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A, endColorstr=#232323)"}.qtip-jtools .qtip-titlebar,.qtip-jtools .qtip-content{background:transparent;color:#fff;border:0 dashed transparent}.qtip-jtools .qtip-icon{border-color:#555}.qtip-jtools .qtip-titlebar .ui-state-hover{border-color:#333}.qtip-cluetip{-webkit-box-shadow:4px 4px 5px rgba(0,0,0,.4);-moz-box-shadow:4px 4px 5px rgba(0,0,0,.4);box-shadow:4px 4px 5px rgba(0,0,0,.4);background-color:#D9D9C2;color:#111;border:0 dashed transparent}.qtip-cluetip .qtip-titlebar{background-color:#87876A;color:#fff;border:0 dashed transparent}.qtip-cluetip .qtip-icon{border-color:#808064}.qtip-cluetip .qtip-titlebar .ui-state-hover{border-color:#696952;color:#696952}.qtip-tipsy{background:#000;background:rgba(0,0,0,.87);color:#fff;border:0 solid transparent;font-size:11px;font-family:'Lucida Grande',sans-serif;font-weight:700;line-height:16px;text-shadow:0 1px #000}.qtip-tipsy .qtip-titlebar{padding:6px 35px 0 10px;background-color:transparent}.qtip-tipsy .qtip-content{padding:6px 10px}.qtip-tipsy .qtip-icon{border-color:#222;text-shadow:none}.qtip-tipsy .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-tipped{border:3px solid #959FA9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-color:#F9F9F9;color:#454545;font-weight:400;font-family:serif}.qtip-tipped .qtip-titlebar{border-bottom-width:0;color:#fff;background:#3A79B8;background-image:-webkit-gradient(linear,left top,left bottom,from(#3A79B8),to(#2E629D));background-image:-webkit-linear-gradient(top,#3A79B8,#2E629D);background-image:-moz-linear-gradient(top,#3A79B8,#2E629D);background-image:-ms-linear-gradient(top,#3A79B8,#2E629D);background-image:-o-linear-gradient(top,#3A79B8,#2E629D);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8, endColorstr=#2E629D);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8, endColorstr=#2E629D)"}.qtip-tipped .qtip-icon{border:2px solid #285589;background:#285589}.qtip-tipped .qtip-icon .ui-icon{background-color:#FBFBFB;color:#555}.qtip-bootstrap{font-size:14px;line-height:20px;color:#333;padding:1px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.qtip-bootstrap .qtip-titlebar{padding:8px 14px;margin:0;font-size:14px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.qtip-bootstrap .qtip-titlebar .qtip-close{right:11px;top:45%;border-style:none}.qtip-bootstrap .qtip-content{padding:9px 14px}.qtip-bootstrap .qtip-icon{background:transparent}.qtip-bootstrap .qtip-icon .ui-icon{width:auto;height:auto;float:right;font-size:20px;font-weight:700;line-height:18px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.qtip-bootstrap .qtip-icon .ui-icon:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}.qtip:not(.ie9haxors) div.qtip-content,.qtip:not(.ie9haxors) div.qtip-titlebar{filter:none;-ms-filter:none}.qtip .qtip-tip{margin:0 auto;overflow:hidden;z-index:10}x:-o-prefocus,.qtip .qtip-tip{visibility:hidden}.qtip .qtip-tip,.qtip .qtip-tip .qtip-vml,.qtip .qtip-tip canvas{position:absolute;color:#123456;background:transparent;border:0 dashed transparent}.qtip .qtip-tip canvas{top:0;left:0}.qtip .qtip-tip .qtip-vml{behavior:url(#default#VML);display:inline-block;visibility:visible}#qtip-overlay{position:fixed;left:0;top:0;width:100%;height:100%}#qtip-overlay.blurs{cursor:pointer}#qtip-overlay div{position:absolute;left:0;top:0;width:100%;height:100%;background-color:#000;opacity:.7;filter:alpha(opacity=70);-ms-filter:"alpha(Opacity=70)"}.qtipmodal-ie6fix{position:absolute!important} \ No newline at end of file diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css index a110113c..416ec481 100644 --- a/gui/slick/css/light.css +++ b/gui/slick/css/light.css @@ -167,12 +167,7 @@ inc_top.tmpl background-image: url("../images/menu/menu-icons-white.png"); } -[class^="icon16-"], -[class*=" icon16-"] { - background-image: url("../images/glyphicons-config.png"); -} - -.ui-autocomplete-loading { +.ui-autocomplete-loading { background: white url("../images/loading16.gif") right center no-repeat; } @@ -525,10 +520,6 @@ home.tmpl margin-right: 5px; } -.search { - margin-bottom: 10px; -} - .ui-progressbar { height: 20px; line-height: 18px; @@ -769,122 +760,38 @@ td.tvShow a:hover { /* ======================================================================= home_addShows.tmpl ========================================================================== */ - -#addShowPortal { - width: 700px; - padding: 10px 0; - margin-right: auto; - margin-left: auto; -} - -#addShowPortal a { - padding: 10px; -} - -div.button { - display: table-cell; - vertical-align: middle; - padding-left: 10px; -} - -div.buttontext { - display: table-cell; - padding-left: 20px; - text-align: left; - white-space: normal; -} - -div.buttontext h3 { - margin-top: 10px; -} - -div.buttontext p { - font-size: 13px; -} - .icon-addnewshow { background-image: url("../images/addshows/add-new32-black.png"); - width: 32px; - height: 32px; } .icon-addtrendingshow { background-image: url("../images/addshows/add-trending32-black.png"); - width: 32px; - height: 32px; } .icon-addrecommendedshow { background-image: url("../images/addshows/add-trakt32-black.png"); - width: 32px; - height: 32px; } .icon-addexistingshow { background-image: url("../images/addshows/add-existing32-black.png"); - width: 32px; - height: 32px; } /* ======================================================================= home_newShow.tmpl ========================================================================== */ -#addShowForm, #recommendedShowsForm { - margin-left: auto; - margin-right: auto; -} - -#newShowPortal { - width: 800px; - padding: 10px 0; - margin-right: auto; - margin-left: auto; -} - #displayText { - padding: 8px; - overflow: hidden; - font-size: 14px; background-color: #efefef; - border: 1px solid #dfdede; -} - -#searchResults input[type="radio"] { - vertical-align: -2px; + border-color: #dfdede; } /* ======================================================================= home_addExistingShow.tmpl ========================================================================== */ -.existingtabs { - padding: 1em 1.4em; -} - -ul#rootDirStaticList { - width: 90%; - margin-right: auto; - margin-left: auto; - text-align: left; -} - ul#rootDirStaticList li { - padding: 4px 5px 4px 5px; - margin: 2px; - list-style: none outside none; - cursor: pointer; background: url('../css/lib/images/ui-bg_highlight-soft_75_efefef_1x100.png') repeat-x scroll 50% 50% #EFEFEF; } -ul#rootDirStaticList li label { - margin-top: 5px; - margin-bottom: 5px; -} - -ul#rootDirStaticList li input[type="checkbox"] { - vertical-align: -2px; -} - /* ======================================================================= home_trendingShows.tmpl ========================================================================== */ @@ -1518,32 +1425,6 @@ select .selected { border-top: 1px dotted #666666; } -[class^="icon16-"], [class*=" icon16-"] { - background-image: url("../images/glyphicons-config.png"); - background-repeat: no-repeat; - display: inline-block; - height: 16px; - vertical-align: text-top; - width: 16px; - margin-top: 1px; -} - -.icon16-github { - background-position: 0 0; -} -.icon16-mirc { - background-position: -26px 0; -} -.icon16-sg { - background-position: -52px 0; -} -.icon16-web { - background-position: -78px 0; -} -.icon16-win { - background-position: -104px 0; -} - /* ======================================================================= config_postProcessing.tmpl ========================================================================== */ @@ -1848,10 +1729,6 @@ body { color: #000; } -html * { - outline: 0 !important; -} - input[type="radio"] { margin: 2px 0px 0px; line-height: normal; @@ -1875,8 +1752,12 @@ input, textarea, select, .uneditable-input { .navbar-default { background-color: #333333; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333'); - background: -webkit-gradient(linear, left top, left bottom, from(#555), to(#333)); - background: -moz-linear-gradient(top, #555, #333); + background-image: -ms-linear-gradient(top, #555555 0%, #333333 100%); + background-image: -moz-linear-gradient(top, #555555 0%, #333333 100%); + background-image: -o-linear-gradient(top, #555555 0%, #333333 100%); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #555555), color-stop(1, #333333)); + background-image: -webkit-linear-gradient(top, #555555 0%, #333333 100%); + background-image: linear-gradient(to bottom, #555555 0%, #333333 100%); border-color: #3e3f3a; } @@ -2058,7 +1939,6 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn:hover { color: #333333; - text-decoration: none; background-color: #e6e6e6; *background-color: #d9d9d9; background-position: 0 -15px; @@ -2089,8 +1969,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; - background-image: none; + background: #e6e6e6 none; opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; @@ -2098,19 +1977,6 @@ fieldset[disabled] .navbar-default .btn-link:focus { box-shadow: none; } -.btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.btn-large [class^="icon-"] { - margin-top: 1px; -} - .btn-small { padding: 5px 9px; font-size: 11px; @@ -2370,60 +2236,16 @@ pre { /* ======================================================================= input sizing (for config pages) ========================================================================== */ +#pickShow optgroup, #editAProvider optgroup { color: #eee; - background-color: #888; + background-color: #888; } +#pickShow optgroup option, #editAProvider optgroup option { color: #222; - background-color: #fff; -} - -#config select { - min-width: 0; - width: auto; - display: inline; - margin-top: -4px; -} - -.btn-inline { - margin-top: -3px; -} - -.input75 { - width: 75px; - margin-top: -4px; -} - -.input100 { - width: 100px; - margin-top: -4px; -} - -.input150 { - width: 150px; - margin-top: -4px; -} - -.input200 { - width: 200px; - margin-top: -4px; -} - -.input250 { - width: 250px; - margin-top: -4px; -} - -.input300 { - width: 300px; - margin-top: -4px; -} - -.input350 { - width: 350px; - margin-top: -4px; + background-color: #fff; } /* ======================================================================= @@ -2501,92 +2323,31 @@ browser.css /* ======================================================================= -formWizard.css +formWizard ========================================================================== */ - -fieldset.sectionwrap { - width: 800px; - padding: 5px; - text-align: left; - border-width: 0; -} - +.step, legend.legendStep { color: #57442b; - margin-bottom: 0px; -} - -div.stepsguide { - margin-bottom: 15px; - overflow: hidden; - text-align: left; - cursor: pointer; -} - -div.stepsguide .step { - float: left; - width: 266px; - font: bold 24px Arial; } div.stepsguide .step p { - margin: 12px 0; - border-bottom: 4px solid #57442b; + border-color: #57442b; } -div.stepsguide .disabledstep { +.disabledstep { color: #c4c4c4; } div.stepsguide .disabledstep p { - border-bottom: 4px solid #8a775e; -} - -div.stepsguide .step .smalltext { - font-size: 13px; - font-weight: normal; -} - -div.formpaginate { - width: 800px; - margin-top: 1em; - overflow: auto; - font-weight: bold; - text-align: center; + border-color: #8a775e; } div.formpaginate .prev, div.formpaginate .next { - padding: 3px 6px; color: #fff; - cursor: hand; - cursor: pointer; background: #57442b; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; } -.stepDiv { - padding: 15px; -} - -/* step 3 related */ -#customQuality { - display: block; - padding: 10px 0; - overflow: hidden; - clear: both; -} - -#customQualityWrapper div.component-group-desc { - float: left; - width: 165px; -} - #customQualityWrapper div.component-group-desc p { - width: 85%; - margin: .8em 0; - font-size: 1.2em; color: #666; } @@ -2606,10 +2367,7 @@ tablesorter.css .tablesorter th, .tablesorter td { - padding: 4px; - border-top: #fff 1px solid; - border-left: #fff 1px solid; - vertical-align: middle; + border-color: #fff; } /* remove extra border from left edge */ @@ -2620,32 +2378,23 @@ tablesorter.css .tablesorter th { color: #fff; - text-align: center; text-shadow: -1px -1px 0 rgba(0,0,0,0.3); background-color: #333; - border-collapse: collapse; - font-weight: normal; } .tablesorter .tablesorter-header { - padding: 4px 18px 4px 18px; - cursor: pointer; - background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==); - background-position: center right; - background-repeat: no-repeat; + background: #333 url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==) no-repeat center right; /* background-image: url(../images/tablesorter/bg.gif); */ } .tablesorter thead .tablesorter-headerDesc { - background-color: #555; - background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7); + background: #555 url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7) no-repeat center right; /* background-image: url(../images/tablesorter/asc.gif); */ } .tablesorter thead .tablesorter-headerAsc { - background-color: #555; - background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7); - /* background-image: url(../images/tablesorter/desc.gif); */ + background: #555 url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7) no-repeat center right; + /* background-image: url(../images/tablesorter/desc.gif); */ } .tablesorter thead .sorter-false { @@ -2707,7 +2456,6 @@ thead.tablesorter-stickyHeader { .tablesorter tfoot a { color:#fff; - text-decoration: none; } /* ======================================================================= @@ -2844,6 +2592,25 @@ span.token-input-delete-token { margin: 0 1px; } +.step-one #searchResults .alt { + background-color: rgb(245, 245, 245); +} + +#addRootDirTable td label .filepath, +.grey-text { + color:#666 +} + +#newShowPortal #displayText .show-name, +#newShowPortal #displayText .show-dest, +#newShowPortal #displayText p { + color: rgb(153, 153, 153); +} + +#newShowPortal #displayText .show-name, +#newShowPortal #displayText .show-dest { + color: rgb(87, 68, 43); +} /* ======================================================================= jquery.confirm.css ========================================================================== */ diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index 5a3870a8..7c00de52 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -167,12 +167,7 @@ inc_top.tmpl background-image: url("../images/menu/menu-icons-white.png"); } -[class^="icon16-"], -[class*=" icon16-"] { - background-image: url("../images/glyphicons-config.png"); -} - -.ui-autocomplete-loading { +.ui-autocomplete-loading { background: white url("../images/loading16.gif") right center no-repeat; } @@ -516,7 +511,6 @@ home.tmpl border: 1px solid #ccc; overflow: hidden; height: 66px; - overflow: hidden; border-radius: 8px; vertical-align: top; width: 360px; @@ -535,9 +529,13 @@ home.tmpl margin-right: 5px; } -.search { - margin-bottom: 10px; -} +#HomeLayout { margin-top: -35px; } +#HomeLayout.not-poster { height: 75px } +#HomeLayout div.not-poster { position:relative; top:38px; } +#HomeLayout span.not-poster { margin-top: -30px } +#HomeLayout.poster { margin-top: -35px; } +#HomeLayout span.poster { margin-bottom:10px } +#search_show_name { margin-top: 0 } .ui-progressbar { height: 20px; @@ -793,31 +791,42 @@ home_addShows.tmpl ========================================================================== */ #addShowPortal { - width: 700px; + width: 750px; padding: 10px 0; margin-right: auto; margin-left: auto; } #addShowPortal a { - padding: 10px; +/* padding: 10px;*/ + padding: 0px 20px; + width: 360px; + + float: left; + margin: 0 15px 15px 0; } div.button { display: table-cell; vertical-align: middle; - padding-left: 10px; +/* padding-left: 10px;*/ } div.buttontext { display: table-cell; +/* padding-left: 20px; + padding: 10px 15px; +*/ + padding: 10px 0px 10px 15px; text-align: left; white-space: normal; } - +div.buttontext p { + margin: 0 +} div.buttontext h3 { - margin-top: 10px; + margin-top: 0px; } div.buttontext p { @@ -851,13 +860,19 @@ div.buttontext p { /* ======================================================================= home_newShow.tmpl ========================================================================== */ -#addShowForm, #recommendedShowsForm { +#addShowForm, +#newShowPortal, +fieldset.sectionwrap, +div.formpaginate { + width: 801px +} + +#addShowForm { margin-left: auto; margin-right: auto; } #newShowPortal { - width: 800px; padding: 10px 0; margin-right: auto; margin-left: auto; @@ -867,20 +882,44 @@ home_newShow.tmpl padding: 8px; overflow: hidden; font-size: 14px; - background-color: #efefef; - border: 1px solid #dfdede; + border: 1px solid; } #searchResults input[type="radio"] { vertical-align: -2px; } +#addShowForm #promptForSettings, +#addShowForm #rootDirStaticList input, +#addShowForm div.field-pair input, +#addShowForm div.field-pair select { + margin-right: 6px; +} + +#addShowForm #customQualityWrapper div.component-group-desc p { + font-size: 14px; +} + +#addShowForm #nameToSearch { + width: 460px; + margin-top: 0 +} + +#addShowForm #providedIndexer, +#addShowForm #indexerLangSelect { + margin-left: 7px +} + +#addShowForm #searchName { + margin-left: 10px +} + /* ======================================================================= home_addExistingShow.tmpl ========================================================================== */ .existingtabs { - padding: 1em 1.4em; + padding: 20px; } ul#rootDirStaticList { @@ -888,14 +927,15 @@ ul#rootDirStaticList { margin-right: auto; margin-left: auto; text-align: left; + list-style-type: none; + padding: 0 } ul#rootDirStaticList li { - padding: 4px 5px 4px 5px; - margin: 2px; + padding: 4px 10px; + margin: 2px 0; list-style: none outside none; cursor: pointer; - background: url('../css/lib/images/ui-bg_highlight-soft_75_efefef_1x100.png') repeat-x scroll 50% 50% #EFEFEF; } ul#rootDirStaticList li label { @@ -1538,15 +1578,27 @@ config*.tmpl color: #666; } -#config div.field-pair { - padding: 12px 0px; +.stepDiv #customQualityWrapper h4 { + margin-top: 6px; + padding: 0 0 } +.stepDiv div.field-pair { + padding: 0 0 10px +} + +#config div.field-pair { + padding: 12px 0 +} + +.stepDiv .component-desc select, +.stepDiv .component-desc input, #config div.field-pair select, #config div.field-pair input { margin-right: 15px; } +.stepDiv .component-desc input, #config div.field-pair input { float: left; } @@ -1555,6 +1607,11 @@ config*.tmpl padding-left: 20px; } +.stepDiv span.component-title.input { + line-height: 30px +} + +.stepDiv span.component-title, #config span.component-title { float: left; width: 172px; @@ -1563,6 +1620,11 @@ config*.tmpl font-weight: bold; } +#addShowForm .stepDiv span.component-desc { + width:578px; +} + +.stepDiv span.component-desc, #config span.component-desc { font-size: 12px; font-weight: normal; @@ -1684,14 +1746,14 @@ select .selected { border-top: 1px dotted #666666; } -[class^="icon16-"], [class*=" icon16-"] { - background-image: url("../images/glyphicons-config.png"); - background-repeat: no-repeat; - display: inline-block; +[class^="icon16-"], +[class*=" icon16-"] { + background: url('../images/glyphicons-config.png') no-repeat; + display: block; height: 16px; - vertical-align: text-top; width: 16px; - margin-top: 1px; + float: left; + margin-right: 5px; } .icon16-github { @@ -2298,9 +2360,9 @@ fieldset[disabled] .navbar-default .btn-link:focus { border-radius: 5px; } -.btn-large [class^="icon-"] { +/*.btn-large [class^="icon-"] { margin-top: 1px; -} +}*/ .btn-small { padding: 5px 9px; @@ -2681,45 +2743,46 @@ browser.css /* ======================================================================= -formWizard.css +formWizard ========================================================================== */ fieldset.sectionwrap { - width: 800px; - padding: 5px; + padding: 5px 0; text-align: left; border-width: 0; } +.step-one #searchResults legend.legendStep { + margin-top: 10px; +} + +div.stepsguide .step, legend.legendStep { - color: #57442b; - margin-bottom: 0px; + margin-bottom: 0; +} + +legend.legendStep p { + padding-left: 15px; } div.stepsguide { - margin-bottom: 15px; - overflow: hidden; text-align: left; cursor: pointer; } div.stepsguide .step { float: left; - width: 266px; + width: 267px; font: bold 24px Arial; } div.stepsguide .step p { - margin: 12px 0; - border-bottom: 4px solid #57442b; -} - -div.stepsguide .disabledstep { - color: #c4c4c4; + margin: 12px 0 0; + border-bottom: 5px solid; } div.stepsguide .disabledstep p { - border-bottom: 4px solid #8a775e; + border-bottom: 2px solid; } div.stepsguide .step .smalltext { @@ -2728,56 +2791,41 @@ div.stepsguide .step .smalltext { } div.formpaginate { - width: 800px; margin-top: 1em; - overflow: auto; font-weight: bold; text-align: center; } +.step-outer { + overflow: hidden +} + div.formpaginate .prev, div.formpaginate .next { padding: 3px 6px; - color: #fff; cursor: hand; cursor: pointer; - background: #57442b; -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .stepDiv { padding: 15px; } +.stepDiv.parent-folder { + padding: 15px 0 0; + width: 430px; + margin: 0px auto; +} -#tabs .nocheck, .stepDiv .nocheck { padding-left: 16px; } -#tabs label span.component-title, -.stepDiv label span.component-title { - padding-bottom: 6px; - float: left; - width: 172px; - margin-right: 10px; - font-size: 13px; - font-weight: bold; -} - -#tabs label span.component-desc, -.stepDiv label span.component-desc { - padding-bottom: 6px; - font-size: 12px; - font-weight: normal; - display:inline-block; - width:475px; -} - /* step 3 related */ #customQuality { display: block; - padding: 10px 0; + padding: 0 0 10px 0; overflow: hidden; clear: both; } @@ -2791,7 +2839,6 @@ div.formpaginate .prev, div.formpaginate .next { width: 85%; margin: .8em 0; font-size: 1.2em; - color: #666; } /* ======================================================================= @@ -2811,11 +2858,15 @@ tablesorter.css .tablesorter th, .tablesorter td { padding: 4px; - border-top: #fff 1px solid; - border-left: #fff 1px solid; + border-top: 1px solid; + border-left: 1px solid; vertical-align: middle; } +#addRootDirTable.tablesorter td { + vertical-align: baseline; +} + /* remove extra border from left edge */ .tablesorter th:first-child, .tablesorter td:first-child { @@ -2823,10 +2874,7 @@ tablesorter.css } .tablesorter th { - color: #fff; text-align: center; - text-shadow: -1px -1px 0 rgba(0,0,0,0.3); - background-color: #333; border-collapse: collapse; font-weight: normal; } @@ -2834,22 +2882,7 @@ tablesorter.css .tablesorter .tablesorter-header { padding: 4px 18px 4px 18px; cursor: pointer; - background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==); - background-position: center right; - background-repeat: no-repeat; - /* background-image: url(../images/tablesorter/bg.gif); */ -} - -.tablesorter thead .tablesorter-headerDesc { - background-color: #555; - background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7); - /* background-image: url(../images/tablesorter/asc.gif); */ -} - -.tablesorter thead .tablesorter-headerAsc { - background-color: #555; - background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7); - /* background-image: url(../images/tablesorter/desc.gif); */ + vertical-align: middle; } .tablesorter thead .sorter-false { @@ -2910,7 +2943,6 @@ thead.tablesorter-stickyHeader { } .tablesorter tfoot a { - color:#fff; text-decoration: none; } @@ -3053,6 +3085,42 @@ span.token-input-delete-token { margin: 0 1px; } +.stepDiv #searchResults div { + line-height: 1.7; +} + +.stepDiv #searchResults #searchingAnim { + margin-right: 6px; +} + +.stepone-result-title { + font-weight: 600; + margin-left: 10px +} + +.stepone-result-date, +.stepone-result-db, +.stepone-result-overview { + margin-left: 5px +} +.stepone-result-db img { + margin-top: 3px; + vertical-align: top; +} +#newShowPortal #displayText .show-name, +#newShowPortal #displayText .show-dest, +#newShowPortal #displayText p { + margin: 0; +} +#newShowPortal #displayText .show-name, +#newShowPortal #displayText .show-dest { + font-weight: 600; +} + +#addRootDirTable td label .filepath { + font-weight: 900 +} + .boldest {font-weight: 900} .red-text {color:#d33} .clear-left {clear:left} diff --git a/gui/slick/images/network/esquire network.png b/gui/slick/images/network/esquire network.png new file mode 100644 index 00000000..78b3af5a Binary files /dev/null and b/gui/slick/images/network/esquire network.png differ diff --git a/gui/slick/images/network/smithsonian channel.png b/gui/slick/images/network/smithsonian channel.png new file mode 100644 index 00000000..4b88af11 Binary files /dev/null and b/gui/slick/images/network/smithsonian channel.png differ diff --git a/gui/slick/images/notifiers/plex.png b/gui/slick/images/notifiers/plex.png index 1d97ad22..f630f9b2 100644 Binary files a/gui/slick/images/notifiers/plex.png and b/gui/slick/images/notifiers/plex.png differ diff --git a/gui/slick/images/providers/6box.png b/gui/slick/images/providers/6box.png index 60eb5858..3e77530b 100644 Binary files a/gui/slick/images/providers/6box.png and b/gui/slick/images/providers/6box.png differ diff --git a/gui/slick/images/providers/newztown.png b/gui/slick/images/providers/newztown.png index 5bdc9fea..56d2be31 100644 Binary files a/gui/slick/images/providers/newztown.png and b/gui/slick/images/providers/newztown.png differ diff --git a/gui/slick/images/providers/nzb_is.png b/gui/slick/images/providers/nzb_is.png new file mode 100644 index 00000000..886a600e Binary files /dev/null and b/gui/slick/images/providers/nzb_is.png differ diff --git a/gui/slick/images/providers/nzbs_in.png b/gui/slick/images/providers/nzbs_in.png new file mode 100644 index 00000000..58c7b7b6 Binary files /dev/null and b/gui/slick/images/providers/nzbs_in.png differ diff --git a/gui/slick/images/providers/nzbs_org.png b/gui/slick/images/providers/nzbs_org.png index d096f667..f0689008 100644 Binary files a/gui/slick/images/providers/nzbs_org.png and b/gui/slick/images/providers/nzbs_org.png differ diff --git a/gui/slick/images/providers/omgwtfnzbs.png b/gui/slick/images/providers/omgwtfnzbs.png index 3de01dcf..ed752797 100644 Binary files a/gui/slick/images/providers/omgwtfnzbs.png and b/gui/slick/images/providers/omgwtfnzbs.png differ diff --git a/gui/slick/images/providers/tokyotoshokan.png b/gui/slick/images/providers/tokyotoshokan.png index 66e8c7bf..51628a61 100644 Binary files a/gui/slick/images/providers/tokyotoshokan.png and b/gui/slick/images/providers/tokyotoshokan.png differ diff --git a/gui/slick/images/providers/womble_s_index.png b/gui/slick/images/providers/womble_s_index.png index 5cb053c6..c4d3a8f1 100644 Binary files a/gui/slick/images/providers/womble_s_index.png and b/gui/slick/images/providers/womble_s_index.png differ diff --git a/gui/slick/interfaces/default/config_backuprestore.tmpl b/gui/slick/interfaces/default/config_backuprestore.tmpl deleted file mode 100644 index 0ce945ab..00000000 --- a/gui/slick/interfaces/default/config_backuprestore.tmpl +++ /dev/null @@ -1,102 +0,0 @@ -#import os.path -#import datetime -#import locale -#import sickbeard -#from sickbeard.common import * -#from sickbeard.sbdatetime import * -#from sickbeard import config -#from sickbeard import metadata -#from sickbeard.metadata.generic import GenericMetadata -#set global $title = "Config - Backup/Restore" -#set global $header = "Backup/Restore" - -#set global $sbPath="../.." - -#set global $topmenu="config"# -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") - - - -#if $varExists('header') -