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

Stream settings, Add Show form CSS revamp, etc.

Browse source
This commit is contained in:
Albert Santoni 2015-08-12 16:44:45 -04:00
parent 21250e91c4
commit 409e9e2a78
10 changed files with 58 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
View file

@ -1,5 +1,5 @@
<fieldset class="padded stream-setting-global" style="margin-top: 15px">
<legend><?php echo _("Input Stream Settings") ?></legend>
<h3><?php echo _("Live Broadcasting") ?></h3>
<fieldset class="padded stream-setting-global">
<dl class="zend_form">
<?php echo $this->element->getElement('auto_transition')->render() ?>
<span class="icecast_metadata_help_icon" id="auto_transition_help"></span>

4
airtime_mvc/application/views/scripts/playouthistorytemplate/index.phtml
View file

@ -2,6 +2,7 @@
<div>
<div><h4><?php echo _("Log Sheet Templates") ?></h4></div>
<button id="new_item_template" class="btn"><?php echo _("New Log Sheet Template") ?></button>
<ul id="template_list">
<?php if (count($this->template_list) == 0): ?>
<li><?php echo _("No Log Sheet Templates") ?></li>
@ -28,11 +29,11 @@
</li>
<?php endforeach; ?>
</ul>
<button id="new_item_template" class="btn"><?php echo _("New Log Sheet Template") ?></button>
</div>
<br><br>
<div>
<div><h4><?php echo _("File Summary Templates") ?></h4></div>
<button id="new_file_template" class="btn"><?php echo _("New File Summary Template") ?></button>
<ul id="template_file">
<?php if (count($this->template_file) == 0): ?>
<li><?php echo _("No File Summary Templates") ?></li>
@ -59,6 +60,5 @@
</li>
<?php endforeach; ?>
</ul>
<button id="new_file_template" class="btn"><?php echo _("New File Summary Template") ?></button>
</div>
</div>

5
airtime_mvc/application/views/scripts/preference/stream-setting.phtml
View file

@ -7,8 +7,9 @@
<div style="clear:both"></div>
<?php echo $this->statusMsg;?>
<div style="float: left; margin-right: 10px; width: 490px; overflow: auto;">
<h3><?php echo _("Global") ?></h3>
<fieldset class="padded stream-setting-global">
<legend><?php echo _("Global Settings") ?></legend>
<dl class="zend_form">
<?php if($this->form->getElement('output_sound_device') != null){?>
<dt id="hardwareOut-label">
@ -102,8 +103,8 @@
<?php echo $this->form->getSubform('live_stream_subform'); ?>
</div>
<div style="float: left; width: 600px;">
<h3><?php echo _("Output Streams") ?></h3>
<fieldset class="padded">
<legend><?php echo _("Output Stream Settings") ?></legend>
<?php
// TODO: replace this with something that looks good
echo $this->form->getElement('customStreamSettings')->render();

2
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
View file

@ -1,7 +1,7 @@
<div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
<div class="button-bar">
<a href="#" id="add-show-close" class="icon-link add-show-close"><span class="ui-icon ui-icon-circle-close"></span><?php echo _("Close") ?></a>
<button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary btn btn-small">
<button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary btn btn-small">
<span class="ui-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span>
</button>