Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SAAS-948 - frontend tweaks

Browse source
This commit is contained in:
Duncan Sommerville 2015-08-12 16:54:45 -04:00
parent 61d1e6bb50
commit 32100e2d9b
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/application/common/UsabilityHints.php
View file

@ -54,7 +54,7 @@ class Application_Common_UsabilityHints
if ($userIsOnAddMediaPage) { if ($userIsOnAddMediaPage) {
return _("Click the 'Add files' button and select files from your computer to upload."); return _("Click the 'Add files' button and select files from your computer to upload.");
} else { } 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 href=\"/plupload\">",
"</a>"); "</a>");
} }
@ -62,7 +62,7 @@ class Application_Common_UsabilityHints
if ($userIsOnCalendarPage) { if ($userIsOnCalendarPage) {
return _("Click the 'Create New Show' button and fill out the required fields."); return _("Click the 'Create New Show' button and fill out the required fields.");
} else { } 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 href=\"/schedule\">",
"</a>"); "</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'."); return _("To start broadcasting, first you need to cancel the current linked show by clicking on it and selecting 'Cancel Current Show'.");
} else { } 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. 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 { } else {
if ($userIsOnCalendarPage) { if ($userIsOnCalendarPage) {
return _("To start broadcasting, click on the current show and select 'Add / Remove Content'"); return _("To start broadcasting, click on the current show and select 'Add / Remove Content'");
} else { } 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 href=\"/schedule\">",
"</a>"); "</a>");
} }
@ -88,7 +88,7 @@ class Application_Common_UsabilityHints
if ($userIsOnCalendarPage) { if ($userIsOnCalendarPage) {
return _("Click on the show starting next and select 'Add / Remove Content'"); return _("Click on the show starting next and select 'Add / Remove Content'");
} else { } 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 href=\"/schedule\">",
"</a>"); "</a>");
} }

4
airtime_mvc/public/css/_showbuilder.css
View file

@ -615,9 +615,7 @@ li.ui-state-default {
margin: 0 4px; margin: 0 4px;
} }
/* Hacky */ .smart-block-form ~ .btn-toolbar {
.smart-block-form + .btn-toolbar,
.smart-block-form + .btn-toolbar + .btn-toolbar {
padding-top: 4px; padding-top: 4px;
} }

1
airtime_mvc/public/css/styles.css
View file

@ -3422,6 +3422,7 @@ dd .stream-status {
background-color: #ff611f; background-color: #ff611f;
color: white; color: white;
font-size: 14px; font-size: 14px;
text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.2);
position: fixed; position: fixed;
top: 139px; top: 139px;

4
airtime_mvc/public/js/airtime/common/common.js
View file

@ -11,6 +11,10 @@ $(document).ready(function() {
// savePanelSpace: true // 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 //this statement tells the browser to fade out any success message after 5 seconds
setTimeout(function(){$(".success").fadeOut("slow", function(){$(this).empty()});}, 5000); setTimeout(function(){$(".success").fadeOut("slow", function(){$(this).empty()});}, 5000);
if ($('.usability_hint:visible')) { if ($('.usability_hint:visible')) {