diff --git a/CHANGES.md b/CHANGES.md index 64721e77..406ca978 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ * Change overhaul Config Anime to be in line with General Configuration * Remove output of source code line when warnings highlight libraries not used with IMDb * Add dropdown on Add Trending Shows to display all shows, shows not in library, or shows in library +* Change Help and Info icon sprites to color and text of Arguments if unused ### 0.3.0 (2014-11-12 14:30:00 UTC) diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index 594333cd..5b3636fc 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -1579,30 +1579,29 @@ select .selected { } [class^="icon16-"], [class*=" icon16-"] { - background-image: url("../images/glyphicons-config-white.png"); - background-position: -40px 0; - background-repeat: no-repeat; - display: inline-block; - height: 16px; - line-height: 16px; - vertical-align: text-top; - width: 16px; + 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; + background-position: 0 0; } .icon16-mirc { - background-position: -20px 0; + background-position: -26px 0; } -.icon16-sb { - background-position: -40px 0; +.icon16-sg { + background-position: -52px 0; } .icon16-web { - background-position: -60px 0; + background-position: -78px 0; } .icon16-win { - background-position: -80px 0; + background-position: -104px 0; } /* ======================================================================= diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css index e2cc2b76..e09067f5 100644 --- a/gui/slick/css/light.css +++ b/gui/slick/css/light.css @@ -1549,35 +1549,30 @@ select .selected { border-top: 1px dotted #666666; } -.infoTableHeader .icon16-sb { - background: url("../images/ico/favicon-16x16.png") 0 0 no-repeat; -} - [class^="icon16-"], [class*=" icon16-"] { - background-image: url("../images/glyphicons-config-black.png"); - background-position: -40px 0; - background-repeat: no-repeat; - display: inline-block; - height: 16px; - line-height: 16px; - vertical-align: text-top; - width: 16px; + 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; + background-position: 0 0; } .icon16-mirc { - background-position: -20px 0; + background-position: -26px 0; } -.icon16-sb { - background-position: -40px 0; +.icon16-sg { + background-position: -52px 0; } .icon16-web { - background-position: -60px 0; + background-position: -78px 0; } .icon16-win { - background-position: -80px 0; + background-position: -104px 0; } /* ======================================================================= diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index a5ca2119..5f902144 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -1631,30 +1631,29 @@ select .selected { } [class^="icon16-"], [class*=" icon16-"] { - background-image: url("../images/glyphicons-config-black.png"); - background-position: -40px 0; + background-image: url("../images/glyphicons-config.png"); background-repeat: no-repeat; display: inline-block; height: 16px; - line-height: 16px; vertical-align: text-top; width: 16px; + margin-top: 1px; } .icon16-github { background-position: 0 0; } .icon16-mirc { - background-position: -20px 0; + background-position: -26px 0; } -.icon16-sb { - background-position: -40px 0; +.icon16-sg { + background-position: -52px 0; } .icon16-web { - background-position: -60px 0; + background-position: -78px 0; } .icon16-win { - background-position: -80px 0; + background-position: -104px 0; } /* ======================================================================= diff --git a/gui/slick/images/glyphicons-config-black.png b/gui/slick/images/glyphicons-config-black.png deleted file mode 100644 index 53c24e48..00000000 Binary files a/gui/slick/images/glyphicons-config-black.png and /dev/null differ diff --git a/gui/slick/images/glyphicons-config-white.png b/gui/slick/images/glyphicons-config-white.png deleted file mode 100644 index bd3834c2..00000000 Binary files a/gui/slick/images/glyphicons-config-white.png and /dev/null differ diff --git a/gui/slick/images/glyphicons-config.png b/gui/slick/images/glyphicons-config.png new file mode 100644 index 00000000..3c1b55b8 Binary files /dev/null and b/gui/slick/images/glyphicons-config.png differ diff --git a/gui/slick/interfaces/default/config.tmpl b/gui/slick/interfaces/default/config.tmpl index 5fe80d18..b71dce72 100644 --- a/gui/slick/interfaces/default/config.tmpl +++ b/gui/slick/interfaces/default/config.tmpl @@ -3,18 +3,18 @@ #from sickbeard.helpers import anon_url #import os.path -#set global $title="Configuration" -#set global $header="Configuration" +#set global $title = 'Configuration' +#set global $header = 'Configuration' -#set global $sbPath=".." +#set global $sbPath = '..' -#set global $topmenu="config"# -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") +#set global $topmenu = 'config' +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') -#if $varExists('header') -

$header

-#else -

$title

+#if $varExists('header') +

$header

+#else +

$title

#end if ##set cpu_usage = $psutil.cpu_percent() @@ -31,24 +31,24 @@
- - - - - - - - - - + + + + + + + + +
Version: +
Version: #if $sickbeard.VERSION_NOTIFY - BRANCH: ($sickbeard.BRANCH) / COMMIT: ($sickbeard.CUR_COMMIT_HASH)
+ BRANCH: ($sickbeard.BRANCH) / COMMIT: ($sickbeard.CUR_COMMIT_HASH)
#else - You don't have version checking turned on. Please turn on "Check for Update" in Config > General.
+ You don't have version checking turned on, see "Check software updates" in Config > General.
#end if - You are using BETA software + This is BETA software.
Config file:$sickbeard.CONFIG_FILE
Database file:$db.dbFilename()
Cache Dir:$sickbeard.CACHE_DIR
Arguments:$sickbeard.MY_ARGS
Web Root:$sickbeard.WEB_ROOT
Python Version:$sys.version[:120]
Homepagehttps://github.com/SickGear/SickGear/wiki
Sourcehttps://github.com/SickGear/SickGear/
Internet Relay Chat#SickGear on irc.freenode.net
Config file:$sickbeard.CONFIG_FILE
Database file:$db.dbFilename()
Cache Dir:$sickbeard.CACHE_DIR
Arguments:<%= (sickbeard.MY_ARGS, 'None used')[0 == len(sickbeard.MY_ARGS)] %>
Web Root:$sickbeard.WEB_ROOT
Python Version:$sys.version[:120]
Homepagehttps://github.com/SickGear/SickGear/wiki
Sourcehttps://github.com/SickGear/SickGear/
Internet Relay Chat#SickGear on irc.freenode.net
-#include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl") +#include $os.path.join($sickbeard.PROG_DIR,'gui/slick/interfaces/default/inc_bottom.tmpl')