Merge branch 'master' of dev.sourcefabric.org:campcaster

application/controllers/PlaylistController.php

@@ -88,10 +88,10 @@ class PlaylistController extends Zend_Controller_Action
 		$userInfo = Zend_Auth::getInstance()->getStorage()->read();
 
         $pl = new Playlist();
-        $pl_id = $pl->create("Untitled Playlist");
+        $pl->create("Untitled Playlist");
 		$pl->setPLMetaData('dc:creator', $userInfo->login);
 
-		$this->changePlaylist($pl_id);
+		$this->changePlaylist($pl->getId());
 		$form = new Application_Form_PlaylistMetadata();
 		$this->view->fieldset = $form;
         $this->view->form = $this->view->render('playlist/new.phtml');

application/controllers/ScheduleController.php

@@ -176,9 +176,9 @@ class ScheduleController extends Zend_Controller_Action
 
 
         if (strtotime($show->getShowStart()) <= strtotime($today_timestamp) &&
-                strtotime($today_timestamp) < strtotime($show->getShowEnd())) {
+                strtotime($today_timestamp) < strtotime($show->getShowEnd()) &&
+                $user->isAdmin()) {
             $menu[] = array('action' => array('type' => 'fn',
-                                              //'url' => '/Schedule/cancel-current-show'.$params,
                 'callback' => "window['confirmCancelShow']($id)"),
                 'title' => 'Cancel Current Show');
         }
@@ -319,6 +319,17 @@ class ScheduleController extends Zend_Controller_Action
         $showInstanceId = $this->_getParam('id');
 		$show = new ShowInstance($showInstanceId);
 
+        $originalShowId = $show->isRebroadcast();
+        if (!is_null($originalShowId)){
+            $originalShow = new ShowInstance($originalShowId);
+            $originalShowName = $originalShow->getName();
+            $originalShowStart = $originalShow->getShowStart();
+
+            $timestamp  = strtotime($originalShowStart);
+            $this->view->additionalShowInfo =
+                "Rebroadcast of show \"$originalShowName\" from "
+                .date("l, F jS", $timestamp)." at ".date("G:i", $timestamp);
+        }
 		$this->view->showContent = $show->getShowListContent();
         $this->view->dialog = $this->view->render('schedule/show-content-dialog.phtml');
         unset($this->view->showContent);

application/views/scripts/schedule/add-show-form.phtml

@@ -1,7 +1,7 @@
 <div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
     <div class="button-bar">
         <a href="#" id="add-show-close" class="icon-link"><span class="ui-icon ui-icon-circle-close"></span>Close</a>
-        <button aria-disabled="false" role="button" id="add-show-submit" class="right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary"> 
+        <button aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary"> 
             <span class="ui-icon ui-icon-plusthick"></span> 
             <span class="ui-button-text">Add this show</span> 
         </button>
@@ -30,5 +30,11 @@
     <div id="schedule-show-style" class="collapsible-content">
         <?php echo $this->style; ?>
     </div>
+    <div class="button-bar">
+        <button aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary"> 
+            <span class="ui-icon ui-icon-plusthick"></span> 
+            <span class="ui-button-text">Add this show</span> 
+        </button>
+    </div>
 </div>
 

application/views/scripts/schedule/show-content-dialog.phtml

@@ -1,4 +1,5 @@
 <div id="show_content_dialog">
+<div><?php echo $this->additionalShowInfo; ?></div>
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="datatable">
     <tr>
         <th>Start</th>

public/css/redmond/jquery-ui-1.8.8.custom.css

@@ -1085,7 +1085,7 @@ button.ui-button-icons-only {
 	padding-right: 2.1em;
 }
 /* no icon support for input elements, provide padding by default */
-input.ui-button, button.ui-button {
+input.ui-button {
 	padding: .4em 1em;
 }
 /*button icon element(s) */

public/js/airtime/schedule/add-show.js

@@ -181,8 +181,15 @@ function setAddShowEvents() {
             makeAddShowButton();
 		});
 
-	form.find("#add-show-submit")
+	form.find(".add-show-submit")
 		.click(function(event){
+            var addShowButton = $(this);
+            if (!addShowButton.hasClass("disabled")){
+                addShowButton.addClass("disabled");
+            } else {
+                return;
+            }
+
             event.preventDefault();
 
 			var data = $("form").serializeArray();
@@ -203,6 +210,7 @@ function setAddShowEvents() {
             var end_date = $("#add_show_end_date").val();
 
             $.post("/Schedule/add-show", {format: "json", data: data, hosts: hosts, days: days}, function(json){
+                addShowButton.removeClass("disabled");
                 if(json.form) {
                     $("#add-show-form")
                         .empty()