diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php
index 38814be20..ac23d9584 100644
--- a/airtime_mvc/application/configs/constants.php
+++ b/airtime_mvc/application/configs/constants.php
@@ -17,6 +17,7 @@ define('WHOS_USING_URL' , 'http://sourcefabric.org/en/airtime/whosus
define('TERMS_AND_CONDITIONS_URL' , 'http://www.sourcefabric.org/en/about/policy/');
define('PRIVACY_POLICY_URL' , 'http://www.sourcefabric.org/en/about/policy/');
define('USER_MANUAL_URL' , 'http://sourcefabric.booktype.pro/airtime-pro-for-broadcasters');
+define('ABOUT_AIRTIME_URL' , 'https://www.airtime.pro/support/');
define('AIRTIME_TRANSIFEX_URL' , 'https://www.transifex.com/projects/p/airtime/');
define('WHMCS_PASSWORD_RESET_URL' , 'https://account.sourcefabric.com/pwreset.php');
diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index c6c23ade4..51897c5cf 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -9,25 +9,26 @@
*/
$pages = array(
array(
- 'label' => _('Calendar'),
+ 'label' => ""._('Calendar'),
'module' => 'default',
'controller' => 'Schedule',
'action' => 'index',
'resource' => 'schedule'
),
array(
- 'label' => _('Radio Page'),
+ 'label' => ""._('Radio Page'),
'uri' => '/',
'resource' => '',
'pages' => array(
)
),
array(
- 'label' => _("Settings"),
+ 'label' => ""._("Settings"),
'resource' => 'preference',
'action' => 'index',
'module' => 'default',
'controller' => 'preference',
+ 'title' => 'Settings',
'pages' => array(
array(
'label' => _('General'),
@@ -56,11 +57,12 @@ $pages = array(
)
),
array(
- 'label' => _("Analytics"),
+ 'label' => ""._("Analytics"),
'module' => 'default',
'controller' => 'listenerstat',
'action' => 'index',
'resource' => 'listenerstat',
+ 'title' => 'Analytics',
'pages' => array(
array(
'label' => _('Listener Stats'),
@@ -86,10 +88,11 @@ $pages = array(
)
),
array(
- 'label' => _('Widgets'),
+ 'label' => ""._('Widgets'),
'module' => 'default',
'controller' => 'embeddablewidgets',
'action' => 'player',
+ 'title' => 'Widgets',
'pages' => array(
array(
'label' => _('Player'),
@@ -106,10 +109,11 @@ $pages = array(
)
),
array(
- 'label' => _('Help'),
+ 'label' => ""._('Help'),
'controller' => 'dashboard',
'action' => 'help',
'resource' => 'dashboard',
+ 'title' => 'Help',
'pages' => array(
array(
'label' => _('Getting Started'),
@@ -134,11 +138,9 @@ $pages = array(
'target' => "_blank"
),
array(
- 'label' => _('About'),
- 'module' => 'default',
- 'controller' => 'dashboard',
- 'action' => 'about',
- 'resource' => 'dashboard'
+ 'label' => _(sprintf("About %s", PRODUCT_NAME)),
+ 'uri' => ABOUT_AIRTIME_URL,
+ 'target' => "_blank"
),
array(
'label' => _(sprintf("Help Translate %s", PRODUCT_NAME)),
@@ -148,10 +150,11 @@ $pages = array(
)
),
array(
- 'label' => _('Billing'),
+ 'label' => ""._('Billing'),
'controller' => 'billing',
'action' => 'client',
'resource' => 'billing',
+ 'title' => 'Billing',
'pages' => array(
array(
'label' => _('Account Details'),
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index 87cd1d8fe..1624c18ef 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -74,15 +74,15 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+
+
+
+
+
navigation()->menu(); ?>
diff --git a/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml b/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
index 29884d943..ce167713b 100644
--- a/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
+++ b/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
@@ -98,15 +98,15 @@
+
+
+
+
+
navigation()->menu(); ?>
@@ -125,7 +125,7 @@
echo $this->layout()->parent_page; ?>
navigation()->findOneBy('label', $this->layout()->parent_page);
+ $page = $this->navigation()->findOneBy('title', $this->layout()->parent_page);
echo $this->navigation()->menu()->renderMenu($page);
?>
diff --git a/airtime_mvc/public/css/_showbuilder.css b/airtime_mvc/public/css/_showbuilder.css
index 1b0e9d342..6dbb4a3a6 100644
--- a/airtime_mvc/public/css/_showbuilder.css
+++ b/airtime_mvc/public/css/_showbuilder.css
@@ -2,43 +2,6 @@ div.ColVis_collectionBackground {
background-color: transparent;
}
-/* ~ Moved to styles.css ~
-
-.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, padding 0.2s linear;
- -moz-transition: top 0.2s linear, padding 0.2s linear;
- -o-transition: top 0.2s linear, padding 0.2s linear;
- transition: top 0.2s linear, padding 0.2s linear;
-}
-
-.usability_hint {
- left: 130px;
- flex: 0 100%;
- width: 100%;
-}
-
-*/
-
/* Scroll bars */
::-webkit-scrollbar {
@@ -107,7 +70,7 @@ div.ColVis_collectionBackground {
flex: 1;
}
-@media screen and (max-width: 1475px) {
+@media screen and (max-width: 1280px) {
.wrapper {
-webkit-flex-flow: column !important;
flex-flow: column !important;
@@ -116,10 +79,6 @@ div.ColVis_collectionBackground {
height: auto !important;
width: 100% !important;
}
- .wide-panel {
- flex: 8 100%;
- min-height: 50%;
- }
.spl_sortable {
max-height: 50%;
}
@@ -535,6 +494,7 @@ li.ui-state-default {
flex: 1 100%;
margin: 4px 0;
+ min-height: 0;
padding: 0;
}
@@ -562,19 +522,6 @@ li.ui-state-default {
padding: 4px;
}
-/*#save_button, #webstream_save {*/
- /*background: #ff5d1a;*/
- /*color: #fff;*/
- /*border-radius: 4px;*/
- /*font-size: 16px;*/
- /*height: 38px;*/
- /*width: 120px;*/
-/*}*/
-
-/*#save_button:active, #webstream_save {*/
- /*color: #fff !important;*/
-/*}*/
-
#save_button:focus, #webstream_save {
outline-width: 0;
}
diff --git a/airtime_mvc/public/css/add-show.css b/airtime_mvc/public/css/add-show.css
index b71198245..0749ce534 100644
--- a/airtime_mvc/public/css/add-show.css
+++ b/airtime_mvc/public/css/add-show.css
@@ -158,10 +158,6 @@ label.wrapp-label input[type="checkbox"] {
cursor: pointer;
}
-/* Hack for calendar page icons */
-.icon-white {
- margin-right: 4px;
-}
/*
.add-button {
border: 1px solid #5b5b5b;
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 312fce6d7..0d1a9e855 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -74,8 +74,6 @@ fieldset {
width: 120px;
left: 5px;
top: 26px;
- /*margin: 25px 5px 0 10px;*/
- /*margin-top: -5px;*/
}
/* Version Notification Starts*/
@@ -259,7 +257,7 @@ fieldset {
.now-playing-block {
width:35%;
background: url(images/masterpanel_spacer.png) no-repeat 0 0;
- margin-left: 130px;
+ margin-left: 149px;
padding-left: 14px;
}
.show-block {
@@ -350,9 +348,6 @@ fieldset {
padding: 0;
margin: 0;
}
-#nav li.top {
- /*float: none;*/
-}
@media screen and (max-width: 1575px) {
.now-playing-block {
width: 30%;
@@ -361,37 +356,6 @@ fieldset {
width: 25%;
}
}
-/*@media screen and (max-width: 1120px) {*/
- /*#nav .responsive-menu {*/
- /*position: absolute;*/
- /*left: 0;*/
- /*background: #353535;*/
- /*width: 120px;*/
- /*display: none;*/
-
- /*-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.5);*/
- /*-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.5);*/
- /*box-shadow: 0 5px 10px rgba(0, 0, 0, 0.5);*/
- /*}*/
- /*.mobile-nav {*/
- /*display: block;*/
- /*}*/
- /*#menu-btn {*/
- /*width: 24px;*/
-
- /*margin: 0;*/
-
- /*cursor: pointer;*/
- /*}*/
- /*#menu-btn span {*/
- /*display: block;*/
- /*width: 19px;*/
- /*height: 3px;*/
- /*margin: 4px 2px;*/
- /*background: #efefef;*/
- /*z-index: 99;*/
- /*}*/
-/*}*/
@media screen and (max-width: 1250px) {
.now-playing-block {
width: 50%;
@@ -408,11 +372,6 @@ fieldset {
width: 40%;
}
}
-/*@media screen and (max-width: 1250px) {*/
- /*#nav {*/
- /*overflow-y: visible;*/
- /*}*/
-/*}*/
@media screen and (max-width: 900px) {
.now-playing-block {
width: 30%;
@@ -432,7 +391,7 @@ fieldset {
display: none;
}
.source-info-block {
- margin-left: 130px;
+ margin-left: 149px;
}
}
@media screen and (max-width: 520px) {
@@ -2119,17 +2078,17 @@ span.errors.sp-errors{
}
.text-content {
padding:20px 10px 40px 58px;
- background: url(images/sf_arror.png) no-repeat 60% 0;
+ /*background: url(images/sf_arror.png) no-repeat 60% 0; */
min-height: 300px;
}
.text-content h2 {
font-size:2.4em;
- color:#1f1f1f;
+ color:#efefef;
}
.text-content p {
font-size:1.6em;
line-height:140%;
- color:#1f1f1f;
+ color:#efefef;
margin:0 0 1.4em 0;
}
.text-content a {
@@ -2150,7 +2109,7 @@ span.errors.sp-errors{
margin:0 0 6px 0;
font-size:1.7em;
display:list-item;
- color:#1f1f1f;
+ color:#efefef;
}
.gray-logo {
margin:5px 0 0 20px;
@@ -3478,15 +3437,15 @@ button.btn-icon-text > i.icon-white {
-moz-box-sizing: border-box;
box-sizing: border-box;
- width: 130px;
+ width: 150px;
flex: 1 auto;
padding: 0;
background: #353535;
- border: 1px solid #242424;
- border-top: 1px solid #7e7e7e;
/* border: 1px solid #242424; */
+ border-right: 1px solid #242424;
+ border-top: 1px solid #7e7e7e;
-moz-box-shadow: 0 2px 5px rgba(0,0,0,.35);
-webkit-box-shadow: 0 2px 5px rgba(0,0,0,.35);
box-shadow: 2px 0 5px rgba(0,0,0,.35);
@@ -3556,7 +3515,7 @@ button.btn-icon-text > i.icon-white {
position: absolute;
top: 102px;
- left: 130px;
+ left: 150px;
right: 0;
bottom: 0;
padding: 10px 10px 40px;
@@ -3590,7 +3549,7 @@ button.btn-icon-text > i.icon-white {
.usability_hint {
position: fixed;
top: 102px;
- left: 130px;
+ left: 150px;
width: 100%;
flex: 0 100%;
@@ -3690,3 +3649,13 @@ hr {
height: 1px;
background: rgba(255,255,255,0.2);
}
+
+.icon-white {
+ margin-right: 4px;
+}
+
+.nav-ui-icon-formatter {
+ width:16px !important;
+ display:inline;
+ margin-right:4px
+}
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index ebfed5ffd..5368b1a03 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -415,6 +415,8 @@ var AIRTIME = (function(AIRTIME){
$pl.find("#spl_crossfade").show();
}
}
+
+ $('.zend_form + .spl-no-margin > div:has(*:visible):last').css('margin-left', 0);
}
function getId() {