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

SAAS-712: UI Improvements

Browse source
This commit is contained in:
drigato 2015-04-09 09:43:15 -04:00
parent 78b2631980
commit 4429117f6a
6 changed files with 97 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/PlayerController.php
View file

@ -51,7 +51,7 @@ class PlayerController extends Zend_Controller_Action
$this->view->jquery = Application_Common_HTTPHelper::getStationUrl() . "js/libs/jquery-1.10.2.js";
$this->view->muses_swf = Application_Common_HTTPHelper::getStationUrl() . "js/airtime/player/muses.swf";
$this->view->metadata_api_url = Application_Common_HTTPHelper::getStationUrl() . "api/live-info";
$this->view->station_name = json_encode(Application_Model_Preference::GetStationName());
$this->view->player_title = json_encode($request->getParam('title'));
$stream = $request->getParam('stream');
$streamData = Application_Model_StreamSetting::getEnabledStreamData();

29
airtime_mvc/application/forms/Player.php
View file

@ -10,12 +10,23 @@ class Application_Form_Player extends Zend_Form_SubForm
array('ViewScript', array('viewScript' => 'form/player.phtml'))
));
/* We will use this option in the future
$displayTrackMetadata = new Zend_Form_Element_Checkbox('player_display_track_metadata');
$displayTrackMetadata->setValue(true);
$displayTrackMetadata->setLabel(_('Display track metadata?'));
$this->addElement($displayTrackMetadata);
*/
$displayTitle = new Zend_Form_Element_Checkbox('player_display_title');
$displayTitle->setValue(true);
$displayTitle->setLabel(_('Display title?'));
//$displayTitle->addDecorator('Label', array('placement' => 'APPEND'));
$displayTitle->setDecorators(array(
'ViewHelper',
'Errors',
'Label'
));
$displayTitle->addDecorator('Label', array('class' => 'player-checkbox', 'placement' => 'APPEND'));
$this->addElement($displayTitle);
$title = new Zend_Form_Element_Text('player_title');
$title->setValue(_('Now Playing'));
$title->setLabel(_('Title:'));
$title->removeDecorator('DtDdWrapper');
$this->addElement($title);
$streamMode = new Zend_Form_Element_Radio('player_stream_mode');
$streamMode->setLabel(_('Select Stream:'));
@ -59,11 +70,13 @@ class Application_Form_Player extends Zend_Form_SubForm
$streamURL->removeDecorator('label');
$this->addElement($streamURL);
$embedSrc = new Zend_Form_Element_Text('player_embed_src');
$embedSrc = new Zend_Form_Element_Textarea('player_embed_src');
$embedSrc->setAttrib("readonly", "readonly");
$embedSrc->setAttrib("class", "embed-player-text-box");
$embedSrc->setAttrib('cols', '40')
->setAttrib('rows', '4');
$embedSrc->setLabel(_("Embeddable code:"));
$embedSrc->setValue('<iframe frameborder="0" width="280" height="210" src="'.Application_Common_HTTPHelper::getStationUrl().'player?stream=auto"></iframe>');
$embedSrc->setValue('<iframe frameborder="0" width="280" height="210" src="'.Application_Common_HTTPHelper::getStationUrl().'player?stream=auto&title=Now Playing"></iframe>');
$this->addElement($embedSrc);
$previewLabel = new Zend_Form_Element_Text('player_preview_label');

6
airtime_mvc/application/views/scripts/form/player.phtml
View file

@ -9,10 +9,14 @@
</div>
<div id="player_instructions">
Customize the player by configuring the options below. Once you are happy with the player
Customize the player by configuring the options below. When you are done
copy the embeddable code below into your websites HTML.
</div>
<?php echo $this->element->getElement('player_display_title'); ?>
<?php echo $this->element->getElement('player_title')->render(); ?>
<?php echo $this->element->getElement('player_stream_mode')->render(); ?>
<?php echo $this->element->getElement('player_stream_url'); ?>

11
airtime_mvc/application/views/scripts/player/index.phtml
View file

@ -35,7 +35,7 @@
};
if (this.playerMode == "manual") {
this.settings.url = "<?php echo $this->streamURL ?>";
this.settings.url = '<?php echo $this->streamURL ?>';
this.settings.codec = "<?php echo $this->codec ?>";
} else if (this.playerMode == "auto") {
this.availableMobileStreamQueue = <?php echo $this->availableMobileStreams?>;
@ -48,7 +48,14 @@
// Create the Muses player object
MRP.insert(this.settings);
$("p.station_name").html("<?php echo $this->station_name?>");
// Configure player title
var player_title = <?php echo $this->player_title?>;
if (player_title === null) {
$(".airtime_header").hide();
$(".airtime_player").css('height', '150px');
} else {
$("p.station_name").html(player_title);
}
attachStreamMetadataToPlayer();