From a832a40c757512d82d8ff02638faa8179266e3a6 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Mon, 5 Mar 2012 18:14:10 +0100 Subject: [PATCH] CC-3174 : showbuilder making the library a separate scrollable from playlist --- .../controllers/LibraryController.php | 1 + .../application/layouts/scripts/library.phtml | 2 +- airtime_mvc/public/css/media_library.css | 14 ++++--- airtime_mvc/public/css/playlist_builder.css | 4 +- airtime_mvc/public/css/styles.css | 2 +- .../public/js/airtime/library/library.js | 2 +- .../public/js/airtime/library/main_library.js | 17 +++++++- .../public/js/airtime/utilities/utilities.js | 40 +++++++++++++++++++ 8 files changed, 69 insertions(+), 13 deletions(-) create mode 100644 airtime_mvc/public/js/airtime/utilities/utilities.js diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 64d411086..9b3a2b35e 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -56,6 +56,7 @@ class LibraryController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.TableTools.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/utilities/utilities.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/main_library.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); diff --git a/airtime_mvc/application/layouts/scripts/library.phtml b/airtime_mvc/application/layouts/scripts/library.phtml index 69c0dc544..d015fee03 100644 --- a/airtime_mvc/application/layouts/scripts/library.phtml +++ b/airtime_mvc/application/layouts/scripts/library.phtml @@ -23,7 +23,7 @@
layout()->library ?>
-
layout()->spl ?>
+
layout()->spl ?>
diff --git a/airtime_mvc/public/css/media_library.css b/airtime_mvc/public/css/media_library.css index 97de2e91c..172c26a0a 100644 --- a/airtime_mvc/public/css/media_library.css +++ b/airtime_mvc/public/css/media_library.css @@ -1,7 +1,7 @@ #library_content { float: left; width: 50%; - min-height: 475px; + overflow: auto; } #library_display { @@ -10,7 +10,7 @@ } #library_display th { - text-align: left; + text-align: left; } #library_content #library_display { @@ -80,7 +80,9 @@ text-align: center; } -.library_sr, -.library_bitrate { - text-align: right; -} +td.library_track, +td.library_sr, +td.library_bitrate { + text-align: right; + padding-right: 1em !important; +} \ No newline at end of file diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css index cef0a7eba..9fdfd6fc4 100644 --- a/airtime_mvc/public/css/playlist_builder.css +++ b/airtime_mvc/public/css/playlist_builder.css @@ -1,9 +1,7 @@ #side_playlist { width: 40%; - min-height: 475px; - padding: 8px; - padding-bottom: 0px; font-size: 16px; + overflow: auto; } #side_playlist, diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 16f737681..e9e609c6b 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -9,7 +9,7 @@ body { padding: 0; } html, body { -height: 100%; + height: 100%; } #login-page { diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 42aa267ef..27362a10f 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -58,7 +58,7 @@ var AIRTIME = (function(AIRTIME){ /* Length */ {"sTitle": "Length", "mDataProp": "length", "sClass": "library_length", "sWidth": "80px"}, /* Upload Time */ {"sTitle": "Uploaded", "mDataProp": "utime", "sClass": "library_upload_time"}, /* Last Modified */ {"sTitle": "Last Modified", "mDataProp": "mtime", "bVisible": false, "sClass": "library_modified_time"}, - /* Track Number */ {"sTitle": "Track", "mDataProp": "track_number", "bSearchable": false, "bVisible": false, "sClass": "library_track"}, + /* Track Number */ {"sTitle": "Track", "mDataProp": "track_number", "bSearchable": false, "bVisible": false, "sClass": "library_track", "sWidth": "65px"}, /* Mood */ {"sTitle": "Mood", "mDataProp": "mood", "bSearchable": false, "bVisible": false, "sClass": "library_mood"}, /* BPM */ {"sTitle": "BPM", "mDataProp": "bpm", "bSearchable": false, "bVisible": false, "sClass": "library_bpm"}, /* Composer */ {"sTitle": "Composer", "mDataProp": "composer", "bSearchable": false, "bVisible": false, "sClass": "library_composer"}, diff --git a/airtime_mvc/public/js/airtime/library/main_library.js b/airtime_mvc/public/js/airtime/library/main_library.js index d50811e7e..0682ee04a 100644 --- a/airtime_mvc/public/js/airtime/library/main_library.js +++ b/airtime_mvc/public/js/airtime/library/main_library.js @@ -1 +1,16 @@ -$(document).ready(AIRTIME.library.libraryInit); \ No newline at end of file +$(document).ready(function() { + var viewport = AIRTIME.utilities.findViewportDimensions(), + lib = $("#library_content"), + pl = $("#side_playlist"), + widgetHeight = viewport.height - 185, + width = Math.floor(viewport.width - 110); + + lib.height(widgetHeight) + .width(Math.floor(width * 0.55)); + + pl.height(widgetHeight) + .width(Math.floor(width * 0.45)); + + AIRTIME.library.libraryInit(); + +}); \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/utilities/utilities.js b/airtime_mvc/public/js/airtime/utilities/utilities.js new file mode 100644 index 000000000..9c3176051 --- /dev/null +++ b/airtime_mvc/public/js/airtime/utilities/utilities.js @@ -0,0 +1,40 @@ +var AIRTIME = (function(AIRTIME){ + var mod; + + if (AIRTIME.utilities === undefined) { + AIRTIME.utilities = {}; + } + mod = AIRTIME.utilities; + + mod.findViewportDimensions = function() { + var viewportwidth, + viewportheight; + + // the more standards compliant browsers (mozilla/netscape/opera/IE7) use + // window.innerWidth and window.innerHeight + if (typeof window.innerWidth != 'undefined') { + viewportwidth = window.innerWidth, viewportheight = window.innerHeight; + } + // IE6 in standards compliant mode (i.e. with a valid doctype as the first + // line in the document) + else if (typeof document.documentElement != 'undefined' + && typeof document.documentElement.clientWidth != 'undefined' + && document.documentElement.clientWidth != 0) { + viewportwidth = document.documentElement.clientWidth; + viewportheight = document.documentElement.clientHeight; + } + // older versions of IE + else { + viewportwidth = document.getElementsByTagName('body')[0].clientWidth; + viewportheight = document.getElementsByTagName('body')[0].clientHeight; + } + + return { + width: viewportwidth, + height: viewportheight + }; + }; + +return AIRTIME; + +}(AIRTIME || {})); \ No newline at end of file