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

CC-1665: Scheduled stream rebroadcasting and recording 

-don't show delete button until a stream has been saved
This commit is contained in:
Martin Konecny 2012-08-17 17:29:17 -04:00
parent b3ef67e617
commit 398fbb04db
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/WebstreamController.php
View File

@ -27,6 +27,7 @@ class WebstreamController extends Zend_Controller_Action
$webstream->setDbName("Untitled Webstream");
$this->view->ws = new Application_Model_Webstream($webstream);
$this->view->action = "new";
$this->view->html = $this->view->render('webstream/webstream.phtml');
}
@ -41,6 +42,7 @@ class WebstreamController extends Zend_Controller_Action
$webstream = CcWebstreamQuery::create()->findPK($id);
$this->view->ws = new Application_Model_Webstream($webstream);
$this->view->action = "edit";
$this->view->html = $this->view->render('webstream/webstream.phtml');
}

2
airtime_mvc/application/views/scripts/webstream/webstream.phtml
View File

@ -1,6 +1,6 @@
<button id="ws_new" class="ui-button ui-widget ui-state-default" role="button" aria-disabled="false">New</button>
<?php if (isset($this->ws)) : ?>
<button id="ws_delete" class="ui-button ui-widget ui-state-default" role="button" aria-disabled="false">Delete</button>
<button id="ws_delete" class="ui-button ui-widget ui-state-default" <?php if ($this->action == "new"): ?>style="display:none;"<?php endif; ?> role="button" aria-disabled="false">Delete</button>
<?php endif; ?>
<?php if (isset($this->ws)) : ?>

4
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -360,7 +360,6 @@ var AIRTIME = (function(AIRTIME){
appendAddButton();
appendModAddButton();
removeButtonCheck();
}
//sets events dynamically for playlist entries (each row in the playlist)
@ -600,6 +599,9 @@ var AIRTIME = (function(AIRTIME){
var $ws_id = $("#ws_id");
$ws_id.attr("value", json.streamId);
var $ws_id = $("#ws_delete");
$ws_id.show();
//redraw the library to show the new webstream
redrawLib();
}