martin
parent
2f8aeeb2c0
commit
55745d1a4a
|
|
@ -82,10 +82,11 @@ class Application_Model_Nowplaying
|
|||
$type = "n";
|
||||
}
|
||||
|
||||
$over = "";
|
||||
if (strtotime($item['item_ends']) > strtotime($item['show_ends']))
|
||||
$type = "over";
|
||||
$over = "x";
|
||||
|
||||
array_push($data, array($type, $item["item_starts"], $item["item_starts"], $item["item_ends"], $item["clip_length"], $item["track_title"], $item["artist_name"], $item["album_title"], $item["playlist_name"], $item["show_name"], $item["instance_id"]));
|
||||
array_push($data, array($type, $item["item_starts"], $item["item_starts"], $item["item_ends"], $item["clip_length"], $item["track_title"], $item["artist_name"], $item["album_title"], $item["playlist_name"], $item["show_name"], $over, $item["instance_id"]));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
|
|
@ -142,6 +142,9 @@ select {
|
|||
color:#969696;
|
||||
padding-right:12px;
|
||||
}
|
||||
.text-row.rebroadcast, #master-panel .text-row.rebroadcast {
|
||||
color:#969696;
|
||||
}
|
||||
.now-playing-info {
|
||||
height:25px;
|
||||
background:#3a3a3a url(images/playinfo_bg.png) repeat-x 0 0;
|
||||
|
|
@ -157,10 +160,6 @@ select {
|
|||
overflow:hidden;
|
||||
margin-bottom:3px;
|
||||
}
|
||||
.now-playing-info .time-flow {
|
||||
float:right;
|
||||
margin-right:6px;
|
||||
}
|
||||
.time-elapsed {
|
||||
color:#9b9b9b;
|
||||
padding-right:6px;
|
||||
|
|
@ -443,7 +442,7 @@ dl.inline-list dd {
|
|||
.datatable tr.odd.selected td {
|
||||
background-color: #c5deeb;
|
||||
}
|
||||
.datatable tr:hover td {
|
||||
.datatable tr.odd:hover td, .datatable tr.even:hover td {
|
||||
background-color: #95d5f7 !important;
|
||||
}
|
||||
|
||||
|
|
@ -1198,10 +1197,12 @@ button, input {
|
|||
height:25px;
|
||||
margin-right:6px
|
||||
}
|
||||
.button-bar-top .input_text.hasDatepicker {
|
||||
.button-bar-top .input_text.hasDatepicker, .input_text.hasDatepicker {
|
||||
background:url(images/input_with_calendar_bg.png) no-repeat right 0;
|
||||
}
|
||||
|
||||
.input_text.hasTimepicker {
|
||||
background:url(images/input_with_time_bg.png) no-repeat right 0;
|
||||
}
|
||||
ul.errors {
|
||||
display:block;
|
||||
clear:left;
|
||||
|
|
@ -1298,8 +1299,8 @@ ul.errors li {
|
|||
}
|
||||
|
||||
/*---//////////////////// NOW PLAYING COLORS ////////////////////---*/
|
||||
.playing-song {
|
||||
background-color:#ff753c;
|
||||
.playing-song, .datatable tr.playing-song:hover td {
|
||||
background-color:#ff753c !important;
|
||||
}
|
||||
.playing-list {
|
||||
background-color:#b0dcf2;
|
||||
|
|
@ -1307,9 +1308,15 @@ ul.errors li {
|
|||
.odd.playing-list {
|
||||
background-color:#bfe5f8;
|
||||
}
|
||||
.gap {
|
||||
background-color:#da5454;
|
||||
.gap, .datatable tr.gap:hover td {
|
||||
background-color:#da5454 !important;
|
||||
}
|
||||
.group, tr td.group {
|
||||
background-color:#0aa2be;
|
||||
color:#FFF;
|
||||
}
|
||||
|
||||
|
||||
/*---//////////////////// END NOW PLAYING COLORS ////////////////////---*/
|
||||
.icon-link, .ui-widget-content a.icon-link {
|
||||
color: #646464;
|
||||
|
|
@ -1412,4 +1419,62 @@ ul.errors li {
|
|||
}
|
||||
.gray-logo {
|
||||
margin:5px 0 0 20px;
|
||||
}
|
||||
}
|
||||
.formrow-repeat {
|
||||
list-style-type:none;
|
||||
margin:0;
|
||||
padding:0;
|
||||
}
|
||||
.formrow-repeat li {
|
||||
list-style-type:none;
|
||||
margin:0 0 7px 0;
|
||||
padding:0;
|
||||
height:26px;
|
||||
display:block;
|
||||
}
|
||||
.formrow-repeat li .ui-button-icon-only {
|
||||
width:1.8em;
|
||||
}
|
||||
.formrow-repeat li .ui-button-icon-only .ui-button-text, .formrow-repeat li .ui-button-icons-only .ui-button-text {
|
||||
padding: 3px 3px 4px;
|
||||
}
|
||||
|
||||
.formrow-repeat li .ui-button-icon-only .ui-icon {
|
||||
left: 48%;
|
||||
margin-top: -9px;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
}
|
||||
.formrow-repeat li .ui-button .ui-button-text {
|
||||
display: block;
|
||||
line-height: 110%;
|
||||
}
|
||||
.formrow-repeat li .inline-text {
|
||||
color: #666666;
|
||||
padding: 0 6px 0 0;
|
||||
}
|
||||
.formrow-repeat li .input_text, .formrow-repeat li .input_select {
|
||||
margin-right:6px;
|
||||
}
|
||||
.formrow-repeat li .hasDatepicker, .formrow-repeat li .input_select {
|
||||
width:160px;
|
||||
}
|
||||
.formrow-repeat li .hasTimepicker {
|
||||
width:80px;
|
||||
}
|
||||
.recording-show {
|
||||
float: right;
|
||||
background:url(images/record_icon.png) no-repeat 0 0;
|
||||
width:23px;
|
||||
height:23px;
|
||||
}
|
||||
|
||||
.datatable td .info-icon {
|
||||
margin:-4px 3px -3px 0;
|
||||
float:right;
|
||||
}
|
||||
|
||||
.time-flow {
|
||||
float:right;
|
||||
margin-right:4px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,14 @@ function notifyShowStart(show){
|
|||
updateDataTable();
|
||||
}
|
||||
|
||||
function statusColumn(obj) {
|
||||
var sReturn = obj.aData[ obj.iDataColumn ];
|
||||
if ( sReturn == "x" ) {
|
||||
sReturn = '<img class="info-icon" src="/css/images/icon_overlap.png" width="51" height="15" alt="" />';
|
||||
}
|
||||
return sReturn;
|
||||
}
|
||||
|
||||
var columns = [{"sTitle": "type", "bVisible":false},
|
||||
{"sTitle":"Date"},
|
||||
{"sTitle":"Start"},
|
||||
|
|
@ -60,6 +68,7 @@ var columns = [{"sTitle": "type", "bVisible":false},
|
|||
{"sTitle":"Album"},
|
||||
{"sTitle":"Playlist"},
|
||||
{"sTitle":"Show"},
|
||||
{"sTitle":"Status", "fnRender":statusColumn},
|
||||
{"sTitle":"instance_id", "bVisible":false}];
|
||||
|
||||
function getDateString(){
|
||||
|
|
|
|||
Loading…
Reference in New Issue