Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2012-05-15 17:37:06 -04:00
parent 191de74bae c5b1e23486
commit 452c14fcb7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/ShowInstance.php
View File

@ -574,7 +574,7 @@ class Application_Model_ShowInstance {
{ {
$time = $this->_showInstance->getDbTimeFilled(); $time = $this->_showInstance->getDbTimeFilled();
if ($time != "00:00:00") { if ($time != "00:00:00" && $time != null && strcmp($time, '')!=0) {
$time_arr = explode(".", $time); $time_arr = explode(".", $time);
if (count($time_arr) > 1) { if (count($time_arr) > 1) {
$time_arr[1] = "." . $time_arr[1]; $time_arr[1] = "." . $time_arr[1];

5
airtime_mvc/public/js/airtime/dashboard/versiontooltip.js
View File

@ -6,11 +6,12 @@ function getContent() {
var link = getLatestLink(); var link = getLatestLink();
var msg = ""; var msg = "";
// See file airtime_mvc/application/views/helpers/VersionNotify.php for more info
if(isUpToDate()) { if(isUpToDate()) {
msg = "You are running the latest version"; msg = "You are running the latest version";
} else if(diff <= 1) { // new version is possible when major diff = 0 } else if (diff < 20) {
msg = "New version available: " + link; msg = "New version available: " + link;
} else if(diff == 2) { } else if (diff < 30) {
msg = "This version will soon be obsolete.<br/>Please upgrade to " + link; msg = "This version will soon be obsolete.<br/>Please upgrade to " + link;
} else { } else {
msg = "This version is no longer supported.<br/>Please upgrade to " + link; msg = "This version is no longer supported.<br/>Please upgrade to " + link;