Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas

airtime_mvc/application/forms/helpers/CustomDecorators.php

@@ -12,4 +12,18 @@ class Airtime_Decorator_SuperAdmin_Only extends Zend_Form_Decorator_Abstract
             return "";
         }
     }
+}
+
+/** Hide a Zend_Form_Element unless you're logged in as an Admin or SuperAdmin. */
+class Airtime_Decorator_Admin_Only extends Zend_Form_Decorator_Abstract
+{
+    public function render($content)
+    {
+        $currentUser = Application_Model_User::getCurrentUser();
+        if ($currentUser->isSuperAdmin() || $currentUser->isAdmin()) {
+            return $content;
+        } else {
+            return "";
+        }
+    }
 }

airtime_mvc/public/css/styles.css

@@ -484,7 +484,7 @@ fieldset.plain {
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;
 }
 
-input[readonly]{
+input[readonly], textarea[readonly] {
     background-color:#b1b1b1
 }
 

airtime_mvc/public/js/airtime/showbuilder/builder.js

@@ -468,9 +468,11 @@ var AIRTIME = (function(AIRTIME){
                 }
                 
                 a = oData.ColReorder;
-                for (i = 0, length = a.length; i < length; i++) {   
+                if (a) {
-                    if (typeof(a[i]) === "string") {
+                    for (i = 0, length = a.length; i < length; i++) {
-                        a[i] = parseInt(a[i], 10);
+                        if (typeof(a[i]) === "string") {
+                            a[i] = parseInt(a[i], 10);
+                        }
                     }
                 }