diff --git a/airtime_mvc/application/controllers/ShowBuilderController.php b/airtime_mvc/application/controllers/ShowBuilderController.php index f0d7a3137..c9bdd65e6 100644 --- a/airtime_mvc/application/controllers/ShowBuilderController.php +++ b/airtime_mvc/application/controllers/ShowBuilderController.php @@ -10,6 +10,8 @@ class ShowBuilderController extends Zend_Controller_Action { $baseUrl = Application_Common_OsPath::getBaseDir(); $userType = Application_Model_User::GetCurrentUser()->getType(); + $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 225a4d34a..71c974024 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -78,29 +78,6 @@ 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 new file mode 100644 index 000000000..4f373fd91 --- /dev/null +++ b/airtime_mvc/application/layouts/scripts/showbuilder.phtml @@ -0,0 +1,154 @@ +doctype() ?> + + + + headTitle() ?> + headLink() ?> + headScript() ?> + google_analytics)?$this->google_analytics:"" ?> + + + + + + + + +partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?> + +
+ suspended) : ?> + partial('partialviews/suspended.phtml'); ?> + + + versionNotify(); + $sss = $this->SourceSwitchStatus(); + $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'])) ?> +navigation()->menu()->setPartial($partial); ?> + + + + + + +
+ +
+
+ + +
+
+
+
+
+
+ + +
>
+ +
+ layout()->content ?> +
+ + + + + + diff --git a/airtime_mvc/application/views/scripts/show-builder/index.phtml b/airtime_mvc/application/views/scripts/show-builder/index.phtml index a9f051926..a34edbce6 100644 --- a/airtime_mvc/application/views/scripts/show-builder/index.phtml +++ b/airtime_mvc/application/views/scripts/show-builder/index.phtml @@ -5,28 +5,6 @@ - - - - - - - - - - - - - - - - - - - - - - csrf ?>
diff --git a/airtime_mvc/public/css/_showbuilder.css b/airtime_mvc/public/css/_showbuilder.css index 94436e99e..e385b2370 100644 --- a/airtime_mvc/public/css/_showbuilder.css +++ b/airtime_mvc/public/css/_showbuilder.css @@ -1,4 +1,3 @@ - div.ColVis_collectionBackground { background-color: transparent; } @@ -115,39 +114,12 @@ div.ColVis_collectionBackground { flex: 8 100%; min-height: 50%; } - /*#media_type_nav {*/ - /*display: -webkit-box;*/ - /*display: -moz-box;*/ - /*display: -ms-flexbox;*/ - /*display: -webkit-flex;*/ - /*display: flex;*/ - /*-webkit-flex-flow: row;*/ - /*flex-flow: row;*/ - - /*-webkit-align-items: center;*/ - /*align-items: center;*/ - /*-webkit-justify-content: center;*/ - /*justify-content: center;*/ - /*}*/ - /*#media_type_nav .btn-group {*/ - /*flex: 1 100%;*/ - /*}*/ - /*#media_type_nav .dropdown-menu {*/ - /*width: 100%;*/ - /*}*/ - /*#media_type_nav .media_type_selector {*/ - /*flex: 1 100%;*/ - /*margin-top: 3px;*/ - /*}*/ } @media screen and (max-width: 780px) { .wrapper { padding: 4px 4px 40px !important; } - /*#media_type_nav {*/ - /*min-width: 555px;*/ - /*}*/ } @media screen and (max-width: 555px) { @@ -187,7 +159,9 @@ div.ColVis_collectionBackground { } #library_content .dataTables_length label { - color: #555555; + color: #efefef; + line-height: 26px; + font-weight: normal; } #library_content legend { @@ -207,11 +181,20 @@ div.ColVis_collectionBackground { margin-right: 4px; } +#library_content input[type="checkbox"], #library_content img, +.sb-content input[type="checkbox"], .sb-content img { + position: relative; + top: 2px; +} + div.btn > span { color: red; } +.fg-toolbar.ui-toolbar { + border: none; +} .fg-toolbar.ui-toolbar.ui-widget-header.ui-corner-bl.ui-corner-br.ui-helper-clearfix { position: absolute; @@ -235,13 +218,13 @@ div.btn > span .dataTables_scrolling { position: absolute; - bottom: 39px; /* 38 px is the size of the header/footer + 1px because there's no internal border */ - top: 39px; - left: 1px; /* Border */ + bottom: 37px; /* 36 px is the size of the header/footer + 1px because there's no internal border */ + top: 37px; + left: 0; right: 0; } -#library_display { +#library_display, #show_builder_table { border: none; } @@ -556,7 +539,7 @@ textarea { #media_type_nav { position: absolute; top: 139px; - bottom: 0px; + bottom: 0; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -565,7 +548,7 @@ textarea { width: 130px; flex: 1 auto; - padding: 0px; + padding: 0; /*margin-right: 10px;*/ /*text-align: center;*/ @@ -654,7 +637,7 @@ textarea { /* Hacky stuff here */ #show_builder .dataTables_scrolling { - top: 69px; + top: 67px; } .sb-padded > .fg-toolbar { @@ -667,6 +650,30 @@ textarea { } /* ~~~~~~~~~~~~~~~~ */ +#library_display td, #show_builder td { + font-size: 14px; +} + +#library_display td > span > span, +#show_builder td > span > span { + color: #efefef; +} + +.datatable tr td[class$='checkbox'], .datatable tr td[class$='type'] { + text-align: center; +} + +.datatable tr td { /*, .datatable tr th {*/ + line-height: 28px; + font-size: 14px; + padding: 5px; + color: #CCC; +} + +.datatable tr[class$='selected'] td, +.datatable tr.sb-now-playing td { + color: #efefef; +} .datatable tr, .datatable td, .dataTable tr, .dataTable td @@ -675,6 +682,7 @@ textarea { } /* This is so dragged items show up above the layout */ + .ui-draggable-dragging { z-index: 9999; position: fixed !important; @@ -700,5 +708,4 @@ textarea { .dropzone .dz-message { margin: 0; -} - +} \ No newline at end of file diff --git a/airtime_mvc/public/css/showbuilder.css b/airtime_mvc/public/css/showbuilder.css index cb8cb6b8f..6e2b1eaf5 100644 --- a/airtime_mvc/public/css/showbuilder.css +++ b/airtime_mvc/public/css/showbuilder.css @@ -56,8 +56,8 @@ } .sb-content input[type="checkbox"] { - position: relative; - top: 3px; + position: relative; + top: 3px; } .sb-content fieldset { diff --git a/airtime_mvc/public/js/airtime/showbuilder/_builder.js b/airtime_mvc/public/js/airtime/showbuilder/_builder.js index d79863869..b0fc13645 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/_builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/_builder.js @@ -13,7 +13,7 @@ var AIRTIME = (function(AIRTIME){ showInstanceIds = [], headerFooter = [], DISABLED_CLASS = 'ui-state-disabled', - selected, + selectedRows, $previouslySelected, flagForDeselection; @@ -254,7 +254,7 @@ var AIRTIME = (function(AIRTIME){ var $trs = $sbTable.find("tr.lib-audio"); $trs.removeClass(SB_SELECTED_CLASS).find(".sb-checkbox > input").prop('checked', false); $previouslySelected = undefined; - selected = undefined; + selectedRows = undefined; mod.checkToolBarIcons(); }; @@ -283,7 +283,7 @@ var AIRTIME = (function(AIRTIME){ checkError(json); mod.getSelectedCursors(); - selected = $(".sb-selected"); + selectedRows = $("." + SB_SELECTED_CLASS); oSchedTable.fnDraw(); mod.enableUI(); @@ -748,10 +748,12 @@ var AIRTIME = (function(AIRTIME){ mod.checkToolBarIcons(); var sid; - if (selected !== undefined) { - selected.each(function (i, el) { + if (selectedRows !== undefined) { + selectedRows.each(function (i, el) { sid = $(el).attr("id"); - $("#" + sid).addClass(SB_SELECTED_CLASS); + var tr = $("#" + sid); + tr.addClass(SB_SELECTED_CLASS); + tr.find("input[type='checkbox']").prop("checked", true); }); } }, @@ -806,6 +808,7 @@ var AIRTIME = (function(AIRTIME){ flagForDeselection = true; } + selectedRows = $("." + SB_SELECTED_CLASS); // Remember this row so we can properly multiselect $previouslySelected = $tr; }); @@ -818,6 +821,7 @@ var AIRTIME = (function(AIRTIME){ } else { $(this).find(".sb-checkbox > input").prop('checked', true); } + selectedRows = $("." + SB_SELECTED_CLASS); }); //begin context menu initialization.