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

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

Browse source
This commit is contained in:
drigato 2015-08-18 07:46:39 -04:00
commit d30e32c2d3
12 changed files with 73 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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_date_end') ?>
<?php echo $this->element->getElement('his_time_end') ?>
<div id="his_submit" class="ui-button ui-state-default" title="<?php echo _("Filter History")?>">
<span class="ui-icon ui-icon-search"></span>
<div id="his_submit" class=" btn btn-small" title="<?php echo _("Filter History")?>">
<i class="icon-white icon-search"></i><span><?php echo _("Filter History")?></span>
</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">
<?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="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">
<h3><?php echo _("Stream Data Collection Status")?></h3>
<fieldset class="padded stream-setting-global">
<legend><?php echo _("Status")?></legend>
<?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 }?>
</fieldset>
</div>

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

@ -1,5 +1,5 @@
<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="text-row"><strong><?php echo _("Previous:"); ?></strong> <span id='previous'></span> <span id='prev-length'></span></div>
<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') ?>
</ul>
<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'>
<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>

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') ?>
</ul>
<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'>
<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>

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-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>