From 91d44847cbf403c0900a693a31dad213b362f4b3 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Mon, 26 Mar 2012 12:24:16 +0200 Subject: [PATCH 1/3] CC-3506 : Timeline: smaller columns for time values --- airtime_mvc/public/css/showbuilder.css | 6 ++++++ airtime_mvc/public/js/airtime/showbuilder/builder.js | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/public/css/showbuilder.css b/airtime_mvc/public/css/showbuilder.css index 413cfdf5d..ce863be85 100644 --- a/airtime_mvc/public/css/showbuilder.css +++ b/airtime_mvc/public/css/showbuilder.css @@ -78,6 +78,12 @@ table.datatable tr.cursor-selected-row td, table.datatable tr.cursor-selected-row th { border-bottom: 1px solid rgba(215, 0, 0, 1) !important; } + +.sb-starts, +.sb-ends { + text-align: center; +} + .innerWrapper { position:relative; width:100%; diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 30295efdc..2079296e5 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -131,10 +131,10 @@ var AIRTIME = (function(AIRTIME){ oTable = $sbTable.dataTable( { "aoColumns": [ /* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"}, - /* Type */ {"mDataProp": "image", "sTitle": "", "sClass": "library_image sb-image", "sWidth": "25px", "bVisible": true}, - /* starts */{"mDataProp": "starts", "sTitle": "Start", "sClass": "sb-starts"}, - /* ends */{"mDataProp": "ends", "sTitle": "End", "sClass": "sb-ends"}, - /* runtime */{"mDataProp": "runtime", "sTitle": "Duration", "sClass": "library_length sb-length"}, + /* Type */ {"mDataProp": "image", "sTitle": "", "sClass": "library_image sb-image", "sWidth": "25px"}, + /* starts */{"mDataProp": "starts", "sTitle": "Start", "sClass": "sb-starts", "sWidth": "60px"}, + /* ends */{"mDataProp": "ends", "sTitle": "End", "sClass": "sb-ends", "sWidth": "60px"}, + /* runtime */{"mDataProp": "runtime", "sTitle": "Duration", "sClass": "library_length sb-length", "sWidth": "65px"}, /* title */{"mDataProp": "title", "sTitle": "Title", "sClass": "sb-title"}, /* creator */{"mDataProp": "creator", "sTitle": "Creator", "sClass": "sb-creator"}, /* album */{"mDataProp": "album", "sTitle": "Album", "sClass": "sb-album"}, From 5facac4cd6808bc123a35a9f369d35bc964f883e Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Mon, 26 Mar 2012 12:31:35 +0200 Subject: [PATCH 2/3] CC-3174 : timeline --- airtime_mvc/public/js/airtime/showbuilder/builder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 2079296e5..d50e964bb 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -131,7 +131,7 @@ var AIRTIME = (function(AIRTIME){ oTable = $sbTable.dataTable( { "aoColumns": [ /* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"}, - /* Type */ {"mDataProp": "image", "sTitle": "", "sClass": "library_image sb-image", "sWidth": "25px"}, + /* Type */ {"mDataProp": "image", "sTitle": "", "sClass": "library_image sb-image", "sWidth": "16px"}, /* starts */{"mDataProp": "starts", "sTitle": "Start", "sClass": "sb-starts", "sWidth": "60px"}, /* ends */{"mDataProp": "ends", "sTitle": "End", "sClass": "sb-ends", "sWidth": "60px"}, /* runtime */{"mDataProp": "runtime", "sTitle": "Duration", "sClass": "library_length sb-length", "sWidth": "65px"}, From 7a6cdeaf10972250e16424cbce2f68c4960505b8 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Mon, 26 Mar 2012 12:36:06 +0200 Subject: [PATCH 3/3] CC-3174 : timeline --- airtime_mvc/public/js/airtime/library/library.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 4763a6bd9..7fb85a647 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -300,7 +300,7 @@ var AIRTIME = (function(AIRTIME) { }, "oColReorder": { - "iFixedColumns": 2 + "iFixedColumns": 3 } });