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

Calendar colour adjustments

Browse source 
* CC-6099: Improve default show colour
* CC-6100: Choose show background colours randomly from a predefined  palette
This commit is contained in:
Albert Santoni 2015-08-27 20:02:32 -04:00
parent 099fc0107e
commit a08d5b71cf
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@ define('DEFAULT_TIMESTAMP_FORMAT', 'Y-m-d H:i:s');
define('DEFAULT_MICROTIME_FORMAT', 'Y-m-d H:i:s.u'); define('DEFAULT_MICROTIME_FORMAT', 'Y-m-d H:i:s.u');
define('DEFAULT_ICECAST_PORT', 8000); define('DEFAULT_ICECAST_PORT', 8000);
define('DEFAULT_ICECAST_PASS', 'hackme'); define('DEFAULT_ICECAST_PASS', 'hackme');
define('DEFAULT_SHOW_COLOR', '5B9CAB'); define('DEFAULT_SHOW_COLOR', '76aca5');
// Metadata Keys for files // Metadata Keys for files
define('MDATA_KEY_FILEPATH' , 'filepath'); define('MDATA_KEY_FILEPATH' , 'filepath');

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

@ -299,7 +299,7 @@ a.fc-event {
.fc-event-skin { .fc-event-skin {
border-color: #36c; /* default BORDER color */ border-color: #36c; /* default BORDER color */
background-color: #36c; /* default BACKGROUND color */ background-color: #36c; /* default BACKGROUND color */
color: #fff; /* default TEXT color */ color: #000; /* default TEXT color */
} }
.fc-event-inner { .fc-event-inner {

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

@ -1215,6 +1215,7 @@ input[type="checkbox"] {
} }
#pref_form textarea { #pref_form textarea {
width: 98.5%; width: 98.5%;
padding-left: 5px;
} }
#pref_form select { #pref_form select {
width: 100%; width: 100%;

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

@ -226,7 +226,9 @@ function intToRGB(i){
function stringToColor(s) function stringToColor(s)
{ {
return intToRGB(hashCode(s)); var palette = ['d56f42', 'aad542', '7242d5', '42d563', 'd542be'];
return palette[Math.abs(hashCode(s)) % palette.length];
//return intToRGB(hashCode(s));
} }
function getContrastYIQ(hexcolor){ function getContrastYIQ(hexcolor){