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

Mostly new graphics for the calendar page

Browse source
This commit is contained in:
Albert Santoni 2015-08-10 17:11:40 -04:00
parent a28df91c56
commit 849b8038ce
10 changed files with 60 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

11
airtime_mvc/application/controllers/LocaleController.php
View file

@ -232,10 +232,10 @@ class LocaleController extends Zend_Controller_Action
"Oct" => _("Oct"), "Oct" => _("Oct"),
"Nov" => _("Nov"), "Nov" => _("Nov"),
"Dec" => _("Dec"), "Dec" => _("Dec"),
"today" => _("today"), "Today" => _("Today"),
"day" => _("day"), "Day" => _("Day"),
"week" => _("week"), "Week" => _("Week"),
"month" => _("month"), "Month" => _("Month"),
"Sunday" => _("Sunday"), "Sunday" => _("Sunday"),
"Monday" => _("Monday"), "Monday" => _("Monday"),
"Tuesday" => _("Tuesday"), "Tuesday" => _("Tuesday"),
@ -390,7 +390,8 @@ class LocaleController extends Zend_Controller_Action
"No Show" => _("No Show"), "No Show" => _("No Show"),
"All" => _("All"), "All" => _("All"),
"Copied %s row%s to the clipboard" => _("Copied %s row%s to the clipboard"), "Copied %s row%s to the clipboard" => _("Copied %s row%s to the clipboard"),
"%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished." => _("%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished.") "%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished." => _("%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished."),
"New Show" => _("New Show")
); );
$this->view->layout()->disableLayout(); $this->view->layout()->disableLayout();
$this->_helper->viewRenderer->setNoRender(true); $this->_helper->viewRenderer->setNoRender(true);

2
airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml
View file

@ -6,7 +6,7 @@
<?php echo $this->element->getElement('custom_username')->render(); ?> <?php echo $this->element->getElement('custom_username')->render(); ?>
<?php echo $this->element->getElement('custom_password')->render(); ?> <?php echo $this->element->getElement('custom_password')->render(); ?>
</div> </div>
<fieldset> <fieldset id="add-show-show-source">
<legend><?php echo _("Show Source") ?></legend> <legend><?php echo _("Show Source") ?></legend>
<p class="input-settings-inline-p"> <p class="input-settings-inline-p">
<?php echo _("DJs can use these settings to connect with compatible software and broadcast live during this show. Assign a DJ below.") ?> <?php echo _("DJs can use these settings to connect with compatible software and broadcast live during this show. Assign a DJ below.") ?>

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

@ -667,7 +667,6 @@ textarea {
line-height: 28px; line-height: 28px;
font-size: 14px; font-size: 14px;
padding: 5px; padding: 5px;
color: #CCC;
} }
.datatable tr[class$='selected'] td, .datatable tr[class$='selected'] td,

21
airtime_mvc/public/css/add-show.css
View file

