From 32100e2d9b517ff3fee2d5bf75c889af81b533c5 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Wed, 12 Aug 2015 16:54:45 -0400
Subject: [PATCH] SAAS-948 - frontend tweaks

---
 airtime_mvc/application/common/UsabilityHints.php | 10 +++++-----
 airtime_mvc/public/css/_showbuilder.css           |  4 +---
 airtime_mvc/public/css/styles.css                 |  1 +
 airtime_mvc/public/js/airtime/common/common.js    |  4 ++++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/common/UsabilityHints.php b/airtime_mvc/application/common/UsabilityHints.php
index 594170cc5..517517f23 100644
--- a/airtime_mvc/application/common/UsabilityHints.php
+++ b/airtime_mvc/application/common/UsabilityHints.php
@@ -54,7 +54,7 @@ class Application_Common_UsabilityHints
             if ($userIsOnAddMediaPage) {
                 return _("Click the 'Add files' button and select files from your computer to upload.");
             } else {
-                return sprintf(_("It looks like you have not uploaded any audio files yet. %sUpload a file now.%s "),
+                return sprintf(_("It looks like you have not uploaded any audio files yet. %sUpload a file now%s."),
                     "<a href=\"/plupload\">",
                     "</a>");
             }
@@ -62,7 +62,7 @@ class Application_Common_UsabilityHints
             if ($userIsOnCalendarPage) {
                 return _("Click the 'Create New Show' button and fill out the required fields.");
             } else {
-                return sprintf(_("It looks like you don't have any shows scheduled. %sCreate a show now.%s"),
+                return sprintf(_("It looks like you don't have any shows scheduled. %sCreate a show now%s."),
                     "<a href=\"/schedule\">",
                     "</a>");
             }
@@ -73,13 +73,13 @@ class Application_Common_UsabilityHints
                     return _("To start broadcasting, first you need to cancel the current linked show by clicking on it and selecting 'Cancel Current Show'.");
                 } else {
                     return sprintf(_("Linked shows need to be filled with tracks before it starts. To start broadcasting cancel the current linked show and schedule an unlinked show.
-                    %sCreate an unlinked show now.%s"), "<a href=\"/schedule\">", "</a>");
+                    %sCreate an unlinked show now%s."), "<a href=\"/schedule\">", "</a>");
                 }
             } else {
                 if ($userIsOnCalendarPage) {
                     return _("To start broadcasting, click on the current show and select 'Add / Remove Content'");
                 } else {
-                    return sprintf(_("It looks like the current show needs more tracks. %sAdd tracks to your show now.%s"),
+                    return sprintf(_("It looks like the current show needs more tracks. %sAdd tracks to your show now%s."),
                         "<a href=\"/schedule\">",
                         "</a>");
                 }
@@ -88,7 +88,7 @@ class Application_Common_UsabilityHints
             if ($userIsOnCalendarPage) {
                 return _("Click on the show starting next and select 'Add / Remove Content'");
             } else {
-                return sprintf(_("It looks like the next show is empty. %sAdd tracks to your show now.%s"),
+                return sprintf(_("It looks like the next show is empty. %sAdd tracks to your show now%s."),
                     "<a href=\"/schedule\">",
                     "</a>");
             }
diff --git a/airtime_mvc/public/css/_showbuilder.css b/airtime_mvc/public/css/_showbuilder.css
index 84c900f17..d07fb869d 100644
--- a/airtime_mvc/public/css/_showbuilder.css
+++ b/airtime_mvc/public/css/_showbuilder.css
@@ -615,9 +615,7 @@ li.ui-state-default {
     margin: 0 4px;
 }
 
-/* Hacky */
-.smart-block-form + .btn-toolbar,
-.smart-block-form + .btn-toolbar + .btn-toolbar {
+.smart-block-form ~ .btn-toolbar {
     padding-top: 4px;
 }
 
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 886c99298..826b6187d 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -3422,6 +3422,7 @@ dd .stream-status {
     background-color: #ff611f;
     color: white;
     font-size: 14px;
+    text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.2);
 
     position: fixed;
     top: 139px;
diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js
index 988b87a11..3e6c86fe4 100644
--- a/airtime_mvc/public/js/airtime/common/common.js
+++ b/airtime_mvc/public/js/airtime/common/common.js
@@ -11,6 +11,10 @@ $(document).ready(function() {
     //    savePanelSpace: true
     //});
 
+    if($('#livechat-compact-container:not(:visible)')) {
+        $('.wrapper').css('padding-bottom', 10);
+    }
+
     //this statement tells the browser to fade out any success message after 5 seconds
     setTimeout(function(){$(".success").fadeOut("slow", function(){$(this).empty()});}, 5000);
     if ($('.usability_hint:visible')) {