From f2fae3c67ef1f01c4cf3e1b852f1a5df5491071a Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Tue, 17 Nov 2015 16:39:29 -0500
Subject: [PATCH] SAAS-1195 - fix calendar error; use baseurl in all internal
 links; css tweaks

---
 airtime_mvc/application/forms/SoundCloudPreferences.php      | 2 --
 airtime_mvc/application/layouts/scripts/layout.phtml         | 4 ++--
 .../application/views/scripts/library/publish-dialog.phtml   | 2 +-
 .../application/views/scripts/partialviews/trialBox.phtml    | 2 +-
 airtime_mvc/public/css/station_podcast.css                   | 4 ++++
 airtime_mvc/public/js/airtime/library/library.js             | 5 +++--
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/forms/SoundCloudPreferences.php b/airtime_mvc/application/forms/SoundCloudPreferences.php
index d6478fbf0..987244ced 100644
--- a/airtime_mvc/application/forms/SoundCloudPreferences.php
+++ b/airtime_mvc/application/forms/SoundCloudPreferences.php
@@ -40,7 +40,6 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
 
         $this->addElement('image', 'SoundCloudConnect', array(
             'src'        => 'http://connect.soundcloud.com/2/btn-connect-sc-l.png',
-            'target'     => '_blank',
             'decorators' => array(
                 'ViewHelper'
             )
@@ -48,7 +47,6 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
 
         $this->addElement('image', 'SoundCloudDisconnect', array(
             'src'        => 'http://connect.soundcloud.com/2/btn-disconnect-l.png',
-            'target'     => '_blank',
             'decorators' => array(
                 'ViewHelper'
             )
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index 5c20ca575..e4033667e 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -66,7 +66,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
                 <a href="#"><?php echo _("Webstream") ?></a>
             </li>
         </ul>
-        <a href="/plupload">
+        <a href="<?php echo Application_Common_OsPath::getBaseDir() . 'plupload' ?>">
             <button id="add_media_btn" class="btn btn-small dashboard-btn btn-new">
                 <span><?php echo _("Upload") ?></span>
             </button>
@@ -74,7 +74,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
     </div>
 
     <div class="media_type_selector top-link" data-selection-id="<?php echo MediaType::getDefault(); ?>">
-        <a href="/showbuilder#">
+        <a href="<?php echo Application_Common_OsPath::getBaseDir() . 'showbuilder#' ?>">
             <i class='icon-home icon-white'></i>
             <?php echo _("Dashboard") ?>
         </a>
diff --git a/airtime_mvc/application/views/scripts/library/publish-dialog.phtml b/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
index 00fdc59b2..7c0ef13ea 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="/preference#{{source.source}}-heading"><?php echo _("You aren't connected to this source.") ?></a></span>
+                    <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>
                 </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/trialBox.phtml b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
index 087d2936e..7c7f7b7c9 100644
--- a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
@@ -6,7 +6,7 @@
            <div class="trial-box-calendar-gray"><?php echo _("days") ?></div>
       </div>
       <div class="trial-box-button">
-            <a title="<?php echo sprintf(_pro("Purchase an %s plan!"), SAAS_PRODUCT_BRANDING_NAME)?>" href="/billing/upgrade"><?php echo _pro("My Account") ?></a>
+            <a title="<?php echo sprintf(_pro("Purchase an %s plan!"), SAAS_PRODUCT_BRANDING_NAME)?>" href="<?php echo Application_Common_OsPath::getBaseDir() . 'billing/upgrade' ?>"><?php echo _pro("My Account") ?></a>
       </div>
   </div>
 <?php }?> 
diff --git a/airtime_mvc/public/css/station_podcast.css b/airtime_mvc/public/css/station_podcast.css
index a8b66924e..54b828d5d 100644
--- a/airtime_mvc/public/css/station_podcast.css
+++ b/airtime_mvc/public/css/station_podcast.css
@@ -13,6 +13,10 @@
     margin: 0;
 }
 
+#station_podcast .inner_editor_title button {
+    margin: 0 0 0 4px;
+}
+
 #station_podcast .collapsible-header {
     margin: 0 0 20px;
     top: 20px;
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index b2bc13168..dcbfddea3 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -1301,8 +1301,8 @@ var AIRTIME = (function(AIRTIME) {
         }
         var dt = $datatables[table],
             wrapper = $(dt).closest(".dataTables_wrapper");
-        if (oTable && typeof oTable.fnClearTable === 'function') {
-            oTable.fnClearTable(false);
+        if (dt && typeof dt.fnClearTable === 'function') {
+            dt.fnClearTable(false);
         }
         // Don't redraw if we're switching to another hash for the library table
         $.when(redraw ? dt.fnDraw() : function () {}).done(function () {
@@ -1489,6 +1489,7 @@ var AIRTIME = (function(AIRTIME) {
                     click: function () {
                         var episodes = mod.podcastEpisodeTableWidget.getSelectedRows();
                         AIRTIME.podcast.importSelectedEpisodes(episodes, mod.podcastEpisodeTableWidget);
+                        mod.podcastEpisodeTableWidget.clearSelection();
                     }
                 },
                 validateConstraints: function () {