monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-03 01:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/ChangeHelpAndInfoIcons' into develop

Browse source
This commit is contained in:
JackDandy 2014-11-15 06:32:43 +00:00
commit 71e546a0a6
8 changed files with 57 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -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)

27
gui/slick/css/dark.css
View file

@ -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;
}
/* =======================================================================

31
gui/slick/css/light.css
View file

@ -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;
}
/* =======================================================================

15
gui/slick/css/style.css
View file

@ -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;
}
/* =======================================================================

BIN
gui/slick/images/glyphicons-config-black.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.9 KiB

BIN
gui/slick/images/glyphicons-config-white.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8.6 KiB

BIN
gui/slick/images/glyphicons-config.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

46
gui/slick/interfaces/default/config.tmpl
View file

@ -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')
<h1 class="header">$header</h1>
#else
<h1 class="title">$title</h1>
#if $varExists('header')
<h1 class='header'>$header</h1>
#else
<h1 class='title'>$title</h1>
#end if
##set cpu_usage = $psutil.cpu_percent()
@ -31,24 +31,24 @@
<div id="config-content">
<table class="infoTable" cellspacing="1" border="0" cellpadding="0" width="100%">
<tr><td class="infoTableHeader">Version: </td><td class="infoTableCell">
<tr><td class="infoTableHeader">Version: </td><td class="infoTableCell">
#if $sickbeard.VERSION_NOTIFY
BRANCH: ($sickbeard.BRANCH) / COMMIT: ($sickbeard.CUR_COMMIT_HASH) <!-- &ndash; build.date //--><br />
BRANCH: ($sickbeard.BRANCH) / COMMIT: ($sickbeard.CUR_COMMIT_HASH) <!-- &ndash; build.date //--><br />
#else
You don't have version checking turned on. Please turn on "Check for Update" in Config > General.<br />
You don't have version checking turned on, see "Check software updates" in Config > General.<br />
#end if
<font color="red">You are using BETA software</font>
<em class="red-text">This is BETA software.</em>
</td></tr>
<tr><td class="infoTableHeader">Config file:</td><td class="infoTableCell">$sickbeard.CONFIG_FILE</td></tr>
<tr><td class="infoTableHeader">Database file:</td><td class="infoTableCell">$db.dbFilename()</td></tr>
<tr><td class="infoTableHeader">Cache Dir:</td><td class="infoTableCell">$sickbeard.CACHE_DIR</td></tr>
<tr><td class="infoTableHeader">Arguments:</td><td class="infoTableCell">$sickbeard.MY_ARGS</td></tr>
<tr><td class="infoTableHeader">Web Root:</td><td class="infoTableCell">$sickbeard.WEB_ROOT</td></tr>
<tr><td class="infoTableHeader">Python Version:</td><td class="infoTableCell">$sys.version[:120]</td></tr>
<tr class="infoTableSeperator"><td class="infoTableHeader"><i class="icon16-sb"></i> Homepage</td><td class="infoTableCell"><a href="<%= anon_url('https://github.com/SickGear/SickGear/wiki') %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">https://github.com/SickGear/SickGear/wiki</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-github"></i> Source</td><td class="infoTableCell"><a href="<%= anon_url('https://github.com/SickGear/SickGear/') %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">https://github.com/SickGear/SickGear/</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-mirc"></i> Internet Relay Chat</td><td class="infoTableCell"><a href="irc://irc.freenode.net/#SickGear" rel="noreferrer"><i>#SickGear</i> on <i>irc.freenode.net</i></a></td></tr>
<tr><td class="infoTableHeader">Config file:</td><td class="infoTableCell">$sickbeard.CONFIG_FILE</td></tr>
<tr><td class="infoTableHeader">Database file:</td><td class="infoTableCell">$db.dbFilename()</td></tr>
<tr><td class="infoTableHeader">Cache Dir:</td><td class="infoTableCell">$sickbeard.CACHE_DIR</td></tr>
<tr><td class="infoTableHeader">Arguments:</td><td class="infoTableCell"><%= (sickbeard.MY_ARGS, 'None used')[0 == len(sickbeard.MY_ARGS)] %></td></tr>
<tr><td class="infoTableHeader">Web Root:</td><td class="infoTableCell">$sickbeard.WEB_ROOT</td></tr>
<tr><td class="infoTableHeader">Python Version:</td><td class="infoTableCell">$sys.version[:120]</td></tr>
<tr class="infoTableSeperator"><td class="infoTableHeader"><i class="icon16-sg"></i> Homepage</td><td class="infoTableCell"><a href="<%= anon_url('https://github.com/SickGear/SickGear/wiki') %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">https://github.com/SickGear/SickGear/wiki</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-github"></i> Source</td><td class="infoTableCell"><a href="<%= anon_url('https://github.com/SickGear/SickGear/') %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">https://github.com/SickGear/SickGear/</a></td></tr>
<tr><td class="infoTableHeader"><i class="icon16-mirc"></i> Internet Relay Chat</td><td class="infoTableCell"><a href="irc://irc.freenode.net/#SickGear" rel="noreferrer"><i>#SickGear</i> on <i>irc.freenode.net</i></a></td></tr>
</table>
</div>
#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')