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 2011-11-10 23:55:33 -05:00
parent 9270ff01a2 03a81e642e
commit 901333bf6d
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/views/helpers/TrialRemaining.php
View File

@ -11,6 +11,6 @@ class Airtime_View_Helper_TrialRemaining extends Zend_View_Helper_Abstract
if($interval->format('%R') == '-'){
return "Trial expired.";
}
return $interval->format('%a days');
return $interval->format('%a');
}
}

24
airtime_mvc/application/views/scripts/partialviews/header.phtml
View File

@ -22,6 +22,7 @@
</div>
<div class="on-air-block">
<div class="on-air-info off" id="on-air-info">ON AIR</div>
<a href="#" class="listen-control-button"><span>Listen</span></a>
</div>
<div class="time-info-block">
<ul>
@ -30,21 +31,22 @@
<li class="time-zone"><span id="time-zone"></span></li>
</ul>
</div>
<div class="listen-control-block">
<a class="" href="#"><span>Listen</span></a>
</div>
<?php if($this->is_trial){?>
<div class="trial-info-block">
<ul>
<li>Trial remaining</li>
<li><?php echo $this->trial_remain?></li>
</ul>
</div>
<?php }?>
<div class="personal-block">
<ul>
<li><span class="name"><?php echo $this->user ?></span> | <a href="/Login/logout">Logout</a></li>
</ul>
</div>
<?php if($this->is_trial){?>
<div class="trial-box">
<p>Your Trial expires in</p>
<div class="trial-box-calendar">
<span class="trial-box-calendar-white"><?php echo $this->trial_remain?></span>
<div class="trial-box-calendar-gray">days</div>
</div>
<div class="trial-box-button">
<a title="Purchase your copy of Airtime" href="#">Keep going on</a>
</div>
</div>
<?php }?>
</div>
<div id="jquery_jplayer_1" class="jp-jplayer" style="width:0px; height:0px;"></div>

12
airtime_mvc/public/js/airtime/preferences/streamsetting.js
View File

@ -86,7 +86,15 @@ function checkLiquidsoapStatus(){
status = obj[key];
}
}
$("#s"+id+"Liquidsoap-error-msg-element").html(status);
var html
if(status == "OK"){
html = '<div class="stream-status status-good"><h3>Streaming server connection is working</h3></div>'
}else if(status == "N/A"){
html = '<div class="stream-status status-error"><h3>Cannot connect to the streaming server</h3><p>This stream is disabled</p></div>'
}else{
html = '<div class="stream-status status-error"><h3>Can not connect to the streaming server</h3><p>'+status+'</p></div>'
}
$("#s"+id+"Liquidsoap-error-msg-element").html(html);
}
});
}
@ -150,6 +158,6 @@ $(document).ready(function() {
})
showErrorSections()
setInterval('checkLiquidsoapStatus()', 5000)
setInterval('checkLiquidsoapStatus()', 7000)
});