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

Conflicts:
	python_apps/show-recorder/install/recorder-daemontools.sh

application/controllers/UserController.php

@@ -23,6 +23,8 @@ class UserController extends Zend_Controller_Action
         $this->view->headScript()->appendFile('/js/airtime/user/user.js','text/javascript');
         $request = $this->getRequest();
         $form = new Application_Form_AddUser();
+
+        $this->view->successMessage = "";
  
         if ($request->isPost()) {
             if ($form->isValid($request->getPost())) {  
@@ -42,6 +44,12 @@ class UserController extends Zend_Controller_Action
                     $user->save();
                     
                     $form->reset();
+
+                    if (strlen($formdata['user_id']) == 0){
+                        $this->view->successMessage = "<div class='success'>User added successfully!</div>";
+                    } else {
+                        $this->view->successMessage = "<div class='success'>User updated successfully!</div>";
+                    }
                 }
             }
         }

application/forms/AddUser.php

@@ -72,9 +72,9 @@ class Application_Form_AddUser extends Zend_Form
         $select->setAttrib('class', 'input_select');
         $select->setAttrib('style', 'width: 40%');
         $select->setMultiOptions(array(
-                "G" => "guest",
-                "H" => "host",
-                "A" => "admin"
+                "G" => "Guest",
+                "H" => "Host",
+                "A" => "Admin"
             ));
         $select->setRequired(true);
         $this->addElement($select);

application/views/scripts/partialviews/header.phtml

@@ -14,7 +14,7 @@
       <div class="now-playing-info show">
         <div class="recording-show" style="display: none;"></div>
         <span id="playlist"></span>
-        <span class="lenght">00:00</span>
+        <span id="show-length" class="show-length"></span>
       </div>
       <div class="progressbar">
         <div class="progress-show" id='progress-show' style="width:0%;"></div>

application/views/scripts/user/add-user.phtml

@@ -26,6 +26,7 @@
         </div>
       </div>
       <div class="user-data simple-formblock" id="user_details">
+      <?php echo $this->successMessage ?>
 	  <fieldset class="padded">
       <?php echo $this->form ?>
       </fieldset>