@ -45,7 +45,6 @@
#schedule-add-show dt, #schedule-add-show dt.big { #schedule-add-show dt, #schedule-add-show dt.big {
clear: left; clear: left;
color: #666666;
float: left; float: left;
font-size: 1.2em; font-size: 1.2em;
font-weight: bold; font-weight: bold;
@ -161,6 +160,11 @@ label.wrapp-label input[type="checkbox"] {
cursor: pointer; cursor: pointer;
} }
/* Hack for calendar page icons */
.icon-white {
margin-right: 4px;
}
/*
.add-button { .add-button {
border: 1px solid #5b5b5b; border: 1px solid #5b5b5b;
background-color: #767676; background-color: #767676;
@ -169,21 +173,13 @@ label.wrapp-label input[type="checkbox"] {
color: #ffffff; color: #ffffff;
margin:0; margin:0;
font-size:12px; font-size:12px;
/*font-weight:bold;*/
padding:4px 12px 4px 22px; padding:4px 12px 4px 22px;
text-decoration:none; text-decoration:none;
/*text-shadow: #000 0px -1px;*/
display:block; display:block;
float:left; float:left;
position:relative; position:relative;
} }
.add-button:hover {
border: 1px solid #000000;
background-color: #353535;
background: -moz-linear-gradient(top, #353535 0, #000000 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #353535), color-stop(100%, #000000));
color: #ffffff;
}
.add-button span { .add-button span {
position:absolute; position:absolute;
top:3px; top:3px;
@ -208,3 +204,8 @@ label.wrapp-label input[type="checkbox"] {
background: -moz-linear-gradient(top, #c7c7c7 0, #c7c7c7 100%); background: -moz-linear-gradient(top, #c7c7c7 0, #c7c7c7 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #c7c7c7), color-stop(100%, #c7c7c7)); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #c7c7c7), color-stop(100%, #c7c7c7));
} }
.ui-state-hover {
background: inherit;
}

14
airtime_mvc/public/css/fullcalendar.css
View file

@ -104,7 +104,6 @@ html .fc,
} }
/* Content /* Content
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
@ -167,8 +166,8 @@ html .fc,
.fc-button-content { .fc-button-content {
position: relative; position: relative;
float: left; float: left;
height: 1.9em; height: 1.4em;
line-height: 1.9em; line-height: 1.4em;
padding: 0 .6em; padding: 0 .6em;
white-space: nowrap; white-space: nowrap;
} }
@ -616,3 +615,12 @@ table.fc-border-separate {
} }
/** Prevent jQuery UI ui-widget-content box shadow from applying... */
.fc-view-month > table > tbody > tr > td.ui-widget-content,
.fc-agenda-days > tbody > tr > td.ui-widget-content,
.fc-agenda-slots > tbody > tr > td.ui-widget-content
{
box-shadow: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
}

4
airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css vendored
View file

@ -179,8 +179,8 @@
/* Interaction Cues /* Interaction Cues
----------------------------------*/ ----------------------------------*/
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {
border: 1px solid #65a539; border: 1px solid #ff5d1a;
background: #eff6eb url(images/ui-bg_flat_55_eff6eb_40x100.png) 50% 50% repeat-x; background: rgba(255, 93, 26, 0.1);
color: #65a539; color: #65a539;
} }
.ui-state-highlight a, .ui-widget-content .ui-state-highlight a, .ui-widget-header .ui-state-highlight a { .ui-state-highlight a, .ui-widget-content .ui-state-highlight a, .ui-widget-header .ui-state-highlight a {

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

@ -152,7 +152,6 @@ fieldset {
} }
.input-settings-inline-p { .input-settings-inline-p {
color: #4F4F4F;
font-size: 12px; font-size: 12px;
line-height: 140%; line-height: 140%;
margin-top: 0; margin-top: 0;
@ -1042,9 +1041,11 @@ button.ColVis_Button.ColVis_ShowAll {
/*----END Data Table----*/ /*----END Data Table----*/
fieldset { fieldset {
border: 1px solid #8f8f8f; border: 1px solid #222;
margin: 0; margin: 0;
padding: 0; padding: 0;
background-color: #333;
} }
fieldset.plain { fieldset.plain {
border: none; border: none;
@ -1880,7 +1881,7 @@ ul.errors {
ul.errors li, .warning { ul.errors li, .warning {
color:#902d2d; color:#902d2d;
font-size:11px; font-size:14px;
padding:2px 4px; padding:2px 4px;
background:#c6b4b4; background:#c6b4b4;
margin-bottom:2px; margin-bottom:2px;
@ -1917,12 +1918,11 @@ span.errors.sp-errors{
} }
.collapsible-header, .collapsible-header-disabled { .collapsible-header, .collapsible-header-disabled {
border: 1px solid #8f8f8f; border: 1px solid #333333;
background-color: #cccccc; border-top: 1px solid #5c5c5c;
background: -moz-linear-gradient(top, #cccccc 0, #b9b9b9 100%); background-color: #4a4a4a;
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #cccccc), color-stop(100%, #b9b9b9));
font-size:13px; font-size:13px;
color:#353535; color:#ccc;
font-weight:bold; font-weight:bold;
padding:6px 0 6px 20px; padding:6px 0 6px 20px;
margin:8px 0 0 0; margin:8px 0 0 0;
@ -2564,7 +2564,6 @@ label span {
} }
fieldset > legend { fieldset > legend {
color: #4F4F4F;
font-size: 12px; font-size: 12px;
line-height: 140%; line-height: 140%;
} }
@ -2587,6 +2586,11 @@ fieldset legend .ui-icon, .ui-widget-content fieldset legend .ui-icon {
float: left; float: left;
} }
#add-show-show-source
{
margin-top: 20px;
}
input[type="checkbox"][disabled] { input[type="checkbox"][disabled] {
opacity: 0.6; opacity: 0.6;
} }

9
airtime_mvc/public/js/airtime/schedule/add-show.js
View file

@ -28,10 +28,11 @@ function openAddShowForm(nowOrFuture) {
function makeAddShowButton() { function makeAddShowButton() {
if($('.add-button').length === 0) { if($('.add-button').length === 0) {
$('.fc-header-left') $('.fc-header-left')
.append('<span class="fc-header-space"></span>') .prepend('<span class="fc-header-space"></span>')
.append('<span class="fc-button">' + .prepend('<span class="btn-group">' +
'<button onclick="showForm()" class="add-button">' + '<button onclick="showForm()" class="add-button btn btn-small">' +
'<span class="add-icon"></span>' + $.i18n._("Create New Show") + '<i class="icon-white icon-plus"></i>' +
'<span>' + $.i18n._("New Show") + '</span>' +
'</button>' + '</button>' +
'</span>'); '</span>');
} }

3
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
View file

@ -364,6 +364,9 @@ function getFullCalendarEvents(start, end, callback) {
getUsabilityHint(); getUsabilityHint();
}); });
} }
$(".fc-button").addClass("btn").addClass("btn-small");
//$("span.fc-button > :button").addClass("btn btn-small");
} }
function checkSCUploadStatus(){ function checkSCUploadStatus(){

8
airtime_mvc/public/js/airtime/schedule/schedule.js
View file

@ -269,10 +269,10 @@ function createFullCalendar(data){
$.i18n._('Dec') $.i18n._('Dec')
], ],
buttonText: { buttonText: {
today: $.i18n._('today'), today: $.i18n._('Today'),
month: $.i18n._('month'), month: $.i18n._('Month'),
week: $.i18n._('week'), week: $.i18n._('Week'),
day: $.i18n._('day') day: $.i18n._('Day')
}, },
dayNames: [ dayNames: [
$.i18n._('Sunday'), $.i18n._('Sunday'),