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

Merge branch 'saas-dev' into soundcloud

Browse source
This commit is contained in:
Duncan Sommerville 2015-06-15 11:03:37 -04:00
commit 706d7db2b2
20 changed files with 172 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
airtime_mvc/application/views/scripts/embed/weekly-program.phtml
View file

@ -39,11 +39,15 @@
$activeClass = $this->currentDayOfMonth == $data["dayOfMonth"] ? "active" : "";
echo "<div id='day-".$data["dayOfMonth"]."' class='schedule_item ".$activeClass."'>";
foreach ($data["shows"] as $show => $showData) {
echo "<div class='row'>";
echo "<div class='time_grid'>".$showData["show_start_hour"].' - '.$showData["show_end_hour"]."</div>";
echo "<div class='name_grid'>".$showData["name"]."</div>";
echo "</div>";
if (count($data["shows"]) == 0) {
echo "<div class='row empty-schedule'>Looks like there are no shows scheduled on this day.</div>";
} else {
foreach ($data["shows"] as $show => $showData) {
echo "<div class='row'>";
echo "<div class='time_grid'>" . $showData["show_start_hour"] . ' - ' . $showData["show_end_hour"] . "</div>";
echo "<div class='name_grid'>" . $showData["name"] . "</div>";
echo "</div>";
}
}
echo "</div>";
}?>

28
airtime_mvc/application/views/scripts/embeddablewidgets/index.phtml
View file

@ -1,5 +1,5 @@
<div id="widget-menu" class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong ">
<h2><?php echo _("Widgets:"); ?></h2>
<h2><?php echo _("Embeddable Widgets"); ?></h2>
<a href="#player-widget">Player</a>
<a href="#weekly-schedule-widget">Weekly Schedule</a>
</div>
@ -29,17 +29,19 @@
<?php echo $this->weekly_schedule_error_msg; ?>
</div>
<div id="weekly-schedule-widget-preview" <?php if (isset($this->weekly_schedule_error_msg)) echo "style=display:none"; ?>>
<label>Preview:</label>
<div class="blah">
<iframe id="schedule_iframe" height="400px" width="550px" scrolling="no" frameborder="0" src=<?php echo $this->stationUrl."embed/weekly-program"?>></iframe>
</div>
<fieldset class="padded">
<div id="weekly-schedule-widget-preview" <?php if (isset($this->weekly_schedule_error_msg)) echo "style=display:none"; ?>>
<label><?php echo _("Preview:") ?></label>
<div class="schedule_iframe_wrapper">
<iframe id="schedule_iframe" height="400px" width="550px" scrolling="no" frameborder="0" src=<?php echo $this->stationUrl."embed/weekly-program"?>></iframe>
</div>
<div style="clear:both"></div>
<label>Embeddable Code:</label>
<textarea style="width:100%" rows="3" readonly="readonly"><iframe height="400px" width="550px" scrolling="no" frameborder="0" src=<?php echo $this->stationUrl."embed/weekly-program"?>></iframe>
</textarea>
Copy this code and paste it into your website's HTML to embed the weekly schedule in your site.
Adjust the height and width attributes to your desired size.
</div>
<div style="clear:both"></div>
<label>Embeddable Code:</label>
<textarea style="width:100%" rows="3" readonly="readonly"><iframe height="400px" width="550px" scrolling="no" frameborder="0" src=<?php echo Application_Common_HTTPHelper::getStationUrl()."embed/weekly-program"?>></iframe>
</textarea>
Copy this code and paste it into your website's HTML to embed the weekly schedule in your site.
Adjust the height and width attributes to your desired size.
</div>
</fieldset>
</div>

15
airtime_mvc/application/views/scripts/index/index.phtml
View file

