From 711d1f202aa53d38007a8e05764e02331c9ade9a Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Fri, 23 Mar 2012 16:42:08 +0100 Subject: [PATCH] CC-3463 : Usability of timeline changing buttons to be jquery ui icons. adding button to trim overbooked adding button toscroll current item to top. --- .../application/layouts/scripts/library.phtml | 4 +- airtime_mvc/public/css/media_library.css | 12 +- airtime_mvc/public/css/showbuilder.css | 4 + airtime_mvc/public/css/styles.css | 3 +- .../public/js/airtime/buttons/buttons.js | 14 +- .../library/events/library_playlistbuilder.js | 76 ++++++----- .../library/events/library_showbuilder.js | 92 +++++++------ .../public/js/airtime/library/library.js | 47 +------ .../public/js/airtime/showbuilder/builder.js | 121 ++++++++++++++---- 9 files changed, 223 insertions(+), 150 deletions(-) diff --git a/airtime_mvc/application/layouts/scripts/library.phtml b/airtime_mvc/application/layouts/scripts/library.phtml index 580106684..d5a950090 100644 --- a/airtime_mvc/application/layouts/scripts/library.phtml +++ b/airtime_mvc/application/layouts/scripts/library.phtml @@ -27,8 +27,8 @@
-
layout()->library ?>
-
layout()->spl ?>
+
layout()->library ?>
+
layout()->spl ?>
diff --git a/airtime_mvc/public/css/media_library.css b/airtime_mvc/public/css/media_library.css index dc7b6cd73..42db724e0 100644 --- a/airtime_mvc/public/css/media_library.css +++ b/airtime_mvc/public/css/media_library.css @@ -1,5 +1,15 @@ -.lib-content { +.lib-content .fg-toolbar ul { + float: left; + padding: 0; + margin: 0.5em 0 0 0; + cursor: pointer; +} +.lib-content .fg-toolbar ul li { + list-style-type: none; + float: left; + padding: 1px 2px; + margin-right: 5px; } #library_content { diff --git a/airtime_mvc/public/css/showbuilder.css b/airtime_mvc/public/css/showbuilder.css index 4aaa38a4d..413cfdf5d 100644 --- a/airtime_mvc/public/css/showbuilder.css +++ b/airtime_mvc/public/css/showbuilder.css @@ -53,6 +53,10 @@ top: 3px; } +.sb-content fieldset { + margin-bottom: 8px; +} + .sb-content fieldset.closed { border-width: 1px 0 0; margin-bottom: -16px; diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index fc8a160ff..c4a972adc 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -776,7 +776,6 @@ dl.inline-list dd { #library_display thead th.library_title { cursor: default; } - .ColVis.TableTools .ui-button { height: 21px; } @@ -790,7 +789,7 @@ button.ColVis_Button.ColVis_ShowAll { font-size:12px; font-weight:normal; padding: 0.2em 1em; - margin: 0.5em 0.2em -0.5em 0.2em; + margin: 0.5em 7px -0.5em -2px; } .library_length { diff --git a/airtime_mvc/public/js/airtime/buttons/buttons.js b/airtime_mvc/public/js/airtime/buttons/buttons.js index e11814aae..7af88e352 100644 --- a/airtime_mvc/public/js/airtime/buttons/buttons.js +++ b/airtime_mvc/public/js/airtime/buttons/buttons.js @@ -8,8 +8,18 @@ var AIRTIME = (function(AIRTIME){ } mod = AIRTIME.button; + mod.isDisabled = function(c) { + var button = $("."+c); + + if (button.hasClass(DISABLED_CLASS)) { + return true; + } + + return false; + }; + mod.enableButton = function(c) { - var button = $("."+c).find("button"); + var button = $("."+c); if (button.hasClass(DISABLED_CLASS)) { button.removeClass(DISABLED_CLASS); @@ -17,7 +27,7 @@ var AIRTIME = (function(AIRTIME){ }; mod.disableButton = function(c) { - var button = $("."+c).find("button"); + var button = $("."+c); if (!button.hasClass(DISABLED_CLASS)) { button.addClass(DISABLED_CLASS); diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index 6ca255a06..e03ee9e07 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -19,10 +19,10 @@ var AIRTIME = (function(AIRTIME){ } if (check === true) { - AIRTIME.button.enableButton("library_group_add"); + AIRTIME.button.enableButton("lib-button-add"); } else { - AIRTIME.button.disableButton("library_group_add"); + AIRTIME.button.disableButton("lib-button-add"); } }; @@ -76,43 +76,53 @@ var AIRTIME = (function(AIRTIME){ }); }; - /* - * @param oTable the datatables instance for the library. - */ - mod.setupLibraryToolbar = function( oLibTable ) { - var aButtons, - fnAddSelectedItems; + mod.setupLibraryToolbar = function() { + var $toolbar = $(".lib-content .fg-toolbar:first"); - fnAddSelectedItems = function() { - var oLibTT = TableTools.fnGetInstance('library_display'), - aData = oLibTT.fnGetSelectedData(), - i, - temp, - length, - aMediaIds = []; - - //process selected files/playlists. - for (i = 0, length = aData.length; i < length; i++) { - temp = aData[i]; - if (temp.ftype === "audioclip") { - aMediaIds.push(temp.id); + $toolbar + .append("