From 17c2ec2fd4bfa8281e1d41c0f7998d608c0a7907 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Tue, 8 Sep 2015 15:25:28 -0400 Subject: [PATCH 1/5] Fix responsiveness bugs --- .../application/views/scripts/playlist/playlist.phtml | 4 ++-- .../application/views/scripts/playlist/smart-block.phtml | 4 ++-- airtime_mvc/public/css/dashboard.css | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml index f27b82dbd..c7b490455 100644 --- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml +++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml @@ -43,8 +43,8 @@ if (isset($this->obj)) {
-
- "> +
"> +
diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml index 8fe4da304..e4a5d6553 100644 --- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml +++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml @@ -51,8 +51,8 @@ if (isset($this->obj)) {
form->getElement('shuffle_button');?>
-
- "> +
"> +
diff --git a/airtime_mvc/public/css/dashboard.css b/airtime_mvc/public/css/dashboard.css index 3bcfddfcc..bbed8ad01 100644 --- a/airtime_mvc/public/css/dashboard.css +++ b/airtime_mvc/public/css/dashboard.css @@ -23,13 +23,13 @@ @media screen and (max-width: 1600px) { #library_display_wrapper button:not(.dropdown-toggle):not(.btn-new) > span, - #show_builder button:not(.dropdown-toggle):not(.btn-new) > span, - #show_builder #sb_submit > span { + #show_builder_table_wrapper button:not(.dropdown-toggle):not(.btn-new) > span, + #show_builder_table_wrapper #sb_submit > span { display: none; } #library_display_wrapper button:not(.dropdown-toggle):not(.btn-new) > i, - #show_builder button:not(.dropdown-toggle):not(.btn-new) > i, - #show_builder #sb_submit > i { + #show_builder_table_wrapper button:not(.dropdown-toggle):not(.btn-new) > i, + #show_builder_table_wrapper #sb_submit > i { margin-right: 0 !important; } } From 5c7d9fe31ce9048a3218e59ea73d4717b8ce66de Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Tue, 8 Sep 2015 16:15:08 -0400 Subject: [PATCH 2/5] Change links for SoundCloud functionality to use same casing as navigation --- airtime_mvc/application/controllers/ThirdPartyController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/ThirdPartyController.php b/airtime_mvc/application/controllers/ThirdPartyController.php index 5c15ae5ea..1f864776e 100644 --- a/airtime_mvc/application/controllers/ThirdPartyController.php +++ b/airtime_mvc/application/controllers/ThirdPartyController.php @@ -49,7 +49,7 @@ abstract class ThirdPartyController extends Zend_Controller_Action { public function deauthorizeAction() { $function = $this->_SERVICE_TOKEN_ACCESSOR; Application_Model_Preference::$function(""); - header('Location: ' . $this->_baseUrl . 'Preference'); // Redirect back to the Preference page + header('Location: ' . $this->_baseUrl . 'preference'); // Redirect back to the preference page } /** @@ -61,7 +61,7 @@ abstract class ThirdPartyController extends Zend_Controller_Action { public function redirectAction() { $code = $_GET['code']; $this->_service->requestNewAccessToken($code); - header('Location: ' . $this->_baseUrl . 'Preference'); // Redirect back to the Preference page + header('Location: ' . $this->_baseUrl . 'preference'); // Redirect back to the preference page } /** From 8c3f1cf53546443ea82c7f923f6bad22a818e989 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Tue, 8 Sep 2015 16:39:33 -0400 Subject: [PATCH 3/5] Fix some issues with playlist/smart-block fade buttons --- .../application/views/scripts/playlist/playlist.phtml | 6 +++--- .../application/views/scripts/playlist/smart-block.phtml | 6 +++--- airtime_mvc/public/js/airtime/library/spl.js | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml index c7b490455..b9f107aae 100644 --- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml +++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml @@ -43,10 +43,10 @@ if (isset($this->obj)) {
-
"> - +
+
diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml index e4a5d6553..adaf45e24 100644 --- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml +++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml @@ -51,10 +51,10 @@ if (isset($this->obj)) {
form->getElement('shuffle_button');?>
-
"> - +
+
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 89d6db9bd..c6c97adcc 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -406,7 +406,7 @@ var AIRTIME = (function(AIRTIME){ var empty = $pl.find(".spl_empty"); if (!show || empty.length > 0) { - $pl.find("#spl_crossfade").hide(); + //$pl.find("#spl_crossfade").hide(); } else { //get list of playlist contents var list = contents.children(); @@ -416,7 +416,7 @@ var AIRTIME = (function(AIRTIME){ var last = list.last(); if (first.find(':first-child').children().attr('blockid') !== undefined && last.find(':first-child').children().attr('blockid') !== undefined) { - $pl.find("#spl_crossfade").hide(); + //$pl.find("#spl_crossfade").hide(); } else { $pl.find("#spl_crossfade").show(); } @@ -783,7 +783,7 @@ var AIRTIME = (function(AIRTIME){ fadeIn.parent().prev().hide(); fadeIn.hide(); } else { - console.log(json.fadeIn); + //console.log(json.fadeIn); //console.log(fadeIn.val()); fadeIn.parent().prev().show(); fadeIn.show(); @@ -1095,7 +1095,7 @@ var AIRTIME = (function(AIRTIME){ aSelected = AIRTIME.library.getSelectedData(); for (i = 0, length = aSelected.length; i < length; i++) { - console.log(aSelected[i]); + //console.log(aSelected[i]); aItems.push(new Array(aSelected[i].id, aSelected[i].ftype)); } From e6494e7ff0d0a2f44f619373519cdcbdc14561c0 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Tue, 8 Sep 2015 16:56:55 -0400 Subject: [PATCH 4/5] Better way to disable and reenable xfade button in playlist/sb editors --- .../application/views/scripts/playlist/playlist.phtml | 2 +- .../application/views/scripts/playlist/smart-block.phtml | 2 +- airtime_mvc/public/js/airtime/library/spl.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml index b9f107aae..7d4acb63b 100644 --- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml +++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml @@ -44,7 +44,7 @@ if (isset($this->obj)) {
-
diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml index adaf45e24..f6cc77625 100644 --- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml +++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml @@ -52,7 +52,7 @@ if (isset($this->obj)) { form->getElement('shuffle_button');?>
-
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index c6c97adcc..19757efcd 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -406,7 +406,7 @@ var AIRTIME = (function(AIRTIME){ var empty = $pl.find(".spl_empty"); if (!show || empty.length > 0) { - //$pl.find("#spl_crossfade").hide(); + $pl.find("#spl_crossfade").attr("disabled", "disabled"); } else { //get list of playlist contents var list = contents.children(); @@ -416,9 +416,9 @@ var AIRTIME = (function(AIRTIME){ var last = list.last(); if (first.find(':first-child').children().attr('blockid') !== undefined && last.find(':first-child').children().attr('blockid') !== undefined) { - //$pl.find("#spl_crossfade").hide(); + $pl.find("#spl_crossfade").attr("disabled", "disabled"); } else { - $pl.find("#spl_crossfade").show(); + $pl.find("#spl_crossfade").removeAttr("disabled"); } } From 03e23daba0599e856b412e6b164d727725d9ff10 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Tue, 8 Sep 2015 17:42:52 -0400 Subject: [PATCH 5/5] Apply highlight to active submenu item --- airtime_mvc/public/css/styles.css | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index f4c3a11b1..3b3ce0298 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -3698,12 +3698,12 @@ button.btn-icon-text > i.icon-white { left: 152px; top: 102px; bottom: 0; /* Account for scrollbars */ - min-width: 130px; + min-width: 150px; border-right: 1px solid #5b5b5b; background: #242424; font-size: 14px; color: #cecece; - padding: 10px; + padding: 10px 0; z-index: 1; -webkit-transition: top 0.2s linear; @@ -3713,7 +3713,11 @@ button.btn-icon-text > i.icon-white { } #sub-menu h3 { - padding: 0; + padding: 0 10px 10px; +} + +#sub-menu hr { + margin: 0 5px; } #sub-menu .navigation { @@ -3721,12 +3725,17 @@ button.btn-icon-text > i.icon-white { padding-left: 0; } -#sub-menu .navigation li { - padding-bottom: 10px; +#sub-menu .navigation li.active { + color: #fff; + background-color: #333; + border-right: 1px solid #1ADEFF; + margin-right: -1px; } #sub-menu .navigation a { + display: block; color: #cecece; + padding: 10px; text-decoration: none; }