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

Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder

This commit is contained in:
drigato 2015-08-18 07:46:39 -04:00
parent 38022f4ff0 4adb9cc55a
commit d30e32c2d3
12 changed files with 73 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/forms/EditAudioMD.php
View File

@ -172,7 +172,7 @@ class Application_Form_EditAudioMD extends Zend_Form
// Add the submit button // Add the submit button
$this->addElement('button', 'editmdsave', array( $this->addElement('button', 'editmdsave', array(
'ignore' => true, 'ignore' => true,
'class' => 'btn btn-small md-save', 'class' => 'btn md-save right-floated',
'label' => _('Save'), 'label' => _('Save'),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
@ -182,7 +182,7 @@ class Application_Form_EditAudioMD extends Zend_Form
// Add the submit button // Add the submit button
$this->addElement('button', 'editmdcancel', array( $this->addElement('button', 'editmdcancel', array(
'ignore' => true, 'ignore' => true,
'class' => 'btn btn-small md-cancel', 'class' => 'btn md-cancel right-floated',
'label' => _('Cancel'), 'label' => _('Cancel'),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'

4
airtime_mvc/application/views/scripts/form/daterange.phtml
View File

@ -3,7 +3,7 @@
<?php echo $this->element->getElement('his_time_start') ?> <?php echo $this->element->getElement('his_time_start') ?>
<?php echo $this->element->getElement('his_date_end') ?> <?php echo $this->element->getElement('his_date_end') ?>
<?php echo $this->element->getElement('his_time_end') ?> <?php echo $this->element->getElement('his_time_end') ?>
<div id="his_submit" class="ui-button ui-state-default" title="<?php echo _("Filter History")?>"> <div id="his_submit" class=" btn btn-small" title="<?php echo _("Filter History")?>">
<span class="ui-icon ui-icon-search"></span> <i class="icon-white icon-search"></i><span><?php echo _("Filter History")?></span>
</div> </div>
</div> </div>

11
airtime_mvc/application/views/scripts/listenerstat/index.phtml
View File

@ -1,13 +1,16 @@
<div id="listenerstat_content" class="ui-widget ui-widget-content block-shadow alpha-block padded"> <div id="listenerstat_content" class="ui-widget ui-widget-content block-shadow alpha-block padded">
<?php echo _("Listener Count Over Time")?><br> <H2><?php echo _("Listeners")?></H2>
<div id="flot_placeholder" style="width:600px;height:300px;margin:0px 50px 0px 50px"></div> <div id="flot_placeholder" style="width:600px;height:300px;margin:0px 50px 0px 50px"></div>
<div id="legend" style="width:600px;height:70px;margin:0px 50px 0px 50px"></div> <div id="legend" style="width:600px;height:70px;margin:0px 50px 0px 50px"></div>
<div id="date_form" style="float:left; margin:0px 50px 0px 50px"><?php echo $this->date_form; ?></div> <div id="date_form" style="float:left; margin:0px 0px">
<h3 style="padding-left: 0px">Date Range</h3>
<?php echo $this->date_form; ?>
</div>
<div id="errorStatus" style="float:right; width: 400px"> <div id="errorStatus" style="float:right; width: 400px">
<h3><?php echo _("Stream Data Collection Status")?></h3>
<fieldset class="padded stream-setting-global"> <fieldset class="padded stream-setting-global">
<legend><?php echo _("Status")?></legend>
<?php foreach ($this->errorStatus as $k=>$v) {?> <?php foreach ($this->errorStatus as $k=>$v) {?>
<div class='stream-status <?php echo ($v == 'OK')? 'status-good' : 'status-error' ?>'><h3><?php echo $k?>: <?php echo $v?></h3></div> <div class='stream-status <?php echo ($v == 'OK')? 'status-good' : 'status-error' ?>'><p><?php echo $k?>: <?php echo $v?></p></div>
<?php }?> <?php }?>
</fieldset> </fieldset>
</div> </div>

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

@ -1,5 +1,5 @@
<div id="master-panel"> <div id="master-panel">
<div class="logo"></div> <img class="logo" src="/css/images/airtime_logo_med.png">
<div class="now-playing-block"> <div class="now-playing-block">
<div class="text-row"><strong><?php echo _("Previous:"); ?></strong> <span id='previous'></span> <span id='prev-length'></span></div> <div class="text-row"><strong><?php echo _("Previous:"); ?></strong> <span id='previous'></span> <span id='prev-length'></span></div>
<div class="now-playing-info song"> <div class="now-playing-info song">

5
airtime_mvc/application/views/scripts/playlist/_playlist.phtml
View File

@ -58,8 +58,11 @@ if (isset($this->obj)) {
echo $this->render('playlist/update.phtml') ?> echo $this->render('playlist/update.phtml') ?>
</ul> </ul>
<div class="btn-toolbar spl-no-margin clearfix"> <div class="btn-toolbar spl-no-margin clearfix">
<div class="btn-group pull-right">
<button class="btn" type="button" id="cancel_button" name="submit"><?php echo _("Cancel") ?></button>
</div>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<button class="btn btn-inverse" title='<?php echo _("Save playlist") ?>' type="button" id="save_button"><?php echo _("Save") ?></button> <button class="btn" title='<?php echo _("Save playlist") ?>' type="button" id="save_button"><?php echo _("Save") ?></button>
</div> </div>
</div> </div>

5
airtime_mvc/application/views/scripts/playlist/_smart-block.phtml
View File

@ -59,8 +59,11 @@ if (isset($this->obj)) {
echo $this->render('playlist/update.phtml') ?> echo $this->render('playlist/update.phtml') ?>
</ul> </ul>
<div class="btn-toolbar spl-no-margin clearfix"> <div class="btn-toolbar spl-no-margin clearfix">
<div class="btn-group pull-right">
<button class="btn" type="button" id="cancel_button" name="submit"><?php echo _("Cancel") ?></button>
</div>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<button class="btn btn-inverse" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button"><?php echo _("Save") ?></button> <button class="btn" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button"><?php echo _("Save") ?></button>
</div> </div>
</div> </div>

5
airtime_mvc/application/views/scripts/webstream/_webstream.phtml
View File

@ -35,7 +35,10 @@
<div class="btn-toolbar spl-no-margin clearfix"> <div class="btn-toolbar spl-no-margin clearfix">
<div class="btn-group pull-right"> <div class="btn-group pull-right">
<button class="btn btn-inverse" type="submit" id="webstream_save" name="submit"><?php echo _("Save") ?></button> <button class="btn" type="button" id="webstream_cancel" name="submit"><?php echo _("Cancel") ?></button>
</div>
<div class="btn-group pull-right">
<button class="btn" type="submit" id="webstream_save" name="submit"><?php echo _("Save") ?></button>
</div> </div>
</div> </div>

26
airtime_mvc/public/css/_showbuilder.css
View File

@ -567,23 +567,27 @@ li.ui-state-default {
padding: 4px; padding: 4px;
} }
#save_button, #webstream_save { /*#save_button, #webstream_save {*/
background: #ff5d1a; /*background: #ff5d1a;*/
color: #fff; /*color: #fff;*/
border-radius: 4px; /*border-radius: 4px;*/
font-size: 16px; /*font-size: 16px;*/
height: 38px; /*height: 38px;*/
width: 120px; /*width: 120px;*/
} /*}*/
#save_button:active, #webstream_save { /*#save_button:active, #webstream_save {*/
color: #fff !important; /*color: #fff !important;*/
} /*}*/
#save_button:focus, #webstream_save { #save_button:focus, #webstream_save {
outline-width: 0; outline-width: 0;
} }
#edit-md-dialog .zend_form dd:last-child {
width: 160px;
}
/* Smart Block Editor */ /* Smart Block Editor */
.btn-toolbar { .btn-toolbar {

4
airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css vendored
View File

@ -111,13 +111,13 @@
border: 1px solid #202020; border: 1px solid #202020;
border-top: 1px solid #353535; border-top: 1px solid #353535;
border-left: 1px solid #2a2a2a; border-left: 1px solid #2a2a2a;
background-color: #242424;
color: #e2e2e2;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.65); -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.65);
-moz-box-shadow: inset 0 0 6px rgba(0,0,0,.65); -moz-box-shadow: inset 0 0 6px rgba(0,0,0,.65);
box-shadow: inset 0 0 6px rgba(0,0,0,.65); box-shadow: inset 0 0 6px rgba(0,0,0,.65);
background-color: #242424;
color: #e2e2e2;
} }
.ui-widget-content a { .ui-widget-content a {

25
airtime_mvc/public/css/styles.css
View File

@ -47,8 +47,6 @@ h3 {
color: #efefef; color: #efefef;
padding: 10px; padding: 10px;
margin:0; margin:0;
background-color: #5E5E5E;
border-top:1px solid #9d9d9d;
} }
a, a:focus { a, a:focus {
outline:none; outline:none;
@ -62,6 +60,8 @@ select {
border:1px solid #9d9d9d; border:1px solid #9d9d9d;
} }
/* Fix for Firefox */ /* Fix for Firefox */
fieldset { fieldset {
clear: both; clear: both;
@ -70,8 +70,6 @@ fieldset {
.logo { .logo {
position: absolute; position: absolute;
float: left; float: left;
background: transparent url(images/airtime_logo_med.png) no-repeat 0 0;
height: 46px; height: 46px;
width: 120px; width: 120px;
left: 5px; left: 5px;
@ -1078,7 +1076,6 @@ fieldset {
border: 1px solid #222; border: 1px solid #222;
margin: 0; margin: 0;
padding: 0; padding: 0;
background-color: #333;
} }
fieldset.plain { fieldset.plain {
@ -1719,6 +1716,11 @@ h2#scheduled_playlist_name span {
width: 100%; width: 100%;
} }
#stream_form h3 {
background-color: #5E5E5E;
border-top:1px solid #9d9d9d;
}
.stream-setting-content dd.block-display { .stream-setting-content dd.block-display {
/*width: 60%;*/ /*width: 60%;*/
} }
@ -3533,7 +3535,6 @@ button.btn-icon-text > i.icon-white {
.wrapper { .wrapper {
position: absolute; position: absolute;
/*background: #242424;*/
top: 102px; top: 102px;
left: 130px; left: 130px;
right: 0; right: 0;
@ -3541,8 +3542,6 @@ button.btn-icon-text > i.icon-white {
padding: 5px 10px 40px; padding: 5px 10px 40px;
border: none; border: none;
background: #111;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
@ -3621,6 +3620,16 @@ button.btn-icon-text > i.icon-white {
width: 100%; width: 100%;
} }
#listenerstat_content .legendLabel
{
color: #d6d6d6;
}
.dashboard-btn { .dashboard-btn {
width: 50%; width: 50%;
} }
#his_submit {
height: 19px;
margin-top: -2px;
}

7
airtime_mvc/public/js/airtime/library/_spl.js
View File

@ -904,6 +904,11 @@ var AIRTIME = (function(AIRTIME){
}); });
$pl.find("#webstream_cancel, #cancel_button").on("click", function() {
var tabId = $pl.attr("tab-id");
$("li[tab-id=" + tabId + "] .lib_pl_close").click();
});
$lib.on("click", "#pl_edit", function() { $lib.on("click", "#pl_edit", function() {
openPlaylistPanel(); openPlaylistPanel();
$.ajax({ $.ajax({
@ -1154,7 +1159,7 @@ var AIRTIME = (function(AIRTIME){
mod.fnDelete = function(plid, tabId) { mod.fnDelete = function(plid, tabId) {
var url, id, lastMod, type, pl = (tabId === undefined) ? $pl : $('#pl-tab-content' + tabId); var url, id, lastMod, type, pl = (tabId === undefined) ? $pl : $('#pl-tab-content-' + tabId);
stopAudioPreview(); stopAudioPreview();
id = (plid === undefined) ? getId() : plid; id = (plid === undefined) ? getId() : plid;

9
airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
View File

@ -17,7 +17,6 @@ $(document).ready(function() {
var oRange = AIRTIME.utilities.fnGetScheduleRange(dateStartId, timeStartId, dateEndId, timeEndId); var oRange = AIRTIME.utilities.fnGetScheduleRange(dateStartId, timeStartId, dateEndId, timeEndId);
var start = oRange.start; var start = oRange.start;
var end = oRange.end; var end = oRange.end;
getDataAndPlot(start, end); getDataAndPlot(start, end);
}); });
}); });
@ -90,11 +89,12 @@ function plot(datasets){
tickSize = (lastTimestamp.getTime() - firstTimestamp.getTime())/1000/numOfTicks; tickSize = (lastTimestamp.getTime() - firstTimestamp.getTime())/1000/numOfTicks;
plot = $.plot($("#flot_placeholder"), data, { plot = $.plot($("#flot_placeholder"), data, {
yaxis: { min: 0, tickDecimals: 0 }, yaxis: { min: 0, tickDecimals: 0, color: '#d6d6d6', tickColor: '#d6d6d6' },
xaxis: { mode: "time", timeformat:"%y/%m/%0d %H:%M", tickSize: [tickSize, "second"] }, xaxis: { mode: "time", timeformat:"%y/%m/%0d %H:%M", tickSize: [tickSize, "second"],
color: '#d6d6d6', tickColor: '#d6d6d6' },
grid: { grid: {
hoverable: true, hoverable: true,
backgroundColor: { colors: ["#888888", "#999999"] } backgroundColor: { colors: ["#333", "#555"] }
}, },
series: { series: {
lines: { lines: {
@ -106,6 +106,7 @@ function plot(datasets){
legend: { legend: {
container: $('#legend'), container: $('#legend'),
noColumns: 5, noColumns: 5,
color: '#c0c0c0',
labelFormatter: function (label, series) { labelFormatter: function (label, series) {
var cb = '<input style="float:left;" class="legendCB" type="checkbox" '; var cb = '<input style="float:left;" class="legendCB" type="checkbox" ';
if (series.data.length > 0){ if (series.data.length > 0){