monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-22 09:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #579 from adam111316/feature/ChangeHelpInfo

Browse source 
Change to always display branch and commit hash on 'Help & Info' page
This commit is contained in:
adam111316 2015-12-03 21:19:40 +08:00
commit 6413aec41d
2 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -94,6 +94,7 @@
* Fix failure to search for more than one selected wanted episode * 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 * 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 position of parsed qualities to the start of log lines
* Change to always display branch and commit hash on 'Help & Info' page
[develop changelog] [develop changelog]
* Enable Alpha Ratio again now that the secure login page over https is fixed * Enable Alpha Ratio again now that the secure login page over https is fixed

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

@ -8,36 +8,23 @@
#set global $sbPath = '..' #set global $sbPath = '..'
#set global $topmenu = 'config' #set global $topmenu = 'config'
#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')
##
#if $varExists('header') #if $varExists('header')
<h1 class='header'>$header</h1> <h1 class='header'>$header</h1>
#else #else
<h1 class='title'>$title</h1> <h1 class='title'>$title</h1>
#end if #end if
##set cpu_usage = $psutil.cpu_percent()
##set ram = $psutil.phymem_usage()
##set ram_total = $ram.total / 2**20
##set ram_used = $ram.used / 2**20
##set ram_free = $ram.free / 2**20
##set ram_percent_used = $ram.percent
##set disk = $psutil.disk_usage('/')
##set disk_total = $disk.total / 2**30
##set disk_used = $disk.used / 2**30
##set disk_free = $disk.free / 2**30
##set disk_percent_used = $disk.percent
## ##
<div id="config-content"> <div id="config-content">
<table class="infoTable" cellspacing="1" border="0" cellpadding="0" width="100%"> <table class="infoTable" cellspacing="1" border="0" cellpadding="0" width="100%">
<tr> <tr>
<td class="infoTableHeader">Version: </td> <td class="infoTableHeader">Version: </td>
<td class="infoTableCell"> <td class="infoTableCell">
#if $sickbeard.VERSION_NOTIFY BRANCH: #echo $sickbeard.BRANCH or 'UNKNOWN'# / COMMIT: #echo $sickbeard.CUR_COMMIT_HASH or 'UNKNOWN'#<br />
BRANCH: ($sickbeard.BRANCH) / COMMIT: ($sickbeard.CUR_COMMIT_HASH) <!-- &ndash; build.date //--><br /> <em class="red-text">This is BETA software</em><br />
#else #if not $sickbeard.VERSION_NOTIFY:
You don't have version checking turned on, see "Check software updates" in Config > General.<br /> You don't have version checking turned on, see "Check software updates" in Config > General.
#end if #end if
<em class="red-text">This is BETA software.</em>
</td> </td>
</tr> </tr>
<tr><td class="infoTableHeader">Config file:</td><td class="infoTableCell">$sickbeard.CONFIG_FILE</td></tr> <tr><td class="infoTableHeader">Config file:</td><td class="infoTableCell">$sickbeard.CONFIG_FILE</td></tr>