From 2fd1e7162084e0ce561274e3076e9aebdb74fee8 Mon Sep 17 00:00:00 2001 From: Xabi Spacebiker Date: Fri, 29 Sep 2017 15:50:50 +0200 Subject: [PATCH 01/11] Interface improvements https://github.com/LibreTime/libretime/issues/313 --- airtime_mvc/application/configs/navigation.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index b81ddee9f..cacb01bd1 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -77,26 +77,28 @@ $pages[] = array( array( 'label' => _('General'), 'module' => 'default', - 'controller' => 'preference' + 'controller' => 'preference', + 'resource' => 'preference' ), array( 'label' => _('My Profile'), 'controller' => 'user', 'action' => 'edit-user', - 'resource' => 'user' + 'resource' => 'usersettings' ), array( 'label' => _('Users'), 'module' => 'default', 'controller' => 'user', 'action' => 'add-user', - 'resource' => 'user' + 'resource' => 'user' ), array( 'label' => _('Streams'), 'module' => 'default', 'controller' => 'preference', - 'action' => 'stream-setting' + 'action' => 'stream-setting', + 'resource' => 'preference' ), array( 'label' => _('Status'), @@ -220,4 +222,4 @@ $container = new Zend_Navigation($pages); $container->id = "nav"; //store it in the registry: -Zend_Registry::set('Zend_Navigation', $container); +Zend_Registry::set('Zend_Navigation', $container); \ No newline at end of file From e2d5e6934caa32404700d084d87b41845b85d1c4 Mon Sep 17 00:00:00 2001 From: Xabi Spacebiker Date: Fri, 29 Sep 2017 15:53:27 +0200 Subject: [PATCH 02/11] Interface improvements https://github.com/LibreTime/libretime/issues/313 --- .../views/scripts/partialviews/header.phtml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml index 8ca2a74d2..03722154c 100644 --- a/airtime_mvc/application/views/scripts/partialviews/header.phtml +++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml @@ -1,5 +1,5 @@
- +
@@ -54,14 +54,6 @@
    • -
    -
      -
    1. - baseUrl . "/user/edit-user"?>>escape($this->loggedInAs()); ?> - | baseUrl . "/login/logout"?>> -
      2. -
    -
    - + \ No newline at end of file From 81896723cac1417c494c8ae975c55d17a0bd961a Mon Sep 17 00:00:00 2001 From: Xabi Spacebiker Date: Fri, 29 Sep 2017 15:53:40 +0200 Subject: [PATCH 03/11] Interface improvements https://github.com/LibreTime/libretime/issues/313 --- airtime_mvc/application/views/scripts/menu.phtml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/views/scripts/menu.phtml b/airtime_mvc/application/views/scripts/menu.phtml index a1273055d..9280b7f24 100644 --- a/airtime_mvc/application/views/scripts/menu.phtml +++ b/airtime_mvc/application/views/scripts/menu.phtml @@ -1,5 +1,15 @@
      container as $page) : ?> + isUserType(array(UTYPE_HOST)); + if ($isHost && $page->getTitle() === 'Settings') { + $page->set('resource', 'usersettings'); + $page->set('controller', 'user'); + $page->set('action','edit-user'); + } + ?> navigation()->accept($page)) : ?>
    1. hasPages()) : ?> @@ -29,4 +39,4 @@
      2. -
    + \ No newline at end of file From ff7ef7cdf4ea510f066d82349a51e70d2348ff76 Mon Sep 17 00:00:00 2001 From: Xabi Spacebiker Date: Fri, 29 Sep 2017 15:55:33 +0200 Subject: [PATCH 04/11] Fix comments --- airtime_mvc/application/views/scripts/menu.phtml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/views/scripts/menu.phtml b/airtime_mvc/application/views/scripts/menu.phtml index 9280b7f24..76644aabf 100644 --- a/airtime_mvc/application/views/scripts/menu.phtml +++ b/airtime_mvc/application/views/scripts/menu.phtml @@ -1,7 +1,10 @@
      container as $page) : ?> isUserType(array(UTYPE_HOST)); if ($isHost && $page->getTitle() === 'Settings') { From adbcdc496b16a2394585bddadf52658fcceff438 Mon Sep 17 00:00:00 2001 From: Xabi Spacebiker Date: Sat, 30 Sep 2017 13:06:07 +0200 Subject: [PATCH 05/11] Styles css fixes --- airtime_mvc/public/css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 32fb73bd9..081d16d9d 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -102,7 +102,7 @@ select { #version-icon { position:absolute; top:68px; - right: 196px; + right: 10px; height:35px; width:35px; z-index:1000; From c62eff2913446e758c6867daefebda6cd9240f5f Mon Sep 17 00:00:00 2001 From: Xabi Spacebiker Date: Sat, 30 Sep 2017 13:24:20 +0200 Subject: [PATCH 06/11] Hide Radio Page Menu Link, it is useless and --- airtime_mvc/application/configs/navigation.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index cacb01bd1..f7c81aafa 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -26,7 +26,8 @@ $pages[] = array( 'uri' => '/', 'resource' => '', 'class' => '', - 'pages' => array() + 'pages' => array(), + 'visible' => false ); $pages[] = array( 'label' => _('Calendar'), From 8d23a91ac0e6cf291fcd6c8e93a1960480318927 Mon Sep 17 00:00:00 2001 From: Xabi Spacebiker Date: Sat, 30 Sep 2017 15:56:34 +0200 Subject: [PATCH 07/11] Fixing layout in styles.css --- airtime_mvc/public/css/styles.css | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 081d16d9d..f5f4a6adc 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -391,16 +391,7 @@ select { padding:0 12px 0 0; background:url(images/masterpanel_spacer.png) no-repeat right 0; } -.time-info-block { - -webkit-flex: 0 150px; - -moz-flex: 0 150px; - -ms-flex: 0 150px; - -o-flex: 0 150px; - flex: 0 150px; - /*position: absolute;*/ - /*top: 0;*/ - /*right: 0;*/ -} + ol.navigation { padding: 0; margin: 0; From de7432934c9fdf44433d1300becda101a089484a Mon Sep 17 00:00:00 2001 From: Xabi Spacebiker Date: Sun, 1 Oct 2017 17:13:15 +0200 Subject: [PATCH 08/11] Adding logout button --- airtime_mvc/application/layouts/scripts/layout.phtml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml index cc89c21e4..a67970653 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -92,6 +92,14 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= + +
      + + + +