From 582bc292aa6dd96e60f70811ba56ceea7c17cca4 Mon Sep 17 00:00:00 2001 From: drigato Date: Mon, 31 Aug 2015 09:26:22 -0400 Subject: [PATCH 01/14] CC-6108: Manage User table layout is messed up --- airtime_mvc/public/css/styles.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 2829cb9e1..b5813bebd 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -3863,4 +3863,18 @@ li .ui-state-hover { flex: 1; } +#users_datatable_wrapper { + position: absolute; + min-height: 300px; +} + +#users_datatable { + overflow: auto; +} + +#users_datatable tbody { + + vertical-align: top !important; +} + From e349c3013cf487d565428be7136b113328022ef0 Mon Sep 17 00:00:00 2001 From: drigato Date: Mon, 31 Aug 2015 10:03:26 -0400 Subject: [PATCH 02/14] CC-6107: Webstreams datatable should refresh when new webstream is created --- airtime_mvc/public/js/airtime/library/spl.js | 1 - 1 file changed, 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 16c654ec7..27c0aa743 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -925,7 +925,6 @@ var AIRTIME = (function(AIRTIME){ var $ws_id = $("#ws_delete"); $ws_id.show(); - editName(); var length = $(".side_playlist.active-tab .ws_length"); length.text(json.length); From 2748f223defb27559753bf063c3d13e15ffca440 Mon Sep 17 00:00:00 2001 From: drigato Date: Mon, 31 Aug 2015 12:32:07 -0400 Subject: [PATCH 03/14] CC-6092: Calendar add show form style issues --- .../scripts/schedule/add-show-form.phtml | 4 +-- airtime_mvc/public/css/styles.css | 34 +++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml index c9706a3ce..1b5383eb7 100644 --- a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml +++ b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml @@ -1,6 +1,6 @@
- +
- diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index b5813bebd..658720bf5 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -189,8 +189,8 @@ select { } .airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon, -.playlist_type_help_icon, .repeat_tracks_help_icon, -.admin_username_help_icon, .stream_type_help_icon, .show_linking_help_icon, +.playlist_type_help_icon, .repeat_tracks_help_icon, .show_linking_help_icon, +.admin_username_help_icon, .stream_type_help_icon, .show_timezone_help_icon{ cursor: help; position: relative; @@ -2697,6 +2697,16 @@ fieldset legend .ui-icon, .ui-widget-content fieldset legend .ui-icon { margin-top: 20px; } +#add-show-close { + color: #ffffff !important; + text-decoration: none; +} + +#add-show-close span { + padding-top: 1px; + position: absolute; +} + input[type="checkbox"][disabled] { opacity: 0.6; } @@ -3288,6 +3298,13 @@ dd .stream-status { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#868686', endColorstr='#535353', GradientType=0); }---*/ +.add-show-submit.btn:hover { + background-position: 0 -30px !important; + background-color: #292929; + border: 1px solid #242424; + transition: none; +} + .btn.active, .btn:active { background-image: none; @@ -3877,4 +3894,17 @@ li .ui-state-hover { vertical-align: top !important; } +.show_linking_help_icon { + position: inherit; +} + +#add_show_linked-element { + display: inline-block; +} + +#add_show_no_end-element, #add_show_end_date-element { + float: left; +} + + From 26117664981f55e18be690d405eb04ea19678cd7 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 31 Aug 2015 12:35:20 -0400 Subject: [PATCH 04/14] CC-6109 - Fix display of long usernames in header panel --- airtime_mvc/public/css/masterpanel.css | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/public/css/masterpanel.css b/airtime_mvc/public/css/masterpanel.css index 9e1f9dd26..eb7f92382 100644 --- a/airtime_mvc/public/css/masterpanel.css +++ b/airtime_mvc/public/css/masterpanel.css @@ -301,9 +301,17 @@ .personal-block.solo { - width: auto; - height:auto; - margin: 0; + width: 200px; + line-height: 32px; + margin: 0; +} +.personal-block.solo span { + display: inline-block; + width: 100px; + text-overflow: ellipsis; + text-decoration: underline; + overflow: hidden; + float: left; } .personal-block.solo ol { margin-top: 6px; From 5e024023eb0b9addf0e6f6c6b2f02c7d924da7c1 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 31 Aug 2015 13:10:16 -0400 Subject: [PATCH 05/14] CC-6110 - Change header to be more responsive --- airtime_mvc/public/css/masterpanel.css | 6 ++- airtime_mvc/public/css/styles.css | 72 +++++++++----------------- 2 files changed, 28 insertions(+), 50 deletions(-) diff --git a/airtime_mvc/public/css/masterpanel.css b/airtime_mvc/public/css/masterpanel.css index eb7f92382..72b7369f3 100644 --- a/airtime_mvc/public/css/masterpanel.css +++ b/airtime_mvc/public/css/masterpanel.css @@ -3,10 +3,11 @@ /*---//////////////////// SOURCE INFO ////////////////////---*/ .source-info-block { - padding:0 0 0 2px; + padding: 0; background: url(images/masterpanel_spacer.png) no-repeat 0 0; margin-right: 0; - } + flex: 0 0 0; +} .source-info-block h3, .on-air-block h3 { margin: 0 0 10px -1px; padding:3px 0 2px 8px; @@ -226,6 +227,7 @@ .source-info-block + .on-air-block { padding-right:2px; + flex: 0 100px; } .source-info-block + .on-air-block .on-air-info, .source-info-block + .on-air-block .listen-control-button { diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 658720bf5..685f06836 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -231,6 +231,14 @@ select { } #master-panel { + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + -webkit-flex-flow: row wrap; + flex-flow: row wrap; + position:relative; height:100px; background:#3d3d3d url(images/masterpanel_bg.png) repeat-x 0 0; @@ -249,9 +257,9 @@ select { } .source-info-block { - height:100px; - float:left; - min-width:170px; + height:100px; + float:left; + min-width:170px; } .personal-block { @@ -283,13 +291,15 @@ select { color:#ff5d1a; } .now-playing-block { - width:35%; + /*width:35%;*/ + flex: 1 auto; background: url(images/masterpanel_spacer.png) no-repeat 0 0; margin-left: 152px; padding-left: 14px; } .show-block { - width:30%; + /*width:30%;*/ + flex: 1 auto; } .text-row { height:30px; @@ -368,53 +378,21 @@ select { background:url(images/masterpanel_spacer.png) no-repeat right 0; } .time-info-block { - position: absolute; - top: 0; - right: 0; + flex: 0 150px; + /*position: absolute;*/ + /*top: 0;*/ + /*right: 0;*/ } #navlist { padding: 0; margin: 0; } -@media screen and (max-width: 1575px) { - .now-playing-block { - width: 30%; - } - .show-block { - width: 25%; - } -} @media screen and (max-width: 1250px) { - .now-playing-block { - width: 50%; - } .show-block { display: none; } - .personal-block.solo { - right: 10px !important; - } } -@media screen and (max-width: 1075px) { - .now-playing-block { - width: 40%; - } -} -@media screen and (max-width: 900px) { - .now-playing-block { - width: 30%; - /*display: none;*/ - } - /*#nav li.top {*/ - /*display: -webkit-box;*/ - /*display: -moz-box;*/ - /*display: -ms-flexbox;*/ - /*display: -webkit-flex;*/ - /*display: flex;*/ - /*width: 110px;*/ - /*}*/ -} -@media screen and (max-width: 775px) { +@media screen and (max-width: 875px) { .now-playing-block { display: none; } @@ -422,12 +400,10 @@ select { margin-left: 152px; } } -@media screen and (max-width: 520px) { - .logo { - display: none; - } - .source-info-block { - margin-left: 0; +@media screen and (max-width: 630px) { + #master-panel { + /*display: block;*/ + min-width: 630px; } } .time-info-block ul { From e633bc8899a8f21c0846c779cfb4f9cada965fdb Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 31 Aug 2015 13:25:29 -0400 Subject: [PATCH 06/14] CC-6112 - Remove button labels at small screen resolutions --- airtime_mvc/public/css/dashboard.css | 9 +++++++++ airtime_mvc/public/css/styles.css | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/public/css/dashboard.css b/airtime_mvc/public/css/dashboard.css index 15eb0c7c7..a59d5cac1 100644 --- a/airtime_mvc/public/css/dashboard.css +++ b/airtime_mvc/public/css/dashboard.css @@ -20,6 +20,15 @@ background-color: #242424; } +@media screen and (max-width: 1600px) { + button:not(.dropdown-toggle) > span { + display: none; + } + button:not(.dropdown-toggle) > i { + margin-right: 0 !important; + } +} + @media screen and (max-width: 1280px) { .wrapper { -webkit-flex-flow: column !important; diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 685f06836..d3fe57c6f 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -399,10 +399,12 @@ select { .source-info-block { margin-left: 152px; } + .time-info-block { + flex: 1 150px; + } } @media screen and (max-width: 630px) { #master-panel { - /*display: block;*/ min-width: 630px; } } From e06f88cd493131b0a670ac80d30327901c92efc9 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 31 Aug 2015 13:30:00 -0400 Subject: [PATCH 07/14] CC-6116 - Library new buttons keep colour when disabled --- airtime_mvc/public/css/styles.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index d3fe57c6f..a7f66f9e2 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -3295,12 +3295,13 @@ dd .stream-status { } .btn-new { - background: none; - background-color: #237686; + background: #237686; +} +.btn-new[disabled] { + background-color: #1c606e; } .btn-new:hover { - background: none; - background-color: #1c606e; + background: #1c606e; } .btn-new[disabled]:hover { background: inherit; From c6a6a97c554e3044267f5e1d97344119a552a1ce Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 31 Aug 2015 13:33:23 -0400 Subject: [PATCH 08/14] CC-6117 - Change submit button text for file metadata editor so behaviour is consistent with button text --- airtime_mvc/application/forms/EditAudioMD.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php index 562e508e5..a2462aa31 100644 --- a/airtime_mvc/application/forms/EditAudioMD.php +++ b/airtime_mvc/application/forms/EditAudioMD.php @@ -173,7 +173,7 @@ class Application_Form_EditAudioMD extends Zend_Form $this->addElement('button', 'editmdsave', array( 'ignore' => true, 'class' => 'btn md-save right-floated', - 'label' => _('Save'), + 'label' => _('OK'), 'decorators' => array( 'ViewHelper' ) From d2f46882c1748e4c67911137780a63b05ff06ef6 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 31 Aug 2015 13:35:46 -0400 Subject: [PATCH 09/14] CC-6113 - Remove select dropdown from library pane --- .../public/js/airtime/library/library.js | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 7bec295e3..620728a7f 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -149,18 +149,19 @@ var AIRTIME = (function(AIRTIME) { "" + $.i18n._('Delete') + "" + "" + "
" - ).append( - "
" + - "" + - "" + - "
" ); + //).append( + // "
" + + // "" + + // "" + + // "
" + //); }; mod.moveSearchBarToHeader = function() { From c1e2daaac4d96550735b88f296591f9247db490e Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 31 Aug 2015 13:48:22 -0400 Subject: [PATCH 10/14] CC-6114 - Remove New button from nav bar --- .../application/layouts/scripts/layout.phtml | 3 --- airtime_mvc/public/css/styles.css | 24 +++++-------------- .../public/js/airtime/library/library.js | 12 ---------- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml index d05efdf54..98ecccb3d 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -55,9 +55,6 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-
  • diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index a7f66f9e2..b80bfa00d 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -303,7 +303,7 @@ select { } .text-row { height:30px; - padding:0px 0 0; + padding:0; font-size:12px; text-wrap:none; text-indent:2px; @@ -469,7 +469,6 @@ select { border:1px solid #555555; border-width:1px 0; border-bottom-color:#1e1e1e; - color:#fff; color:#0C0; text-shadow: #000 0px -1px; display:block; @@ -1088,8 +1087,7 @@ input[type="checkbox"] { width:420px; border:1px solid #181818; border-width: 0 0 1px 0; - padding:0; - padding-top:60px; + padding: 60px 0 0; } .login_box h2 { @@ -1154,8 +1152,6 @@ input[type="checkbox"] { text-align:left; } .login-content dl, .login-content dl.zend_form { - margin: 12px 0 0 0; - margin-bottom:8px; margin:0; padding:0; width:100%; @@ -1341,10 +1337,6 @@ input[type="checkbox"] { margin: 0; } -.dataTables_scrolling { - /*min-height: 150px;*/ -} - .ui-dialog #schedule_playlist_dialog.ui-dialog-content { padding:0; } @@ -1490,10 +1482,6 @@ div.ui-datepicker { min-width: 150px; } -.sh_pl_creator { - -} - #schedule_playlist_chosen li > h3 > div.sh_pl_time { float:right; margin-right:22px; @@ -1571,10 +1559,6 @@ h2#scheduled_playlist_name span { /* --- Add show Dialog --- */ -#add_show_name { - -} - #add_show_description { width: 400px; height: 200px; @@ -3276,6 +3260,10 @@ dd .stream-status { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#868686', endColorstr='#535353', GradientType=0); }---*/ +#add_media_btn { + width: 100%; +} + .add-show-submit.btn:hover { background-position: 0 -30px !important; background-color: #292929; diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 620728a7f..026171603 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -150,18 +150,6 @@ var AIRTIME = (function(AIRTIME) { "" + "
" ); - //).append( - // "
" + - // "" + - // "" + - // "
" - //); }; mod.moveSearchBarToHeader = function() { From cd7d07e5f57ff80eb0ec7a361549ead6e6a98a03 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 31 Aug 2015 14:01:31 -0400 Subject: [PATCH 11/14] CC-6119 - Fix New button styling --- airtime_mvc/public/css/add-show.css | 8 ++++---- airtime_mvc/public/css/styles.css | 9 ++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/airtime_mvc/public/css/add-show.css b/airtime_mvc/public/css/add-show.css index 0749ce534..385c616c6 100644 --- a/airtime_mvc/public/css/add-show.css +++ b/airtime_mvc/public/css/add-show.css @@ -193,10 +193,10 @@ label.wrapp-label input[type="checkbox"] { .add-button[disabled] { cursor: auto; color: #e7e7e7; - border: 1px solid #a1a1a1; - background-color: #b1b1b1; - background: -moz-linear-gradient(top, #c7c7c7 0, #c7c7c7 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #c7c7c7), color-stop(100%, #c7c7c7)); + /*border: 1px solid #a1a1a1;*/ + /*background-color: #b1b1b1;*/ + /*background: -moz-linear-gradient(top, #c7c7c7 0, #c7c7c7 100%);*/ + /*background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #c7c7c7), color-stop(100%, #c7c7c7));*/ } diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index b80bfa00d..07924c533 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -3285,15 +3285,10 @@ dd .stream-status { .btn-new { background: #237686; } -.btn-new[disabled] { +.btn-new:active, .btn-new:hover, +.btn-new[disabled], .btn-new[disabled]:active { background-color: #1c606e; } -.btn-new:hover { - background: #1c606e; -} -.btn-new[disabled]:hover { - background: inherit; -} .dark_class { From f64d7096d1fa0ac535084f9c46fba34232f3e36d Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 31 Aug 2015 14:21:09 -0400 Subject: [PATCH 12/14] Fix button styling bugs --- airtime_mvc/public/js/airtime/library/library.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 026171603..5214b80b2 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -834,7 +834,7 @@ var AIRTIME = (function(AIRTIME) { AIRTIME.library.setupLibraryToolbar(oTable); $libTable.find("tbody").on("dblclick", "tr[class*='lib'] > td:not(.dataTables_empty)", function(ev) { - var tr = $(this).parent, data = tr.data("aData"); + var tr = $(this).parent(), data = tr.data("aData"); AIRTIME.library.dblClickAdd(data, data.ftype); }); @@ -957,7 +957,7 @@ var AIRTIME = (function(AIRTIME) { function processMenuItems(oItems) { - // define an add to playlist callback. + // define an add to playlist callback. if (oItems.pl_add !== undefined) { var aItems = []; From 7c9f0a09ae9da4d54f89a90f9905a6a537f75d87 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 31 Aug 2015 14:21:35 -0400 Subject: [PATCH 13/14] Fix button styling bugs --- airtime_mvc/public/css/dashboard.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/public/css/dashboard.css b/airtime_mvc/public/css/dashboard.css index a59d5cac1..7ddd44b3d 100644 --- a/airtime_mvc/public/css/dashboard.css +++ b/airtime_mvc/public/css/dashboard.css @@ -21,10 +21,12 @@ } @media screen and (max-width: 1600px) { - button:not(.dropdown-toggle) > span { + #library_display_wrapper button:not(.dropdown-toggle):not(.btn-new) > span, + #show_builder button:not(.dropdown-toggle):not(.btn-new) > span { display: none; } - button:not(.dropdown-toggle) > i { + #library_display_wrapper button:not(.dropdown-toggle):not(.btn-new) > i, + #show_builder button:not(.dropdown-toggle):not(.btn-new) > i { margin-right: 0 !important; } } From 109a3365046104ad2f6bc9f2310f58b1babea692 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 31 Aug 2015 14:36:44 -0400 Subject: [PATCH 14/14] CC-6124 - Fix Add to Current Playlist button --- .../library/events/library_showbuilder.js | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index d62e8f90a..0d6cb047f 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -18,17 +18,11 @@ var AIRTIME = (function(AIRTIME) { check = true; } - if (shows.length === 0) { - check = false; - } - - if (check) { - AIRTIME.button.enableButton("btn-group #library-plus", false); - } else { - AIRTIME.button.disableButton("btn-group #library-plus", false); - } - if ($("#show_builder_table").is(":visible")) { + if (shows.length === 0) { + check = false; + } + if ($cursor.length !== 0) { btnText = $.i18n._('Add after selected items'); } else if (current.length !== 0) { @@ -42,6 +36,13 @@ var AIRTIME = (function(AIRTIME) { btnText = $.i18n._('Add to current playlist'); } } + + if (check) { + AIRTIME.button.enableButton("btn-group #library-plus", false); + } else { + AIRTIME.button.disableButton("btn-group #library-plus", false); + } + AIRTIME.library.changeAddButtonText($('.btn-group #library-plus #lib-plus-text'), btnText); };