From 2c88d1e0a0b8d52d581efe03ebc7dabb864c285e Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Fri, 30 Aug 2013 01:06:59 -0400 Subject: [PATCH] formating the date start/end of each show in the accordian. --- airtime_mvc/public/css/playouthistory.css | 26 +++++++++++++++++++ .../js/airtime/playouthistory/historytable.js | 21 +++++++++------ 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/airtime_mvc/public/css/playouthistory.css b/airtime_mvc/public/css/playouthistory.css index 8082d97ba..792e9143a 100644 --- a/airtime_mvc/public/css/playouthistory.css +++ b/airtime_mvc/public/css/playouthistory.css @@ -41,3 +41,29 @@ table.dataTable tbody tr { .his-selected.odd { background-color: rgba(255, 136, 56, 1); } + +.show-title, .show-time { + display:inline-block; + font-size:13px; +} +.show-title { + font-weight: bold; + margin: 0 8px; +} + +.show-date { + font-size:12px; + color: #363636; + margin: 0 5px; +} + +.show-time { + font-size:12px; + color: #363636; + margin: 0 5px; +} + +.push-right { + float:right; + margin-right:5px; +} diff --git a/airtime_mvc/public/js/airtime/playouthistory/historytable.js b/airtime_mvc/public/js/airtime/playouthistory/historytable.js index 9be44d77f..9e071f9a8 100644 --- a/airtime_mvc/public/js/airtime/playouthistory/historytable.js +++ b/airtime_mvc/public/js/airtime/playouthistory/historytable.js @@ -180,15 +180,17 @@ var AIRTIME = (function(AIRTIME) { template = "

" + "" + - "<%= name %>" + - "<%= starts %>" + - "<%= ends %>" + + "<%= name %>" + + "" + + "<%= date %>" + + "<%= startTime %>" + + "-" + + "<%= endTime %>" + + "" + "" + "

" + "
"; template = _.template(template); @@ -220,7 +222,8 @@ var AIRTIME = (function(AIRTIME) { i, len, $accordSection, - show; + show, + tmp; $showList .accordion( "destroy" ) @@ -228,12 +231,14 @@ var AIRTIME = (function(AIRTIME) { for (i = 0, len = oShows.length; i < len; i++) { show = oShows[i]; + tmp = show.starts.split(" "); $accordSection = createShowAccordSection({ instance: show.instance_id, name: show.name, - starts: show.starts, - ends: show.ends + date: tmp[0], + startTime: tmp[1], + endTime: show.ends.split(" ").pop() }); $showList.append($accordSection);