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

Merge branch 'saas-showbuilder' into saas-showbuilder-contextmenus

Browse source
This commit is contained in:
Albert Santoni 2015-08-18 09:53:47 -04:00
commit a3a3d0a635
14 changed files with 121 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

22
airtime_mvc/application/configs/navigation.php
View file

@ -34,6 +34,12 @@ $pages = array(
'module' => 'default',
'controller' => 'Preference'
),
array(
'label' => _('My Profile'),
'controller' => 'user',
'action' => 'edit-user',
'resource' => 'user'
),
array(
'label' => _('Users'),
'module' => 'default',
@ -83,7 +89,21 @@ $pages = array(
'label' => _('Widgets'),
'module' => 'default',
'controller' => 'embeddablewidgets',
'action' => 'index'
'action' => 'player',
'pages' => array(
array(
'label' => _('Player'),
'module' => 'default',
'controller' => 'embeddablewidgets',
'action' => 'player',
),
array(
'label' => _('Weekly Schedule'),
'module' => 'default',
'controller' => 'embeddablewidgets',
'action' => 'schedule',
)
)
),
array(
'label' => _('Help'),

13
airtime_mvc/application/controllers/EmbeddablewidgetsController.php
View file

@ -8,8 +8,11 @@ class EmbeddableWidgetsController extends Zend_Controller_Action
}
public function indexAction()
public function playerAction()
{
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Widgets');
$CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir();
$this->view->headLink()->appendStylesheet($baseUrl.'css/player-form.css?'.$CC_CONFIG['airtime_version']);
@ -27,6 +30,14 @@ class EmbeddableWidgetsController extends Zend_Controller_Action
1. Enable at least one MP3, AAC, or OGG stream under System -> Streams<br>
2. Enable the Public Airtime API under System -> Preferences");
}
}
public function scheduleAction()
{
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Widgets');
$apiEnabled = Application_Model_Preference::GetAllow3rdPartyApi();
if (!$apiEnabled) {
$this->view->weekly_schedule_error_msg = _("To use the embeddable weekly schedule widget you must:<br><br>

3
airtime_mvc/application/controllers/UserController.php
View file

@ -125,6 +125,9 @@ class UserController extends Zend_Controller_Action
public function editUserAction()
{
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
session_start(); //Reopen session for writing.
$request = $this->getRequest();
$form = new Application_Form_EditUser();

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

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

5
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
View file

@ -120,10 +120,11 @@
<div class="wrapper" id="content">
<div id="sub-menu">
<?php echo $this->layout()->parent_page; ?>
<?php //parent_page is passed in from controller
echo $this->layout()->parent_page; ?>
<hr>
<?php
$page = $this->navigation()->findOneBy('label',$this->layout()->parent_page);
$page = $this->navigation()->findOneBy('label', $this->layout()->parent_page);
echo $this->navigation()->menu()->renderMenu($page);
?>
</div>

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

@ -1,47 +0,0 @@
<div id="widget-menu" class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong ">
<h2><?php echo _("Embeddable Widgets"); ?></h2>
<a href="#player-widget">Player</a>
<a href="#weekly-schedule-widget">Weekly Schedule</a>
</div>
<div id="player-widget" class="ui-widget ui-widget-content block-shadow simple-formblock embed-player-form clearfix padded-strong ">
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<form method="post" id="player_form" enctype="multipart/form-data">
<h2 style="float:left"><?php echo _("Player") ?></h2>
<div style="clear:both"></div>
<?php echo $this->player_error_msg; ?>
<?php echo $this->player_form; ?>
</form>
</div>
<br>
<div id="weekly-schedule-widget" class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong ">
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<h2 style="float:left"><?php echo _("Weekly Schedule") ?></h2>
<div style="clear:both"></div>
<div id="weekly-schedule-widget-error">
<?php echo $this->weekly_schedule_error_msg; ?>
</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 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>

12
airtime_mvc/application/views/scripts/embeddablewidgets/player.phtml Normal file
View file

@ -0,0 +1,12 @@
<div id="player-widget" class="ui-widget ui-widget-content block-shadow simple-formblock embed-player-form clearfix padded-strong ">
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<form method="post" id="player_form" enctype="multipart/form-data">
<h2 style="float:left"><?php echo _("Player") ?></h2>
<div style="clear:both"></div>
<?php echo $this->player_error_msg; ?>
<?php echo $this->player_form; ?>
</form>
</div>

29
airtime_mvc/application/views/scripts/embeddablewidgets/schedule.phtml Normal file
View file

@ -0,0 +1,29 @@
<div id="weekly-schedule-widget" class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong ">
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<h2 style="float:left"><?php echo _("Weekly Schedule") ?></h2>
<div style="clear:both"></div>
<div id="weekly-schedule-widget-error">
<?php echo $this->weekly_schedule_error_msg; ?>
</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 Application_Common_HTTPHelper::getStationUrl()."embed/weekly-program"?>></iframe>
</div>
<div style="clear:both"></div>
<label>Embeddable Code:</label>
<textarea style="width:98%" 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>
<div>
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>
</fieldset>
</div>

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>

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

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

2
airtime_mvc/public/css/styles.css
View file

@ -3387,7 +3387,7 @@ dd .stream-status {
#weekly-schedule-widget {
margin: 0 auto;
margin-bottom: 20px;
width: 50%;
width: 60%;
}
#widget-menu {

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() {
openPlaylistPanel();
$.ajax({
@ -1154,7 +1159,7 @@ var AIRTIME = (function(AIRTIME){
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();
id = (plid === undefined) ? getId() : plid;