Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2012-08-01 16:26:14 -04:00
parent 483ffdf6af 2ef4fd314c
commit bf0dcc9035
4 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,8 @@ class WebstreamController extends Zend_Controller_Action
$request = $this->getRequest(); $request = $this->getRequest();
Application_Model_Webstream::save($request); Application_Model_Webstream::save($request);
$this->view->statusMessage = "<div class='success'>Webstream saved.</div>";
$this->view->x = "hi";
} }
} }

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

@ -6,6 +6,7 @@
<?php if (isset($this->ws)) : ?> <?php if (isset($this->ws)) : ?>
<input id="ws_id" type="hidden" value="<?php echo $this->ws->getId(); ?>"></input> <input id="ws_id" type="hidden" value="<?php echo $this->ws->getId(); ?>"></input>
<input id="pl_lastMod" type="hidden" value="<?php echo $this->ws->getLastModified('U'); ?>"></input> <input id="pl_lastMod" type="hidden" value="<?php echo $this->ws->getLastModified('U'); ?>"></input>
<div class="status" style="display:none;"></div>
<div class="playlist_title"> <div class="playlist_title">
<h3 id="ws_name"> <h3 id="ws_name">
<a id="playlist_name_display" contenteditable="true"><?php echo $this->ws->getName(); ?></a> <a id="playlist_name_display" contenteditable="true"><?php echo $this->ws->getName(); ?></a>
@ -30,7 +31,6 @@
<input type="text" value="00h 20m"/> <input type="text" value="00h 20m"/>
</dd> </dd>
<dd id="submit-element" class="buttons"> <dd id="submit-element" class="buttons">
<input class="ui-button ui-state-default" type="submit" value="Cancel" id="webstream_cancel" name="cancel">
<input class="ui-button ui-state-default" type="submit" value="Save" id="webstream_save" name="submit"> <input class="ui-button ui-state-default" type="submit" value="Save" id="webstream_save" name="submit">
</dd> </dd>
</dl> </dl>

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

@ -521,13 +521,7 @@ var AIRTIME = (function(AIRTIME){
$fs.addClass("closed"); $fs.addClass("closed");
} }
}); });
$pl.on("click", "#webstream_cancel", function(){
$("#side_playlist")
.empty()
.append("WHAT SHOULD I PUT HERE??!?!! :)");
})
$pl.on("click", "#webstream_save", function(){ $pl.on("click", "#webstream_save", function(){
//get all fields and POST to server //get all fields and POST to server
//description //description
@ -541,22 +535,13 @@ var AIRTIME = (function(AIRTIME){
var url = 'Webstream/save'; var url = 'Webstream/save';
$.post(url, $.post(url,
{format: "json", description: description, url:streamurl, length: length, name: name}, {format: "json", description: description, url:streamurl, length: length, name: name},
function(json){ function(json){
$("#side_playlist") var $status = $("#side_playlist .status");
.empty() $status.html(json.statusMessage);
.append("WHAT SHOULD I PUT HERE??!?!! :)"); $status.show();
setTimeout(function(){$status.fadeOut("slow", function(){$status.empty()})}, 5000);
/* });
if (json.error !== undefined){
playlistError(json);
} else {
setModified(json.modified);
textarea.val(json.description);
$pl.find("#fieldset-metadate_change").addClass("closed");
redrawLib();
} */
});
} }

8
airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
View File

@ -485,14 +485,14 @@ function callback(data, type) {
dt.fnStandingRedraw(); dt.fnStandingRedraw();
$('div[class="playlist_title"]').find("h4").html(json.blockLength); $('div[class="playlist_title"]').find("h4").html(json.blockLength);
} }
setTimeout('removeSuccessMsg()', 5000); setTimeout(removeSuccessMsg, 5000);
} }
} }
function removeSuccessMsg() { function removeSuccessMsg() {
var form = $('#smart-playlist-form'); var $status = $('#smart-playlist-form').find('.success');
form.find('.success').text('');
form.find('.success').hide(); $status.fadeOut("slow", function(){$status.empty()});
} }
function appendAddButton() { function appendAddButton() {