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

Factor out default show background colour and fix some style issues

Browse source
This commit is contained in:
Albert Santoni 2015-08-12 12:55:39 -04:00
parent f63ce23c9f
commit 2a1d09bc08
9 changed files with 49 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/configs/constants.php
View file

@ -36,6 +36,7 @@ define('DEFAULT_TIMESTAMP_FORMAT', 'Y-m-d H:i:s');
define('DEFAULT_MICROTIME_FORMAT', 'Y-m-d H:i:s.u');
define('DEFAULT_ICECAST_PORT', 8000);
define('DEFAULT_ICECAST_PASS', 'hackme');
define('DEFAULT_SHOW_COLOR', '3366cc');
// Metadata Keys for files
define('MDATA_KEY_FILEPATH' , 'filepath');

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

@ -391,7 +391,8 @@ class LocaleController extends Zend_Controller_Action
"All" => _("All"),
"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."),
"New Show" => _("New Show")
"New Show" => _("New Show"),
"New Log Entry" => _("New Log Entry")
);
$this->view->layout()->disableLayout();
$this->_helper->viewRenderer->setNoRender(true);

14
airtime_mvc/application/models/Show.php
View file

@ -67,7 +67,6 @@ class Application_Model_Show
public function getColor()
{
$show = CcShowQuery::create()->findPK($this->_showId);
return $show->getDbColor();
}
@ -111,7 +110,12 @@ class Application_Model_Show
{
$show = CcShowQuery::create()->findPK($this->_showId);
return $show->getDbBackgroundColor();
$color = $show->getDbBackgroundColor();
if (empty($color)) {
return DEFAULT_SHOW_COLOR;
} else {
return $color;
}
}
public function setBackgroundColor($backgroundColor)
@ -1035,8 +1039,10 @@ SQL;
$event["textColor"] = "#".$show["color"];
}
if ($show["background_color"] != "") {
$event["color"] = "#".$show["background_color"];
if (!empty($show["background_color"])) {
$event["color"] = "#" . $show["background_color"];
} else {
$event["color"] = "#" . DEFAULT_SHOW_COLOR;
}
foreach ($options as $key => $value) {

2
airtime_mvc/application/models/ShowBuilder.php
View file

@ -107,7 +107,7 @@ class Application_Model_ShowBuilder
private function getItemColor($p_item, &$row)
{
$defaultColor = "ffffff";
$defaultBackground = "3366cc";
$defaultBackground = DEFAULT_SHOW_COLOR;
$color = $p_item["show_color"];
if ($color === '') {

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

@ -36,6 +36,24 @@ html .fc,
/* Header
------------------------------------------------------------------------*/
table.fc-header {
background: #4a4a4a;
}
#schedule_calendar > table > tbody > tr > td.fc-header-left
{
padding: 5px 0px 0px 5px;
}
#schedule_calendar > table > tbody > tr > td.fc-header-center
{
padding: 10px 5px 0px 0px;
}
#schedule_calendar > table > tbody > tr > td.fc-header-right
{
padding: 5px 5px 0px 0px;
}
.fc-header td {
white-space: nowrap;
}

3
airtime_mvc/public/css/history_styles.css
View file

@ -170,9 +170,6 @@
background-color: #CACACA;
}
.ui-widget-content {
background: #C0C0C0 !important;
}
#history_content .btn-toolbar {
margin: 10px;

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

@ -136,7 +136,7 @@
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
border:0px solid #5b5b5b;
border:1px solid #5b5b5b;
background-color: #6e6e6e;
color: #ffffff;
}

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

@ -1029,6 +1029,7 @@ table.dataTable span.DataTables_sort_icon {
table.dataTable th.ui-state-default {
color: #eee;
border: 0px;
}
.ColVis.TableTools .ui-button {
@ -1658,12 +1659,14 @@ h2#scheduled_playlist_name span {
clear: left;
color: #CDCDCD;
float: left;
font-size: 1.2em;
font-size: 1.4em;
font-weight: normal;
margin: 0;
min-width: 90px;
padding: 4px 0;
text-align: left;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
.simple-formblock dd {
float: left;

17
airtime_mvc/public/js/airtime/playouthistory/historytable.js
View file

@ -274,6 +274,8 @@ var AIRTIME = (function(AIRTIME) {
animated: false,
create: function( event, ui ) {
var $div = $showList.find(".ui-accordion-content-active");
console.log(event);
//$div.css()
createShowTable($div);
},
change: function( event, ui ) {
@ -289,6 +291,14 @@ var AIRTIME = (function(AIRTIME) {
function createToolbarButtons ($el) {
var $menu = $("<div class='btn-toolbar' />");
$menu.append("<div class='btn-group'>" +
"<button class='btn btn-small' id='his_create'>" +
"<i class='icon-white icon-plus'></i>" +
$.i18n._("New Log Entry") +
"</button>" +
"</div>");
$menu.append("<div class='btn-group'>" +
"<button class='btn btn-small dropdown-toggle' data-toggle='dropdown'>" +
$.i18n._("Select")+" <span class='caret'></span>" +
@ -300,13 +310,6 @@ var AIRTIME = (function(AIRTIME) {
"</ul>" +
"</div>");
$menu.append("<div class='btn-group'>" +
"<button class='btn btn-small' id='his_create'>" +
"<i class='icon-white icon-plus'></i>" +
$.i18n._("Create Entry") +
"</button>" +
"</div>");
$menu.append("<div class='btn-group'>" +
"<button class='btn btn-small' id='his_trash'>" +
"<i class='icon-white icon-trash'></i>" +