From 8dcd0a2595304ef4612f0fb322a986bb4146e9e4 Mon Sep 17 00:00:00 2001 From: drigato Date: Wed, 19 Aug 2015 12:58:31 -0400 Subject: [PATCH 1/3] CC-6071: Icons for navigation bar --- .../application/configs/navigation.php | 19 ++++++++++++------- .../application/layouts/scripts/layout.phtml | 10 +++++----- .../layouts/scripts/page-sub-menu.phtml | 12 ++++++------ airtime_mvc/public/css/add-show.css | 4 ---- airtime_mvc/public/css/styles.css | 16 +++++++++++++--- 5 files changed, 36 insertions(+), 25 deletions(-) diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index c6c23ade4..89fe1f9c7 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'), @@ -148,10 +152,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=
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
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 efc999591..7df4261d5 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -3467,7 +3467,7 @@ 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; @@ -3545,7 +3545,7 @@ button.btn-icon-text > i.icon-white { position: absolute; top: 102px; - left: 130px; + left: 150px; right: 0; bottom: 0; padding: 10px 10px 40px; @@ -3575,7 +3575,7 @@ button.btn-icon-text > i.icon-white { .usability_hint { position: fixed; top: 102px; - left: 130px; + left: 150px; width: 100%; flex: 0 100%; @@ -3662,3 +3662,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 +} \ No newline at end of file From ae66b2272b1d1a7b3b96772f512791d15d76a6da Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 19 Aug 2015 13:02:14 -0400 Subject: [PATCH 2/3] Fix editor styling and layout issues --- airtime_mvc/application/configs/constants.php | 1 + .../application/configs/navigation.php | 8 +-- airtime_mvc/public/css/_showbuilder.css | 57 +------------------ airtime_mvc/public/css/styles.css | 8 +-- airtime_mvc/public/js/airtime/library/spl.js | 2 + 5 files changed, 12 insertions(+), 64 deletions(-) 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..42cc89da0 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -134,11 +134,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)), 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/styles.css b/airtime_mvc/public/css/styles.css index efc999591..3d4b27baa 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -2108,17 +2108,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 { @@ -2139,7 +2139,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; 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() { From 8dab79da1c3afdc8e31df5e929e9d117f22e2d13 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 19 Aug 2015 14:29:54 -0400 Subject: [PATCH 3/3] Restyle top panel to account for larger nav panel width --- airtime_mvc/public/css/styles.css | 49 +++---------------------------- 1 file changed, 4 insertions(+), 45 deletions(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index b41009cb6..ebeafc574 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) { @@ -3473,9 +3432,9 @@ button.btn-icon-text > i.icon-white { 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);