Merge branch 'saas' into saas-speedy

airtime_mvc/application/views/scripts/plupload/index.phtml

@@ -3,12 +3,11 @@
     font-size: 200px !important;
 }
 </style>
+<?php $upgradeLink = Application_Common_OsPath::getBaseDir() . "billing/upgrade"; ?>
 <?php if ($this->quotaLimitReached) { ?>
     <div class="errors quota-reached">
-    Disk quota exceeded. You cannot upload files until you
-        <a target="_parent" href=<?php $baseUrl = Application_Common_OsPath::getBaseDir(); echo $baseUrl . "billing/upgrade"?>>
-            upgrade your storage
-        </a>.
+    <?php printf(_pro("Disk quota exceeded. You cannot upload files until you %s upgrade your storage"),
+        "<a target=\"_parent\" href=$upgradeLink>");?></a>.
     </div>
 <?php 
 }

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

@@ -13,7 +13,16 @@
     </div>
     <h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("When") ?></h3>
     <div id="schedule-show-when" class="collapsible-content">
+        <?php
+        if (!$this->addNewShow) {
+            $this->when->getElement('add_show_timezone')->setOptions(array('disabled' => true));
+            ?>
+            <input type="hidden" name="add_show_timezone" id="add_show_timezone" value=<?php echo $this->when->getElement('add_show_timezone')->getValue()?>>
+        <?php
+        }
+        ?>
         <?php echo $this->when; ?>
+
         <?php echo $this->repeats; ?>
     </div>
     <h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("Live Stream Input") ?></h3>