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

airtime_mvc/application/configs/ACL.php

@@ -62,6 +62,7 @@ $ccAcl->allow('G', 'index')
       ->allow('G', 'rest:show-image', 'get')
       ->allow('G', 'rest:media', 'get')
       ->allow('G', 'setup')
+      ->allow('G', 'embeddablewidgets')
       ->allow('H', 'soundcloud')
       ->allow('H', 'rest:show-image')
       ->allow('H', 'rest:media')
@@ -76,8 +77,6 @@ $ccAcl->allow('G', 'index')
       ->allow('A', 'user')
       ->allow('A', 'systemstatus')
       ->allow('A', 'preference')
-      ->allow('A', 'player')
-      ->allow('A', 'embeddablewidgets')
       ->allow('S', 'thank-you')
       ->allow('S', 'billing');
       

airtime_mvc/application/configs/constants.php

@@ -20,6 +20,7 @@ define('USER_MANUAL_URL'            , 'http://sourcefabric.booktype.pro/airtime-
 define('ABOUT_AIRTIME_URL'          , 'https://www.airtime.pro/support/');
 define('AIRTIME_TRANSIFEX_URL'      , 'https://www.transifex.com/projects/p/airtime/');
 define('WHMCS_PASSWORD_RESET_URL'   , 'https://account.sourcefabric.com/pwreset.php');
+define('SUPPORT_TICKET_URL'         , 'https://sourcefabricberlin.zendesk.com/hc/en-us/requests/new');
 
 define('LICENSE_VERSION'    , 'GNU AGPL v.3');
 define('LICENSE_URL'        , 'http://www.gnu.org/licenses/agpl-3.0-standalone.html');

airtime_mvc/application/configs/navigation.php

@@ -27,6 +27,7 @@ $pages = array(
         'module'     => 'default',
         'controller' => 'embeddablewidgets',
         'action'     => 'player',
+        'resource'   => 'embeddablewidgets',
         'title' => 'Widgets',
         'pages' => array(
             array(
@@ -152,11 +153,6 @@ $pages = array(
                 'action'     => 'help',
                 'resource'   =>    'dashboard'
             ),
-            array(
-                'label'      => _('Help Center'),
-                'uri'        => HELP_URL,
-                'target'     => "_blank"
-            ),
             array(
                 'label'      => _('FAQ'),
                 'uri'        => FAQ_URL,
@@ -167,6 +163,11 @@ $pages = array(
                 'uri'        => USER_MANUAL_URL,
                 'target'     => "_blank"
             ),
+            array(
+                'label'     => _('File a Support Ticket'),
+                'uri'       => SUPPORT_TICKET_URL,
+                'target'    => "_blank"
+            ),
             array(
                 'label'      => _(sprintf("Help Translate %s", PRODUCT_NAME)),
                 'uri'        => AIRTIME_TRANSIFEX_URL,

airtime_mvc/application/views/scripts/dashboard/help.phtml

@@ -8,6 +8,8 @@
     <li><h4><?php echo _("Schedule a show");?></h4>
         <?php echo _("Click on 'Calendar' in the navigation bar on the left. From there click the '+ New Show' button and fill out the required fields.")?></li>
     <li><h4><?php echo _("Add tracks to your show"); ?></h4>
+        <?php echo _("Click on your show in the calendar and select 'Schedule Show'. In the popup window drag tracks into your show."); ?>
+    </li>
 
 
 </ol>

airtime_mvc/public/css/addmedia.css

@@ -628,3 +628,11 @@ table#recent_uploads_table td
 	/*border-bottom: 6px solid #be2626;*/
 	/*transform: rotate(-90deg);*/
 }
+
+.dataTables_scrolling {
+	position: absolute;
+	bottom: 37px; /* 36 px is the size of the header/footer + 1px because there's no internal border */
+	top: 37px;
+	left: 0;
+	right: 0;
+}

airtime_mvc/public/css/dashboard.css

@@ -630,3 +630,10 @@ th.library_checkbox {
     border: none;
 }
 
+.dataTables_scrolling {
+    position: absolute;
+    bottom: 37px; /* 36 px is the size of the header/footer + 1px because there's no internal border */
+    top: 37px;
+    left: 0;
+    right: 0;
+}

airtime_mvc/public/css/styles.css

@@ -3841,10 +3841,4 @@ li .ui-state-hover {
     flex: 1;
 }
 
-.dataTables_scrolling {
-    position: absolute;
-    bottom: 37px; /* 36 px is the size of the header/footer + 1px because there's no internal border */
-    top: 37px;
-    left: 0;
-    right: 0;
-}
+