diff --git a/CHANGES.md b/CHANGES.md index 39d29dbf..ac2524a2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -94,6 +94,7 @@ * 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 [develop changelog] * Enable Alpha Ratio again now that the secure login page over https is fixed diff --git a/gui/slick/interfaces/default/config.tmpl b/gui/slick/interfaces/default/config.tmpl index 71478149..60434a68 100644 --- a/gui/slick/interfaces/default/config.tmpl +++ b/gui/slick/interfaces/default/config.tmpl @@ -8,36 +8,23 @@ #set global $sbPath = '..' #set global $topmenu = 'config' #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') - +## #if $varExists('header')

$header

#else

$title

#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 ##
Version: -#if $sickbeard.VERSION_NOTIFY - BRANCH: ($sickbeard.BRANCH) / COMMIT: ($sickbeard.CUR_COMMIT_HASH)
-#else - You don't have version checking turned on, see "Check software updates" in Config > General.
+ BRANCH: #echo $sickbeard.BRANCH or 'UNKNOWN'# / COMMIT: #echo $sickbeard.CUR_COMMIT_HASH or 'UNKNOWN'#
+ This is BETA software
+#if not $sickbeard.VERSION_NOTIFY: + You don't have version checking turned on, see "Check software updates" in Config > General. #end if - This is BETA software.
Config file:$sickbeard.CONFIG_FILE