From 9218d76de97ef1ae3ec1c1877eb6a5fbf2d99c2d Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Wed, 18 Nov 2015 12:37:29 -0500
Subject: [PATCH] SAAS-1214 - add Connect with Soundcloud button; Fix nav
 styling in some browsers

---
 .../application/layouts/scripts/layout.phtml      |  3 +--
 .../views/scripts/library/publish-dialog.phtml    |  2 +-
 .../scripts/partialviews/dashboard-sub-nav.php    | 12 ++++--------
 airtime_mvc/public/css/styles.css                 | 15 ++++++++-------
 airtime_mvc/public/js/airtime/library/publish.js  | 12 ++++++++++--
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index e4033667e..e2c447221 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -82,8 +82,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
     <?php $subnavPrefix = "/showbuilder"; require_once APPLICATION_PATH . "views/scripts/partialviews/dashboard-sub-nav.php"; ?>
     <div class="media_type_selector dashboard_sub_nav" data-selection-id="<?php echo MediaType::PODCAST ?>">
         <a href="<?php echo $subnavPrefix; ?>#podcasts">
-            <i class='icon-headphones icon-white'></i>
-            <span class="selector-name"><?php echo _("Podcasts") ?></span>
+            <span class="selector-name"><i class='icon-headphones icon-white'></i><?php echo _("Podcasts") ?></span>
         </a>
     </div>
 
diff --git a/airtime_mvc/application/views/scripts/library/publish-dialog.phtml b/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
index 7c0ef13ea..2a3d01bbc 100644
--- a/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
@@ -21,7 +21,7 @@
                 <div class="publish-sources" ng-repeat="source in sources.toPublish">
                     <input ng-disabled="{{source.status == 2}}" ng-model="publishData[source.source]" type="checkbox" name="publish_sources" id="{{source.source}}">
                     <label class="source-name" for="{{source.source}}">{{source.label}}</label>
-                    <span ng-if="source.status == 2" style="margin: auto"><a href="<?php echo Application_Common_OsPath::getBaseDir() . 'preference#{{source.source}}-heading' ?>"><?php echo _("You aren't connected to this source.") ?></a></span>
+                    <span ng-if="source.status == 2" style="margin: auto" ng-bind-html="sourceConnectEnum[source.source]"></span>
                 </div>
                 <div ng-if="sources.toPublish.length == 0">
                     <?php echo _("You have already published this track to all available sources!") . "<br/>"
diff --git a/airtime_mvc/application/views/scripts/partialviews/dashboard-sub-nav.php b/airtime_mvc/application/views/scripts/partialviews/dashboard-sub-nav.php
index 6dd9214c6..f4bfec11b 100644
--- a/airtime_mvc/application/views/scripts/partialviews/dashboard-sub-nav.php
+++ b/airtime_mvc/application/views/scripts/partialviews/dashboard-sub-nav.php
@@ -1,24 +1,20 @@
 <div class="media_type_selector dashboard_sub_nav" data-selection-id="<?php echo MediaType::FILE ?>">
     <a href="<?php echo $subnavPrefix; ?>#tracks">
-        <i class='icon-music icon-white'></i>
-        <span class="selector-name"><?php echo _("Tracks") ?></span>
+        <span class="selector-name"><i class='icon-music icon-white'></i><?php echo _("Tracks") ?></span>
     </a>
 </div>
 <div class="media_type_selector dashboard_sub_nav" data-selection-id="<?php echo MediaType::PLAYLIST ?>">
     <a href="<?php echo $subnavPrefix; ?>#playlists">
-        <i class='icon-list icon-white'></i>
-        <span class="selector-name"><?php echo _("Playlists") ?></span>
+        <span class="selector-name"><i class='icon-list icon-white'></i><?php echo _("Playlists") ?></span>
     </a>
 </div>
 <div class="media_type_selector dashboard_sub_nav" data-selection-id="<?php echo MediaType::BLOCK ?>">
     <a href="<?php echo $subnavPrefix; ?>#smart-blocks">
-        <i class='icon-time icon-white'></i>
-        <span class="selector-name"><?php echo _("Smart Blocks") ?></span>
+        <span class="selector-name"><i class='icon-time icon-white'></i><?php echo _("Smart Blocks") ?></span>
     </a>
 </div>
 <div class="media_type_selector dashboard_sub_nav" data-selection-id="<?php echo MediaType::WEBSTREAM ?>">
     <a href="<?php echo $subnavPrefix; ?>#webstreams">
-        <i class='icon-random icon-white'></i>
-        <span class="selector-name"><?php echo _("Webstreams") ?></span>
+        <span class="selector-name"><i class='icon-random icon-white'></i><?php echo _("Webstreams") ?></span>
     </a>
 </div>
\ No newline at end of file
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 23b4f8eae..800f00629 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -2346,7 +2346,7 @@ span.errors.sp-errors{
     background:url(images/icon_finishedplaying_m.png) no-repeat 0 0;
 }
 .preferences {
-    width: 500px;
+    /*width: 500px;*/
     margin-bottom: 40px;
 }
 #preferences_header {
@@ -3590,12 +3590,13 @@ button.btn-icon-text > i.icon-white {
     overflow: auto;
 }
 
-#media_type_nav > div:not(#nav) {
-    -webkit-flex: 0 1 auto;
-    -moz-flex: 0 1 auto;
-    -ms-flex: 0 1 auto;
-    -o-flex: 0 1 auto;
-    flex: 0 1 auto;
+#media_type_nav > div:not(#nav),
+#media_type_nav > hr {
+    -webkit-flex: 0 0 auto;
+    -moz-flex: 0 0 auto;
+    -ms-flex: 0 0 auto;
+    -o-flex: 0 0 auto;
+    flex: 0 0 auto;
 }
 
 #media_type_nav .icon-white {
diff --git a/airtime_mvc/public/js/airtime/library/publish.js b/airtime_mvc/public/js/airtime/library/publish.js
index af7e41e47..acd85950b 100644
--- a/airtime_mvc/public/js/airtime/library/publish.js
+++ b/airtime_mvc/public/js/airtime/library/publish.js
@@ -12,11 +12,19 @@ var AIRTIME = (function (AIRTIME) {
     var dialogUrl = 'library/publish-dialog';
     var PUBLISH_APP_NAME = 'publish';
 
-
     //AngularJS app
     var publishApp = angular.module(PUBLISH_APP_NAME, [])
-        .controller('Publish', function ($scope, $http, mediaId, tab) {
+        .controller('Publish', function ($sce, $scope, $http, mediaId, tab) {
             $scope.publishData = {};
+            var isAdmin = userType == 'A' || userType == 'S';
+            // Javascript enum containing source connection HTML strings (ie. Connect with SoundCloud button)
+            $scope.sourceConnectEnum = Object.freeze({
+                soundcloud: isAdmin ? $sce.trustAsHtml(
+                    "<a href='" + baseUrl + "soundcloud/authorize' target='_blank'>" +
+                        "<img src='http://connect.soundcloud.com/2/btn-connect-sc-l.png'>" +
+                    "</a>"
+                ) : $sce.trustAsHtml($.i18n._("Ask your station administrator to connect to SoundCloud."))
+            });
             var sourceInterval;
 
             tab.contents.on("click", "input[type='checkbox']", function () {