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 @@
- + - + \ 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 @@ + \ 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 @@