diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 00000000..f9552247
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,17 @@
+engines:
+ eslint:
+ enabled: true
+ csslint:
+ enabled: true
+ pep8:
+ enabled: true
+ratings:
+ paths:
+ - "**.py"
+ - "**.js"
+ - "**.css"
+exclude_paths:
+- lib/**/*
+- tornado/**/*
+- gui/slick/css/lib/**/*
+- gui/slick/js/lib/**/*
\ No newline at end of file
diff --git a/CHANGES.md b/CHANGES.md
index 4c49edc5..d6b258e2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,7 +1,122 @@
+### 0.11.0 (2016-01-10 22:30:00 UTC)
+
+* Change to only refresh scene exception data for shows that need it
+* Change reduce aggressive use of scene numbering that was overriding user preference where not needed
+* Change set "Scene numbering" checkbox and add text to the label tip in third step of add "New Show" if scene numbers
+ are found for the selected show in the search results of the first step
+* Change label text on edit show page to highlight when manual numbering and scene numbers are available
+* Fix disabling "Scene numbering" of step three in add "New Show" was ignored when scene episode number mappings exist
+* Fix don't use scene episode number mappings everywhere when "Scene numbering" is disabled for a show
+* Fix width of legend underlining on the third step used to bring other display elements into alignment
+* Change when downloading magnet or nzb files, verify the file in cache dir and then move to blackhole
+* Fix small cosmetic issue to correctly display "full backlog" date
+* Add search crawler exclusions
+* Fix saving default show list group on add new show options page
+* Remove legacy anime split home option from anime settings tab (new option located in general/interface tab)
+* Remove "Manage Torrents"
+* Update Beautiful Soup 4.3.2 to 4.4.0 (r390)
+* Update dateutil library to 2.4.2 (083f666)
+* Update chardet packages to 2.3.0 (26982c5)
+* Update Hachoir library 1.3.3 to 1.3.4 (r1383)
+* Change configure quiet option in Hachoir to suppress warnings (add ref:hacks.txt)
+* Add parse media content to determine quality before making final assumptions during re-scan, update, pp
+* Add a postprocess folder name validation
+* Update Requests library to 2.7.0 (5d6d1bc)
+* Update SimpleJSON library 3.7.3 to 3.8.0 (a37a9bd)
+* Update Tornado Web Server 4.2 to 4.3.dev1 (1b6157d)
+* Update isotope library 2.0.1 to 2.2.2
+* Update change to suppress reporting of Tornado exception error 1 to updated package (ref:hacks.txt)
+* Update fix for API response header for JSON content type and the return of JSONP data to updated package (ref:hacks.txt)
+* Update TvDB API library 1.09 with changes up to (35732c9) and some pep8 and code cleanups
+* Fix post processing season pack folders
+* Fix saving torrent provider option "Seed until ratio" after recent refactor
+* Change white text in light theme on Manage / Episode Status Management page to black for better readability
+* Change displayShow page episode colours when a minimum quality is met with "End upgrade on first match"
+* Add seed time per provider for torrent clients that support seed time per torrent, i.e. currently only uTorrent
+* Remove seed time display for Transmission in config/Torrent Search page because the torrent client doesn't support it
+* Add PreToMe torrent provider
+* Add SceneTime torrent provider
+* Change TtN provider to parse new layout
+* Improve recognition of SD quality
+* Fix halting in mid flow of Add Existing Show which resulted in failure to scan statuses and filesizes
+* Change default de-referrer url to blank
+* Change javascript urls in templates to allow proper caching
+* Change downloads to prevent cache misfiring with "Result is not a valid torrent file"
+* Add BitMeTV torrent provider
+* Add Torrenting provider
+* Add FunFile torrent provider
+* Add TVChaosUK torrent provider
+* Add HD-Space torrent provider
+* Add Shazbat torrent provider
+* Remove unnecessary call to indexers during nameparsing
+* Change disable ToTV due to non-deletable yet reported hacker BTC inbox scam and also little to no new content listings
+* Fix Episode View KeyError: 'state-title' failure for shows without a runtime
+* Update py-unrar2 library 99.3 to 99.6 (2fe1e98)
+* Fix py-unrar2 on unix to handle different date formats output by different unrar command line versions
+* Fix Add and Edit show quality selection when Quality 'Custom' is used
+* Fix add existing shows from folders that contain a plus char
+* Fix post process issue where items in history were processed out of turn
+* Change increase frequency of updating show data
+* Remove Animenzb provider
+* Change increase the scope and number of non release group text that is identified and removed
+* Add general config setting to allow adding incomplete show data
+* Change to throttle connection rate on thread initiation for adba library
+* Change default manage episodes selector to Snatched episodes if items exist else Wanted on Episode Status Manage page
+* Change snatched row colour on Episode Status Manage page to match colour used on the show details page
+* Change replace trakt with libtrakt for API v2
+* Change improve robustness of Trakt communications
+* Change Trakt notification config to use PIN authentication with the service
+* Add multiple Trakt account support to Config/Notifications/Social
+* Add setting to Trakt notification to update collection with downloaded episode info
+* Change trakt notifier logo
+* Remove all other Trakt deprecated API V1 service features pending reconsideration
+* Change increase show search capability when using plain text and also add TVDB id, IMDb id and IMDb url search
+* Change improve existing show page and the handling when an attempt to add a show to an existing location
+* Change consolidate Trakt Trending and Recommended views into an "Add From Trakt" view which defaults to trending
+* Change Add from Trakt/"Shows:" with Anticipated, New Seasons, New Shows, Popular, Recommendations, and Trending views
+* Change Add from Trakt/"Shows:" with Most Watched, Played, and Collected during the last month and year on Trakt
+* Change add season info to "Show: Trakt New Seasons" view on the Add from Trakt page
+* Change increase number of displayed Trakt shows to 100
+* Add genres and rating to all Trakt shows
+* Add AniDb Random and Hot to Add Show page
+* Add IMDb Popular to Add Show page
+* Add version to anime renaming pattern
+* Add Code Climate configuration files
+* Change move init-scripts to single folder
+* Change sickbeard variables to sickgear variables in init-scripts
+* Change improve the use of multiple plex servers
+* Change move JS code out of home template and into dedicated file
+* Change remove branch from window title
+* Change move JS code out of inc_top template and into dedicated file
+* Change cleanup torrent providers
+* Change utilise tvdbid for searching usenet providers
+* Add setting to provider BTN to Reject Blu-ray M2TS releases
+* Remove jsonrpclib library
+* Change consolidate global and per show ignore and require words functions
+* Change "Require word" title and notes on Config Search page to properly describe its functional logic
+* Add regular expression capability to ignore and require words by starting wordlist with "regex:"
+* Add list shows with custom ignore and require words under the global counterparts on the Search Settings page
+* Fix failure to search for more than one selected wanted episode
+* Add notice for users with Python 2.7.8 or below to update to latest Python
+* Change position of parsed qualities to the start of log lines
+* Change to always display branch and commit hash on 'Help & Info' page
+* Add option to create season search exceptions from editShow page
+* Change sab to use requests library
+* Add "View Changes" to tools menu
+* Change disable connection attempts and remove UI references to the TVRage info source
+* Change to simplify xem id fetching
+* Fix issue on Add Existing Shows page where shows were listed that should not have been
+* Change get_size helper to also handle files
+* Change improve handling of a bad email notify setting
+* Fix provider MTV download URL
+* Change give provider OMGWTFNZBS more time to respond
+* Change file browser to permit manually entering a path
+
+
### 0.10.0 (2015-08-06 11:05:00 UTC)
* Remove EZRSS provider
-* Update Tornado webserver to 4.2 (fdfaf3d)
+* Update Tornado Web Server to 4.2 (fdfaf3d)
* Update change to suppress reporting of Tornado exception error 1 to updated package (ref:hacks.txt)
* Update fix for API response header for JSON content type and the return of JSONP data to updated package (ref:hacks.txt)
* Update Requests library 2.6.2 to 2.7.0 (8b5e457)
@@ -117,7 +232,7 @@
### 0.9.0 (2015-05-18 14:33:00 UTC)
-* Update Tornado webserver to 4.2.dev1 (609dbb9)
+* Update Tornado Web Server to 4.2.dev1 (609dbb9)
* Update change to suppress reporting of Tornado exception error 1 to updated package as listed in hacks.txt
* Update fix for API response header for JSON content type and the return of JSONP data to updated package as listed in hacks.txt
* Change network names to only display on top line of Day by Day layout on Episode View
@@ -234,7 +349,7 @@
* Hide year, runtime, genre tags, country flag, or status if lacking valid data to display
* Remove redundant CSS color use (all browsers treat 3 identical digits as 6, except for possibly in gradients)
* Remove whitespace and semi-colon redundancy from CSS shedding 4.5kb
-* Add show names to items listed during startup in the loading from database phase
+* Add show names to items listed during startup in the loading from database phase
* Add "Enable IMDb info" option to config/General/Interface
* Change to not display IMDb info on UI when "Enable IMDb info" is disabled
* Change genre tags on displayShow page to link to IMDb instead of Trakt
@@ -321,7 +436,7 @@
* Change anime release groups to in memory storage for lowered latency
* Change adjust menu delay and hover styling
* Fix provider list color
-* Add handling of exceptional case with missing network name (NoneType) in Episode View
+* Add handling of exceptional case with missing network name (NoneType) in Episode View
* Fix black and white list initialization on new show creation
* Add select all and clear all buttons to testRename template
* Fix displayShow topmenu variable to point to a valid menu item
@@ -477,7 +592,7 @@
* 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
+* 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
@@ -631,7 +746,7 @@
* Add return code from hardlinking error to log
* Fix ABD regex for certain filenames
* Change miscellaneous UI fixes
-* Update Tornado webserver to 4.1dev1 and add the certifi lib dependency
+* Update Tornado Web Server to 4.1dev1 and add the certifi lib dependency
* Fix trending shows page from loading full size poster images
* Add "Archive on first match" to Manage, Mass Update, Edit Selected page
* Fix searching IPTorrentsProvider
diff --git a/HACKS.txt b/HACKS.txt
index 5aea55dc..f2b8be2c 100644
--- a/HACKS.txt
+++ b/HACKS.txt
@@ -1,7 +1,10 @@
Libs with customisations...
-/tornado
+/lib/cachecontrol/caches/file_cache.py
+/lib/hachoir_core/config.py
+/lib/pynma/pynma.py
/lib/requests/packages/urllib3/connectionpool.py
/lib/requests/packages/urllib3/util/ssl_.py
-/lib/cachecontrol/caches/file_cache.py
-/lib/pynma/pynma.py
\ No newline at end of file
+/tornado
+/lib/unrar2/unix.py
+/lib/tvdb/tvdb_api.py
\ No newline at end of file
diff --git a/SickBeard.py b/SickBeard.py
index 932886fa..451d64b7 100755
--- a/SickBeard.py
+++ b/SickBeard.py
@@ -340,7 +340,7 @@ class SickGear(object):
logger.ERROR)
if sickbeard.LAUNCH_BROWSER and not self.runAsDaemon:
logger.log(u'Launching browser and exiting', logger.ERROR)
- sickbeard.launchBrowser(self.startPort)
+ sickbeard.launch_browser(self.startPort)
os._exit(1)
# Check if we need to perform a restore first
@@ -377,7 +377,7 @@ class SickGear(object):
# Launch browser
if sickbeard.LAUNCH_BROWSER and not (self.noLaunch or self.runAsDaemon):
- sickbeard.launchBrowser(self.startPort)
+ sickbeard.launch_browser(self.startPort)
# main loop
while True:
@@ -488,7 +488,7 @@ class SickGear(object):
sickbeard.halt()
# save all shows to DB
- sickbeard.saveAll()
+ sickbeard.save_all()
# shutdown web server
if self.webserver:
diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css
index a4a38cd0..49977547 100644
--- a/gui/slick/css/dark.css
+++ b/gui/slick/css/dark.css
@@ -20,7 +20,7 @@ inc_top.tmpl
}
.browserDialog.busy .ui-dialog-buttonpane{
- background:url("../images/loading.gif") 10px 50% no-repeat !important
+ background:url("../images/loading32-dark.gif") 10px 50% no-repeat !important
}
.ui-progressbar .ui-progressbar-overlay{
@@ -61,6 +61,8 @@ inc_top.tmpl
.ui-state-default,
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default{
+ background:#3d3d3d;
+ color:#fff;
border:1px solid #111
}
@@ -326,15 +328,15 @@ ul#rootDirStaticList li{
}
/* =======================================================================
-home_trendingShows.tmpl
+home_browseShows.tmpl
========================================================================== */
-.traktContainer{
+.browse-container{
background-color:#333;
border:1px solid #111
}
-.trakt-image{
+.browse-image{
border-bottom:1px solid #111
}
@@ -526,7 +528,16 @@ h2.day, h2.network{
.carousel-indicators .active{
background:#8DBEEE;
border-color:#8DBEEE
-}
+}
+
+/* =======================================================================
+viewchanges.tmpl
+========================================================================== */
+#changes{
+ color:rgb(255,255,255);
+ background-color:rgb(61,61,61);
+ border:1px solid rgb(17,17,17)
+}
/* =======================================================================
config*.tmpl
@@ -626,6 +637,14 @@ div.metadataDiv .disabled{
background:url("../images/warning16.png") no-repeat right 5px center #fff
}
+.solid-border{
+ border:1px solid #555
+}
+
+.solid-border-top{
+ border-top:1px solid #555
+}
+
/* =======================================================================
manage*.tmpl
========================================================================== */
@@ -655,6 +674,7 @@ span.path{
background-color:#333
}
+#addRootDirTable td label .filepath.red-text,
.red-text{
color:#d33
}
@@ -1159,12 +1179,14 @@ input sizing (for config pages)
========================================================================== */
#pickShow optgroup,
+#showfilter optgroup,
#editAProvider optgroup{
color:#eee;
background-color:rgb(51, 51, 51)
}
#pickShow optgroup option,
+#showfilter optgroup option,
#editAProvider optgroup option{
color:#222;
background-color:#fff
@@ -1180,7 +1202,7 @@ browser.css
#fileBrowserDialog ul li a:hover{
color:#09a2ff;
- background:none
+ background: rgb(61, 61, 61) none
}
.ui-menu .ui-menu-item{
@@ -1214,6 +1236,10 @@ div.stepsguide .step p{
color:#646464
}
+#newShowPortal #addShowForm .stepsguide .disabledstep:hover > .smalltext{
+ color:#ccc;
+}
+
div.stepsguide .disabledstep p{
border-color:#1178B3
}
@@ -1444,4 +1470,4 @@ jquery.confirm.css
#confirmBox .red:hover{
background-color:#A13331
-}
\ No newline at end of file
+}
diff --git a/gui/slick/css/lib/images/ui-icons_09a2ff_256x240.png b/gui/slick/css/lib/images/ui-icons_09a2ff_256x240.png
index 1f20aa64..a3f4a35e 100644
Binary files a/gui/slick/css/lib/images/ui-icons_09a2ff_256x240.png and b/gui/slick/css/lib/images/ui-icons_09a2ff_256x240.png differ
diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css
index a5605538..eb79039e 100644
--- a/gui/slick/css/light.css
+++ b/gui/slick/css/light.css
@@ -16,19 +16,19 @@ inc_top.tmpl
}
.browserDialog.busy .ui-dialog-buttonpane{
- background:url("../images/loading.gif") 10px 50% no-repeat !important
+ background:url("../images/loading32.gif") 10px 50% no-repeat !important
}
.ui-progressbar .ui-progressbar-overlay{
background:url("../css/lib/images/animated-overlay.gif")
}
-.ui-dialog,
+.ui-dialog,
.ui-dialog-buttonpane{
background:#eceadf url("../css/lib/images/ui-bg_fine-grain_10_eceadf_60x60.png") 50% 50% repeat !important
}
-.ui-accordion-content,
+.ui-accordion-content,
.ui-tabs-panel{
background:#ededed !important;
background-image:none !important
@@ -50,41 +50,41 @@ inc_top.tmpl
background:#fff url("../css/lib/images/ui-bg_flat_0_ffffff_40x100.png") 50% 50% repeat-x
}
-.ui-state-default,
-.ui-widget-content .ui-state-default,
+.ui-state-default,
+.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default{
background:#fff;
border:1px solid #CCC
}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus{
background:#fff
}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
+.ui-state-active,
+.ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active{
background:#F7F7F7
}
-.ui-state-highlight,
-.ui-widget-content .ui-state-highlight,
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
.ui-widget-header .ui-state-highlight{
background:#fbf9ee url("../css/lib/images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x
}
-.ui-state-error,
-.ui-widget-content .ui-state-error,
+.ui-state-error,
+.ui-widget-content .ui-state-error,
.ui-widget-header .ui-state-error{
background:#fef1ec url("../css/lib/images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x
}
-.ui-icon,
+.ui-icon,
.ui-widget-content .ui-icon{
background-image:url("../css/lib/images/ui-icons_222222_256x240.png")
}
@@ -97,7 +97,7 @@ inc_top.tmpl
background-image:url("../css/lib/images/ui-icons_8c291d_256x240.png")
}
-.ui-state-hover .ui-icon,
+.ui-state-hover .ui-icon,
.ui-state-focus .ui-icon{
background-image:url("../css/lib/images/ui-icons_222222_256x240.png")
}
@@ -110,7 +110,7 @@ inc_top.tmpl
background-image:url("../css/lib/images/ui-icons_2e83ff_256x240.png")
}
-.ui-state-error .ui-icon,
+.ui-state-error .ui-icon,
.ui-state-error-text .ui-icon{
background-image:url("../css/lib/images/ui-icons_cd0a0a_256x240.png")
}
@@ -327,15 +327,15 @@ ul#rootDirStaticList li{
}
/* =======================================================================
-home_trendingShows.tmpl
+home_browseShows.tmpl
========================================================================== */
-.traktContainer{
+.browse-container{
background-color:#DFDACF;
border:1px solid #111
}
-.trakt-image{
+.browse-image{
border-bottom:1px solid #111
}
@@ -345,7 +345,7 @@ home_postprocess.tmpl
/* =======================================================================
-displayShow.tmpl
+displayShow.tmpl
========================================================================== */
tr.seasonheader{
@@ -508,7 +508,16 @@ h2.day, h2.network{
.carousel-indicators .active{
background:#C7DB40;
border-color:#C7DB40
-}
+}
+
+/* =======================================================================
+viewchanges.tmpl
+========================================================================== */
+#changes{
+ color:rgb(51,51,51);
+ background-color:rgb(245,245,245);
+ border:1px solid rgb(204,204,204)
+}
/* =======================================================================
config*.tmpl
@@ -601,6 +610,14 @@ div.metadataDiv .disabled{
background:url("../images/warning16.png") no-repeat right 5px center #fff
}
+.solid-border{
+ border:1px solid #ccc
+}
+
+.solid-border-top{
+ border-top:1px solid #ccc
+}
+
/* =======================================================================
manage*.tmpl
========================================================================== */
@@ -610,7 +627,7 @@ manage*.tmpl
}
a.whitelink{
- color:#fff
+ color:#000
}
/* =======================================================================
@@ -630,6 +647,7 @@ span.path{
background-color:#f5f1e4
}
+#addRootDirTable td label .filepath.red-text,
.red-text{
color:#d33
}
@@ -1125,12 +1143,14 @@ input sizing (for config pages)
========================================================================== */
#pickShow optgroup,
+#showfilter optgroup,
#editAProvider optgroup{
color:#eee;
background-color:#888
}
#pickShow optgroup option,
+#showfilter optgroup option,
#editAProvider optgroup option{
color:#222;
background-color:#fff
@@ -1142,7 +1162,7 @@ browser.css
#fileBrowserDialog ul li a:hover{
color:#00f;
- background:none
+ background: rgb(220, 220, 220) none
}
.ui-menu .ui-menu-item{
@@ -1180,6 +1200,10 @@ div.stepsguide .disabledstep p{
border-color:#8a775e
}
+#newShowPortal #addShowForm .stepsguide .disabledstep:hover > .smalltext{
+ color:#8a775e;
+}
+
div.formpaginate .prev, div.formpaginate .next{
color:#fff;
background:#57442b
@@ -1378,4 +1402,4 @@ jquery.confirm.css
#confirmBox .red:hover{
background-color:#A13331
-}
\ No newline at end of file
+}
diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css
index ccfdb7b6..26a87a79 100644
--- a/gui/slick/css/style.css
+++ b/gui/slick/css/style.css
@@ -175,7 +175,7 @@ inc_top.tmpl
background:url("../css/lib/images/animated-overlay.gif")
}
-.ui-dialog,
+.ui-dialog,
.ui-dialog-buttonpane{
background:#eceadf url("../css/lib/images/ui-bg_fine-grain_10_eceadf_60x60.png") 50% 50% repeat !important
}
@@ -921,7 +921,7 @@ home_newShow.tmpl
#newShowPortal,
fieldset.sectionwrap,
div.formpaginate{
- width:801px
+ width:831px
}
#addShowForm{
@@ -1054,25 +1054,25 @@ ul#rootDirStaticList li input[type="checkbox"]{
}
/* =======================================================================
-home_trendingShows.tmpl
+home_browseShows.tmpl
========================================================================== */
-.traktShowTitleIcons{
+.browse-add-show-holder{
float:right;
padding-right:4px;
padding-bottom:4px
}
-.traktContainer p{
+.browse-container p{
padding-top:2px
}
-.traktContainer p img{
+.browse-container p img{
position:relative;
top:-2px
}
-.traktContainer p, .traktContainer i{
+.browse-container p, .browse-container i{
white-space:nowrap;
font-size:12px;
overflow:hidden;
@@ -1080,15 +1080,16 @@ home_trendingShows.tmpl
margin:0
}
-.traktContainer{
- margin:12px;
+.browse-container{
+ margin:12px 12px 12px 0;
width:188px;
background-color:#DFDACF;
border:1px solid #111;
border-radius:6px
}
-.trakt-image{
+.browse-image{
+ display:block;
overflow:hidden;
height:273px;
width:186px;
@@ -1666,6 +1667,10 @@ td.col-search{
padding:15px 0 0
}
+#addShowForm #editShow.stepDiv span.component-desc{
+ width:639px
+}
+
/* =======================================================================
episodeView.tmpl
========================================================================== */
@@ -2098,6 +2103,36 @@ td.col-cache{
width:20px
}
+/* =======================================================================
+viewchanges.tmpl
+========================================================================== */
+#changes{
+ display:block;
+ padding:9.5px;
+ border-radius:4px 4px 4px 4px;
+ font:12px/13px "Open Sans",verdana,sans-serif
+}
+
+#changes .release{
+ margin:15px 5px 6px 0;
+ padding-bottom:3px;
+ border-bottom:1px solid gray
+}
+
+#changes .ver{font:16px/17px "Open Sans",verdana,sans-serif;margin-right:0.2em;}
+#changes .old{padding-top:15px}
+
+#changes div{margin:0 0 8px}
+#changes .btn-text{width:5em;margin-right:0.2em;float:left}
+#changes .change-text{display:block;margin-left:5.5em;padding-top:2px}
+
+.change-add{background-color:rgb(63,127,0)}
+.change-change{background-color:rgb(91,153,13)}
+.change-fix{background-color:rgb(38,114,182)}
+.change-port{background-color:rgb(102,102,102)}
+.change-remove{}
+.change-update{background-color:rgb(98,25,147)}
+
/* =======================================================================
config*.tmpl
@@ -2524,6 +2559,32 @@ div.metadataDiv .disabled{
margin:6px 4px 0 0
}
+#trakt-collection th,#trakt-collection td{
+ padding:3px 5px
+}
+
+#trakt-collection .col-1{
+ text-align:left
+}
+
+#trakt-collection th,#trakt-collection td.opt{
+ text-align:center
+}
+
+#trakt-collection .col-1{
+ width:192px
+}
+
+#config #trakt-collection input{
+ float:none;
+ margin:0;
+ vertical-align:middle
+}
+
+#config .trakt.component-desc{
+ margin-left:0
+}
+
/* =======================================================================
manage*.tmpl
========================================================================== */
@@ -2625,6 +2686,7 @@ span.path{
line-height:18px
}
+span.btn-text,
span.quality{
font:12px/13px "Open Sans", verdana, sans-serif;
background-image:-webkit-linear-gradient(top, rgba(255, 255, 255, 0.08),rgba(255, 255, 255, 0) 50%,rgba(0, 0, 0, 0) 50%,rgba(0, 0, 0, 0.25));
@@ -2970,6 +3032,10 @@ fieldset[disabled] .navbar-default .btn-link:focus{
display:inline
}
+#fileBrowserDialog .form-control{background-color:#f5f1e4}
+#fileBrowserDialog .form-control:active,
+#fileBrowserDialog .form-control:hover{background-color:#ffffca}
+
.btn{
display:inline-block;
*display:inline;
@@ -3486,7 +3552,7 @@ div.stepsguide{
div.stepsguide .step{
float:left;
- width:267px;
+ width:277px;
font:bold 24px Arial
}
@@ -3880,7 +3946,7 @@ jquery.confirm.css
box-shadow:inset 0 1px rgba(255, 255, 255, 0.1),inset 0 -1px 3px rgba(0, 0, 0, 0.3),inset 0 0 0 1px rgba(255, 255, 255, 0.08),0 1px 2px rgba(0, 0, 0, 0.15)
}
-#confirmBox .button:last-child{
+#confirmBox .button:last-child{
margin-right:0
}
diff --git a/gui/slick/images/notifiers/trakt.png b/gui/slick/images/notifiers/trakt.png
index a767eea4..e91f57f1 100644
Binary files a/gui/slick/images/notifiers/trakt.png and b/gui/slick/images/notifiers/trakt.png differ
diff --git a/gui/slick/images/providers/animenzb.png b/gui/slick/images/providers/animenzb.png
deleted file mode 100644
index 4fd6707b..00000000
Binary files a/gui/slick/images/providers/animenzb.png and /dev/null differ
diff --git a/gui/slick/images/providers/bitmetv.png b/gui/slick/images/providers/bitmetv.png
new file mode 100644
index 00000000..ce5b91ce
Binary files /dev/null and b/gui/slick/images/providers/bitmetv.png differ
diff --git a/gui/slick/images/providers/freshontv.png b/gui/slick/images/providers/freshontv.png
old mode 100755
new mode 100644
diff --git a/gui/slick/images/providers/funfile.png b/gui/slick/images/providers/funfile.png
new file mode 100644
index 00000000..7ee997be
Binary files /dev/null and b/gui/slick/images/providers/funfile.png differ
diff --git a/gui/slick/images/providers/hdspace.png b/gui/slick/images/providers/hdspace.png
new file mode 100644
index 00000000..60494603
Binary files /dev/null and b/gui/slick/images/providers/hdspace.png differ
diff --git a/gui/slick/images/providers/pretome.png b/gui/slick/images/providers/pretome.png
new file mode 100644
index 00000000..efcefc51
Binary files /dev/null and b/gui/slick/images/providers/pretome.png differ
diff --git a/gui/slick/images/providers/scenetime.png b/gui/slick/images/providers/scenetime.png
new file mode 100644
index 00000000..0982d8d5
Binary files /dev/null and b/gui/slick/images/providers/scenetime.png differ
diff --git a/gui/slick/images/providers/shazbat.png b/gui/slick/images/providers/shazbat.png
new file mode 100644
index 00000000..d1c3f9b6
Binary files /dev/null and b/gui/slick/images/providers/shazbat.png differ
diff --git a/gui/slick/images/providers/torrenting.png b/gui/slick/images/providers/torrenting.png
new file mode 100644
index 00000000..061df87d
Binary files /dev/null and b/gui/slick/images/providers/torrenting.png differ
diff --git a/gui/slick/images/providers/totv.png b/gui/slick/images/providers/totv.png
deleted file mode 100644
index c10e9ea5..00000000
Binary files a/gui/slick/images/providers/totv.png and /dev/null differ
diff --git a/gui/slick/images/providers/tvchaosuk.png b/gui/slick/images/providers/tvchaosuk.png
new file mode 100644
index 00000000..d6e968a7
Binary files /dev/null and b/gui/slick/images/providers/tvchaosuk.png differ
diff --git a/gui/slick/interfaces/default/apiBuilder.tmpl b/gui/slick/interfaces/default/apiBuilder.tmpl
index 750d5936..c3660035 100644
--- a/gui/slick/interfaces/default/apiBuilder.tmpl
+++ b/gui/slick/interfaces/default/apiBuilder.tmpl
@@ -8,8 +8,8 @@
sbRoot = "$sbRoot";
//-->
-
-
+
+
+
+ #end if
- *
-
-
-
+ *
+
+ #if 1 < $len($indexers)
+
+ #end if
+
+
-
* SickGear supports english episodes. The language choice is used for fetching show data and episode filenames
+
Enter show name, TVDB ID, IMDb Url, or IMDb ID. *SickGear supports english, language is used for show/episode data
#end if
@@ -107,9 +120,9 @@
#end if
-
-
+
+
-#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl')
\ No newline at end of file
+#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl')
diff --git a/gui/slick/interfaces/default/home_recommendedShows.tmpl b/gui/slick/interfaces/default/home_recommendedShows.tmpl
index 57aab215..f7883969 100644
--- a/gui/slick/interfaces/default/home_recommendedShows.tmpl
+++ b/gui/slick/interfaces/default/home_recommendedShows.tmpl
@@ -11,10 +11,10 @@
#import os.path
#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl")
-
-
-
-
+
+
+
+
#if $varExists('header')
- 