diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index 2e1b81653..38814be20 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -36,7 +36,7 @@ define('DEFAULT_TIMESTAMP_FORMAT', 'Y-m-d H:i:s'); define('DEFAULT_MICROTIME_FORMAT', 'Y-m-d H:i:s.u'); define('DEFAULT_ICECAST_PORT', 8000); define('DEFAULT_ICECAST_PASS', 'hackme'); -define('DEFAULT_SHOW_COLOR', '3366cc'); +define('DEFAULT_SHOW_COLOR', '5B9CAB'); // Metadata Keys for files define('MDATA_KEY_FILEPATH' , 'filepath'); diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index 6bfbb0d09..d06c136b7 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -8,27 +8,27 @@ * the navigation container below. */ $pages = array( - array( + /*array( 'label' => _('Now Playing'), 'module' => 'default', 'controller' => 'Showbuilder', 'action' => 'index', 'resource' => 'showbuilder' - ), + ),*/ array( 'label' => _('Add Media'), 'module' => 'default', 'controller' => 'Plupload', 'action' => 'index', 'resource' => 'plupload' - ), + ),/* array( 'label' => _('Library'), 'module' => 'default', 'controller' => 'Library', 'action' => 'index', 'resource' => 'playlist' - ), + ),*/ array( 'label' => _('Calendar'), 'module' => 'default', diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php index 1fb58008a..8d7d9080b 100644 --- a/airtime_mvc/application/controllers/LocaleController.php +++ b/airtime_mvc/application/controllers/LocaleController.php @@ -290,7 +290,7 @@ class LocaleController extends Zend_Controller_Action //"Select" => _("Select"), "Select all" => _("Select all"), "Select none" => _("Select none"), - "Remove overbooked tracks" => _("Remove overbooked tracks"), + "Trim overbooked shows" => _("Trim overbooked shows"), "Remove selected scheduled items" => _("Remove selected scheduled items"), "Jump to the current playing track" => _("Jump to the current playing track"), "Cancel current show" => _("Cancel current show"), diff --git a/airtime_mvc/application/controllers/ShowBuilderController.php b/airtime_mvc/application/controllers/ShowBuilderController.php index e25367795..28cb0bcfc 100644 --- a/airtime_mvc/application/controllers/ShowBuilderController.php +++ b/airtime_mvc/application/controllers/ShowBuilderController.php @@ -10,7 +10,7 @@ class ShowBuilderController extends Zend_Controller_Action { $baseUrl = Application_Common_OsPath::getBaseDir(); $userType = Application_Model_User::GetCurrentUser()->getType(); - $this->_helper->layout->setLayout("showbuilder"); + //$this->_helper->layout->setLayout("showbuilder"); $this->view->headScript()->appendScript("localStorage.setItem( 'user-type', '$userType' );"); $this->view->headScript()->appendScript(Application_Common_GoogleAnalytics::generateGoogleTagManagerDataLayerJavaScript()); diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml index 71c974024..51ab45ff4 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -50,14 +50,13 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= - @@ -70,14 +69,48 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
- navigation()->menu() ?> + navigation()->menu() */?>
- + --> +
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
>
@@ -129,3 +162,4 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= + diff --git a/airtime_mvc/application/layouts/scripts/showbuilder.phtml b/airtime_mvc/application/layouts/scripts/showbuilder.phtml index d2f0f78eb..aa7ba542f 100644 --- a/airtime_mvc/application/layouts/scripts/showbuilder.phtml +++ b/airtime_mvc/application/layouts/scripts/showbuilder.phtml @@ -1,3 +1,8 @@ + + + + + doctype() ?> @@ -31,7 +36,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= $scs = $this->SourceConnectionStatus(); ?> partial('partialviews/header.phtml', array("live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'], - "scheduled_play_switch"=>$sss['scheduled_play'])) ?> + "scheduled_play_switch"=>$sss['scheduled_play'], "baseUrl"=>$baseUrl)) ?> navigation()->menu()->setPartial($partial); ?> @@ -50,12 +55,13 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= + + >Upgrade  >escape($this->loggedInAs()); ?> | > @@ -69,12 +75,14 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= +
navigation()->menu() ?>
+ --> @@ -95,10 +103,20 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= -
-
-
-
+
+
+
+
+
+
+
+
+
+
+ +
diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml index 02a2eeb05..08ec61399 100644 --- a/airtime_mvc/application/views/scripts/partialviews/header.phtml +++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml @@ -49,8 +49,16 @@
+ +
+
    +
  1. + baseUrl . "user/edit-user"?>>escape($this->loggedInAs()); ?> + | baseUrl . "login/logout"?>> +
    2. +
+
diff --git a/airtime_mvc/application/views/scripts/plupload/index.phtml b/airtime_mvc/application/views/scripts/plupload/index.phtml index 509775f0e..f9363e701 100644 --- a/airtime_mvc/application/views/scripts/plupload/index.phtml +++ b/airtime_mvc/application/views/scripts/plupload/index.phtml @@ -43,7 +43,7 @@
-
+
diff --git a/airtime_mvc/public/css/_showbuilder.css b/airtime_mvc/public/css/_showbuilder.css index a769c1359..0a81a6435 100644 --- a/airtime_mvc/public/css/_showbuilder.css +++ b/airtime_mvc/public/css/_showbuilder.css @@ -2,15 +2,15 @@ div.ColVis_collectionBackground { background-color: transparent; } -.wrapper { - /*background: #242424;*/ +/*.wrapper { + *//*background: #242424;*//* background: #111; - top: 139px; + top: 105px; left: 130px; right: 0; bottom: 0; - padding: 10px 10px 40px; - /*padding: 0;*/ + padding: 5px 10px 40px; + *//*padding: 0;*//* border: none; display: -webkit-box; @@ -29,13 +29,13 @@ div.ColVis_collectionBackground { transition: top 0.2s linear, padding 0.2s linear; } -/* Usability hint */ +*//* Usability hint *//* .usability_hint { left: 130px; flex: 0 100%; width: 100%; -} +}*/ /* Scroll bars */ @@ -251,18 +251,6 @@ thead th.ui-state-default:focus { outline: none; } -/* Library Context Menu */ - -.context-menu-item.icon { - min-height: 26px; - padding: 0 5px; - background-position: 4px 5px; -} - -.context-menu-item > span { - padding: 0 20px; - line-height: 26px; -} /* Library Search */ @@ -619,76 +607,6 @@ li.ui-state-default { padding-top: 4px; } -/* Media type selector */ - -#media_type_nav { - position: fixed; - top: 139px; - bottom: 0; - - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - - width: 130px; - - flex: 1 auto; - padding: 0; - - background: #353535; - border: 1px solid #242424; - border-top: 1px solid #7e7e7e; - /* border: 1px solid #242424; */ - -moz-box-shadow: 0 2px 5px rgba(0,0,0,.35); - -webkit-box-shadow: 0 2px 5px rgba(0,0,0,.35); - box-shadow: 0 2px 5px rgba(0,0,0,.35); - - z-index: 100; - text-align: left; -} - -#media_type_nav .btn-group { - padding: 4px; -} - -#new_media_selector { - width: 100%; - font-size: 14px; -} - -.media_type_selector { - cursor: pointer; - color: #cecece; - font-family: Roboto, "Open Sans", sans-serif; - font-size: 16px; - font-weight: 400; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - /*margin: 20px 20px 0 5px;*/ - padding: 10px 10px 10px 10px; - - -webkit-transition: color 0.1s linear; - -moz-transition: color 0.1s linear; - -o-transition: color 0.1s linear; - transition: color 0.1s linear; -} - -.media_type_selector.selected { - color: #fff; - background-color: #444; - -webkit-transition: color 0.1s linear; - -moz-transition: color 0.1s linear; - -o-transition: color 0.1s linear; - transition: color 0.1s linear; -} - -.media_type_selector:hover { - color: #fff; - -webkit-transition: color 0.1s linear; - -moz-transition: color 0.1s linear; - -o-transition: color 0.1s linear; - transition: color 0.1s linear; -} - /* DataTables */ .ColVis_collection.TableTools_collection.ui-buttonset.ui-buttonset-multi { @@ -776,24 +694,3 @@ th.library_checkbox { border: none; } -/* Uploads/Dropzone */ - -#upload_form { - width: 100%; - min-width: 555px; - - background: none; - border: 2px dashed #efefef; - - color: #efefef; - font-family: Roboto, "Open Sans", sans-serif; - font-size: 20px; - font-weight: 300; - line-height: 14px; - - margin-top: 10px; -} - -.dropzone .dz-message { - margin: 0; -} \ No newline at end of file diff --git a/airtime_mvc/public/css/jquery.contextMenu.css b/airtime_mvc/public/css/jquery.contextMenu.css index 355f35248..4d9884787 100644 --- a/airtime_mvc/public/css/jquery.contextMenu.css +++ b/airtime_mvc/public/css/jquery.contextMenu.css @@ -167,3 +167,16 @@ .context-menu-accesskey { text-decoration: underline; } + + +/* Library Context Menu */ +.context-menu-item.icon { + min-height: 26px; + padding: 0 5px; + background-position: 4px 5px; +} + +.context-menu-item > span { + padding: 0 20px; + line-height: 26px; +} diff --git a/airtime_mvc/public/css/player-form.css b/airtime_mvc/public/css/player-form.css index db2bc8616..8761396d1 100644 --- a/airtime_mvc/public/css/player-form.css +++ b/airtime_mvc/public/css/player-form.css @@ -14,6 +14,9 @@ } .player-preview { width: 100%; + background-color: #111; + padding-top: 25px; + padding-bottom: 25px; } .player-preview iframe { margin: 0 auto; @@ -31,15 +34,13 @@ padding-bottom: 10px; font-size: 14px; /*font-weight: bold;*/ - color: #333; margin-bottom: 10px; + margin-top: 10px; } .player-title { clear: left; - color: #5b5b5b; float: left; font-size: 13px; - font-weight: bold; width: 40px; padding: 4px 0; text-align: left; @@ -55,7 +56,6 @@ #player_embed_src-element p { margin: 0px; font-size: 13px; - color: #333; } @@ -75,7 +75,7 @@ table#player_compatibility_chart{ #player_compatibility_chart th { - color: #5b5b5b; + color: #1f1f1f; border: 0px; } diff --git a/airtime_mvc/public/css/pro_dropdown_3.css b/airtime_mvc/public/css/pro_dropdown_3.css index ad31500ae..afdfedcf8 100644 --- a/airtime_mvc/public/css/pro_dropdown_3.css +++ b/airtime_mvc/public/css/pro_dropdown_3.css @@ -10,7 +10,7 @@ way to fit your requirements. =================================================================== */ #nav { - padding:7px 0 0 6px; + /*padding:7px 0 0 6px;*/ margin:0; list-style:none; height:28px; @@ -18,16 +18,17 @@ way to fit your requirements. position:relative; z-index:500; font-family:Arial, Helvetica, sans-serif; - border-top:1px solid #7e7e7e; + /*border-top:1px solid #7e7e7e; border-bottom:1px solid #242424; -moz-box-shadow: 0 2px 5px rgba(0,0,0,.35); -webkit-box-shadow: 0 2px 5px rgba(0,0,0,.35); - box-shadow: 0 2px 5px rgba(0,0,0,.35); + box-shadow: 0 2px 5px rgba(0,0,0,.35);*/ } #nav li.top { display:block; float:left; - margin:0 5px 0 0; + /*margin:0 5px 0 0;*/ + padding: 10px; } #nav li a.top_link { display:block; @@ -35,16 +36,16 @@ way to fit your requirements. height:18px; color:#ccc; text-decoration:none; - font-size:11px; - text-transform:uppercase; - font-weight:bold; - padding:4px 0 0 14px; + font-size:16px; + /*text-transform:uppercase;*/ + /*font-weight:bold;*/ + /*padding:4px 0 0 10px;*/ cursor:pointer; } #nav li a.top_link span { float:left; display:block; - padding:0 14px 0 0; + padding: 0 14px 0 0; } #nav li a.top_link span.down { float:left; @@ -55,7 +56,7 @@ way to fit your requirements. } #nav li:hover a.top_link, #nav li.active a.top_link, #nav li.active:hover a.top_link { color:#fff; - background:#000; + /*background:#000;*/ -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 826b6187d..56c63b898 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1787,7 +1787,7 @@ button, input { .user-management { width:910px; - height: 410px; + min-height: 410px; } .user-management-expanded { width:910px; @@ -3395,15 +3395,12 @@ dd .stream-status { margin-bottom: 20px; } -#weekly-schedule-widget label { - font-weight: bold; -} - .schedule_iframe_wrapper { - width: 100%; - float: left; text-align: center; - padding: 10px; + background-color: #111; + padding-top: 25px; + padding-bottom: 25px; + margin-bottom: 25px; } #schedule_iframe { @@ -3412,6 +3409,21 @@ dd .stream-status { /* Usability Hints */ +/* + * This is a temporary solution to a larger issue; + * we should revisit this (and really all of the + * absolute positioning in Airtime) when we want + * to focus on responsive design. + */ +.usability_hint:not(.hidden) + .wrapper { + top: 105px; + + -webkit-transition: top 0.2s linear; + -moz-transition: top 0.2s linear; + -o-transition: top 0.2s linear; + transition: top 0.2s linear; +} + .usability_hint { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -3425,9 +3437,10 @@ dd .stream-status { text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.2); position: fixed; - top: 139px; - width: 100%; + top: 105px; + width: 90%; z-index: 1; + margin: 5px 10px; } .usability_hint a { @@ -3443,3 +3456,131 @@ dd .stream-status { #upload_form, #recent_uploads_wrapper { box-sizing: border-box; } + +button.btn-icon-text > i.icon-white { + margin-right: 4px; +} + + +/* Media type selector */ + +#media_type_nav { + position: absolute; + top: 105px; + bottom: 0; + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + + width: 130px; + + flex: 1 auto; + padding: 0; + + background: #353535; + border: 1px solid #242424; + border-top: 1px solid #7e7e7e; + /* border: 1px solid #242424; */ + -moz-box-shadow: 0 2px 5px rgba(0,0,0,.35); + -webkit-box-shadow: 0 2px 5px rgba(0,0,0,.35); + box-shadow: 0 2px 5px rgba(0,0,0,.35); + + z-index: 100; + text-align: left; +} + +#media_type_nav .btn-group { + padding: 4px; +} + +#new_media_selector { + width: 100%; + font-size: 14px; +} + +.media_type_selector { + cursor: pointer; + color: #cecece; + font-family: Roboto, "Open Sans", sans-serif; + font-size: 16px; + font-weight: 400; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + /*margin: 20px 20px 0 5px;*/ + padding: 10px 10px 10px 10px; + + -webkit-transition: color 0.1s linear; + -moz-transition: color 0.1s linear; + -o-transition: color 0.1s linear; + transition: color 0.1s linear; +} + +.media_type_selector.selected { + color: #fff; + background-color: #444; + -webkit-transition: color 0.1s linear; + -moz-transition: color 0.1s linear; + -o-transition: color 0.1s linear; + transition: color 0.1s linear; +} + +.media_type_selector:hover, .media_type_selector a:hover { + color: #fff; + -webkit-transition: color 0.1s linear; + -moz-transition: color 0.1s linear; + -o-transition: color 0.1s linear; + transition: color 0.1s linear; +} + +.media_type_selector a { + text-decoration: none; + color: #cecece; +} + +.dashboard_sub_nav { + padding-left: 20px; +} + +.wrapper { + /*background: #242424;*/ + background: #111; + top: 105px; + left: 130px; + right: 0; + bottom: 0; + padding: 5px 10px 40px; + /*padding: 0;*/ + border: none; + + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + -webkit-flex-flow: row wrap; + flex-flow: row wrap; + + overflow: auto; + + -webkit-transition: top 0.2s linear; + -moz-transition: top 0.2s linear; + -o-transition: top 0.2s linear; + transition: top 0.2s linear; +} + +/* Usability hint */ + +.usability_hint { + left: 130px; + flex: 0 100%; + width: 100%; +} + +/* Uploads/Dropzone */ + +#upload_form { + width: 100%; + min-width: 555px; + margin-bottom: 10px; +} + diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js index 62ba9a3f8..7c28bfd3a 100644 --- a/airtime_mvc/public/js/airtime/common/common.js +++ b/airtime_mvc/public/js/airtime/common/common.js @@ -206,4 +206,4 @@ $(document).mouseup(function (e) { if (!mb.is(e.target) && mb.has(e.target).length === 0 && w <= 970) { $('#nav').find('.responsive-menu').slideUp(); } -}); \ No newline at end of file +}); diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js index 34bdd728d..09b1c1916 100644 --- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js +++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js @@ -480,12 +480,12 @@ function setCurrentUserPseudoPassword() { $('#cu_passwordVerify').val("xxxxxx"); } -$(window).resize(function() { - /* If we don't do this, the menu can stay hidden after resizing */ +/*$(window).resize(function() { + *//* If we don't do this, the menu can stay hidden after resizing *//* if ($(this).width() > 970) { $("#nav .responsive-menu").show(); } -}); +});*/ $(document).ready(function() { if ($('#master-panel').length > 0) @@ -509,7 +509,7 @@ $(document).ready(function() { // text. This differs depending on the language setting $('#popup-link').css('width', $('.jp-container h1').css('width')); - $('#menu-btn').click(function() { + /*$('#menu-btn').click(function() { $('#nav .responsive-menu').slideToggle(); - }); + });*/ }); diff --git a/airtime_mvc/public/js/airtime/library/_library.js b/airtime_mvc/public/js/airtime/library/_library.js index 9478e58cd..5d7ff3b8a 100644 --- a/airtime_mvc/public/js/airtime/library/_library.js +++ b/airtime_mvc/public/js/airtime/library/_library.js @@ -136,7 +136,7 @@ var AIRTIME = (function(AIRTIME) { "" + "
") .append("
" + - "" + @@ -1257,6 +1257,19 @@ $(document).ready(function() { } }); + if (location.hash === "") { + $("a[href$='#files']").parent().addClass("selected"); + } + $("a[href$='"+location.hash+"']").parent().addClass("selected"); + + $(window).on('hashchange', function() { + $(".media_type_selector").each(function () { + $(this).removeClass("selected"); + }); + $("a[href$='"+location.hash+"']").parent().addClass("selected"); + oTable.fnDraw(); + }); + $(".media_type_selector").on("click", function() { if (!$(this).hasClass("selected")) { AIRTIME.library.selectNone(); diff --git a/airtime_mvc/public/js/airtime/nav/nav.js b/airtime_mvc/public/js/airtime/nav/nav.js new file mode 100644 index 000000000..606fa4a52 --- /dev/null +++ b/airtime_mvc/public/js/airtime/nav/nav.js @@ -0,0 +1,14 @@ +/*$(document).ready(function() { + $(".media_type_selector").on("click", function() { + console.log("hello"); + console.log(location.hash); + if (!$(this).hasClass("selected")) { + //AIRTIME.library.selectNone(); + $(".media_type_selector").each(function () { + $(this).removeClass("selected"); + }); + $(this).addClass("selected"); + oTable.fnDraw(); + } + }); +});*/ diff --git a/airtime_mvc/public/js/airtime/showbuilder/_builder.js b/airtime_mvc/public/js/airtime/showbuilder/_builder.js index 51310e616..a1f729c92 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/_builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/_builder.js @@ -1103,21 +1103,29 @@ var AIRTIME = (function(AIRTIME){ "" + "
") .append("
" + - "
") + "
") .append("
" + - "
"); + "
"); //if 'Add/Remove content' was chosen from the context menu //in the Calendar do not append these buttons if ($(".ui-dialog-content").length === 0) { $menu.append("
" + - "
") + "
") .append("
" + - "
"); + ""); } if (localStorage.getItem('user-type') != 'G') {