@ -9,13 +9,21 @@
echo "<a href='#' class='logo'><img src='data:image/png;base64," . $this->stationLogo . "'></a>";
} ?>
<div class="login-btn">
<a href="/login" target="_parent">
<span>Login</span>
<span class="login-img"></span>
</a>
</div>
<div id="tab-1" class="schedule tab_content current">
<iframe id="schedule_iframe" height="400px" scrolling="no" frameborder="0" src=<?php echo $this->stationUrl."embed/weekly-program?style=premium"?>></iframe>
</div>
<div id="tab-2" class="about_us tab_content">
<h1><?php echo $this->stationName ?></h1>
<p><?php echo $this->stationDescription ?></p>
<h1><?php echo $this->escape($this->stationName) ?></h1>
<p><?php echo $this->escape($this->stationDescription) ?></p>
</div>
<div id="tab-3" class="login tab_content">
@ -35,12 +43,11 @@
$(document).ready(function(){
$("#player_iframe").load(function () {
$("#player_iframe").contents().find('.bottom_bar').append("<a class='login_btn button' target='_parent' href='/login'></a>");
$("#player_iframe").contents().find('.bottom_bar').append("<div class='about_us_btn button' data-tab='tab-2'></div>");
$("#player_iframe").contents().find('.bottom_bar').append("<div class='schedule_btn button current' data-tab='tab-1'></div>");
$("#player_iframe").contents().find('.bottom_bar .button').not('.login_btn').click(function(){
$("#player_iframe").contents().find('.bottom_bar .button').click(function(){
var tab_id = $(this).attr('data-tab');
$("#player_iframe").contents().find('.bottom_bar .button').removeClass('current');

16
airtime_mvc/application/views/scripts/systemstatus/index.phtml
View file

@ -19,8 +19,9 @@
$r2 = array_reduce($externalServices, "booleanReduce", true);
$result = $r1 && $r2;
?>
<table width="60%" cellpadding="0" cellspacing="0" border="0" class="statustable">
<?php /* Disabling most of the status page for Airtime Pro
<thead>
<tr class="ui-state-default strong">
<td><?php echo _("Service") ?></td>
@ -64,7 +65,7 @@
<td class="solution <?php if ($postgres) {echo 'check';?>">
<?php
} else {
?>">
?>"
Try running <code>sudo apt-get install php5-pgsql</code>
<?php
}
@ -81,7 +82,7 @@
<td class="solution <?php if ($database) {echo 'check';?>">
<?php
} else {
?>">
?>"
Make sure you aren't missing any of the Postgres dependencies in the table above.
If your dependencies check out, make sure your database configuration settings in
<code>/etc/airtime.conf</code> are correct and the Airtime database was installed correctly.
@ -100,7 +101,7 @@
<td class="solution <?php if ($rabbitmq) {echo 'check';?>">
<?php
} else {
?>">
?>"
Make sure RabbitMQ is installed correctly, and that your settings in /etc/airtime/airtime.conf
are correct. Try using <code>sudo rabbitmqctl list_users</code> and <code>sudo rabbitmqctl list_vhosts</code>
to see if the airtime user (or your custom RabbitMQ user) exists, then checking that
@ -121,7 +122,7 @@
<td class="solution <?php if ($mediamonitor) {echo 'check';?>">
<?php
} else {
?>">
?>"
Check that the airtime-media-monitor service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>initctl list | grep airtime-media-monitor</code><br/>
@ -141,7 +142,7 @@
<td class="solution <?php if ($pypo) {echo 'check';?>">
<?php
} else {
?>">
?>"
Check that the airtime-playout service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>initctl list | grep airtime-playout</code><br/>
@ -161,7 +162,7 @@
<td class="solution <?php if ($liquidsoap) {echo 'check';?>">
<?php
} else {
?>">
?>"
Check that the airtime-liquidsoap service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>initctl list | grep airtime-liquidsoap</code><br/>
@ -171,6 +172,7 @@
?>
</td>
</tr>
*/?>
<tr id="partitions" class="even">
<th colspan="5"><?php echo _("Disk Space") ?></th>
</tr>