From 55745d1a4a882a070bd01851d0d086c847ac0a01 Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 10 Mar 2011 19:28:57 -0500 Subject: [PATCH] CC-2025 Indicate songs that are over-booked --- application/models/Nowplaying.php | 5 +- public/css/images/icon_overlap.png | Bin 0 -> 1062 bytes public/css/styles.css | 89 ++++++++++++++++++++--- public/js/playlist/nowplayingdatagrid.js | 9 +++ 4 files changed, 89 insertions(+), 14 deletions(-) create mode 100644 public/css/images/icon_overlap.png diff --git a/application/models/Nowplaying.php b/application/models/Nowplaying.php index 726825a5f..884b5cd05 100644 --- a/application/models/Nowplaying.php +++ b/application/models/Nowplaying.php @@ -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"])); } } diff --git a/public/css/images/icon_overlap.png b/public/css/images/icon_overlap.png new file mode 100644 index 0000000000000000000000000000000000000000..27563a6b1785e25b2d6b06c2714daf5706e9daa4 GIT binary patch literal 1062 zcmaJ=O-vI(7~P~M5DfGni9e@t@nE9eo$U{8H?3H@MVe4-N+T#2m))V=!0xQO11%iX zh!+zNN<3-f#TYaOV&Z`qqlA-s(1fFg0}>4;7z`wMGSt~ZiwEl_v-6Yp-uJ$5zPXj| zJ=ffHtchWm=47{&p|g(;ccY8`ufA>gNT;JDF+lq8Fe%6uVqz*DLLjNjIg~-NI&tMa ziZF}|XxRZWkm?Z?taGx1;flIR*$fluD4Mb|f(RHwIn9W&KVL1dKvSb^e;@@@W*p_U z?nw*vP4;G$$q^;2vK?nYq$pAW9T6E6^-;qXi&3_sE7G-d%(I{ZAtOI7dXM^4+ev$ffovphhARrdW4|p^NJ9Hy^p2QEOl7SNL_oe=q}3U2{A>U zFBA$~!N*}M#|zQZJ%2KDhDd=WR z*0A@=L<`0jWs?^;=%iEyrc(ch>Us@rlMLGT`%hszJ7FR|gKRuzDfHro+ni9Q7`Kp2 zu$9Glv|7b<9usWmu?gaR0no1*DlXU+bSfn#4V%b@f|62{rF>4)RI$?=f-oKq`eS}U z5E3xf3H_4S?}uH%P*C#4s$2;xV>&WOm8vvB4=#LtGCQ)i*zjqy<>pr8o~Ay=Ei=#WTgPv2WRuNLqq&#K!|s`P7wtYhaU>GlUh`*PLv`VoD=Zs#4(&A9J3khGzxnXuAY_hmuB}VyP3QeH$waR- I*LnHIA1nA_p#T5? literal 0 HcmV?d00001 diff --git a/public/css/styles.css b/public/css/styles.css index 26c2f8e6a..c736e2ebf 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -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; -} \ No newline at end of file +} +.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; +} diff --git a/public/js/playlist/nowplayingdatagrid.js b/public/js/playlist/nowplayingdatagrid.js index 9d4151e2f..33e077a19 100644 --- a/public/js/playlist/nowplayingdatagrid.js +++ b/public/js/playlist/nowplayingdatagrid.js @@ -50,6 +50,14 @@ function notifyShowStart(show){ updateDataTable(); } +function statusColumn(obj) { + var sReturn = obj.aData[ obj.iDataColumn ]; + if ( sReturn == "x" ) { + sReturn = ''; + } + 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(){