diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php index 6931f732b..deaddfca7 100644 --- a/airtime_mvc/application/controllers/WebstreamController.php +++ b/airtime_mvc/application/controllers/WebstreamController.php @@ -34,7 +34,8 @@ class WebstreamController extends Zend_Controller_Action $request = $this->getRequest(); Application_Model_Webstream::save($request); + + $this->view->statusMessage = "
Webstream saved.
"; - $this->view->x = "hi"; } } diff --git a/airtime_mvc/application/views/scripts/webstream/webstream.phtml b/airtime_mvc/application/views/scripts/webstream/webstream.phtml index a5b28bd08..7e3228d70 100644 --- a/airtime_mvc/application/views/scripts/webstream/webstream.phtml +++ b/airtime_mvc/application/views/scripts/webstream/webstream.phtml @@ -6,6 +6,7 @@ ws)) : ?> +

ws->getName(); ?> @@ -30,7 +31,6 @@
-
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 066351d49..8c256ca8b 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -521,13 +521,7 @@ var AIRTIME = (function(AIRTIME){ $fs.addClass("closed"); } }); - - $pl.on("click", "#webstream_cancel", function(){ - $("#side_playlist") - .empty() - .append("WHAT SHOULD I PUT HERE??!?!! :)"); - }) - + $pl.on("click", "#webstream_save", function(){ //get all fields and POST to server //description @@ -541,22 +535,13 @@ var AIRTIME = (function(AIRTIME){ var url = 'Webstream/save'; $.post(url, - {format: "json", description: description, url:streamurl, length: length, name: name}, - function(json){ - $("#side_playlist") - .empty() - .append("WHAT SHOULD I PUT HERE??!?!! :)"); - - /* - if (json.error !== undefined){ - playlistError(json); - } else { - setModified(json.modified); - textarea.val(json.description); - $pl.find("#fieldset-metadate_change").addClass("closed"); - redrawLib(); - } */ - }); + {format: "json", description: description, url:streamurl, length: length, name: name}, + function(json){ + var $status = $("#side_playlist .status"); + $status.html(json.statusMessage); + $status.show(); + setTimeout(function(){$status.fadeOut("slow", function(){$status.empty()})}, 5000); + }); } diff --git a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js index 05d6ef2cc..2e45ff323 100644 --- a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js @@ -485,14 +485,14 @@ function callback(data, type) { dt.fnStandingRedraw(); $('div[class="playlist_title"]').find("h4").html(json.blockLength); } - setTimeout('removeSuccessMsg()', 5000); + setTimeout(removeSuccessMsg, 5000); } } function removeSuccessMsg() { - var form = $('#smart-playlist-form'); - form.find('.success').text(''); - form.find('.success').hide(); + var $status = $('#smart-playlist-form').find('.success'); + + $status.fadeOut("slow", function(){$status.empty()}); } function appendAddButton() {