fix settings page aside menu active item

add aside menu to delegate page

diff --git a/mod/delegate.php b/mod/delegate.php
index dd9caba2524a4be00a8b06e2ee3a5793602c2c55..20d2e605e0a2d91c90e1d664567037d6baf1902d 100644 (file)
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -1,4 +1,10 @@
 <?php
+require_once('mod/settings.php');
+
+function delegate_init(&$a) {
+       return settings_init($a);
+}
+
 
 function delegate_content(&$a) {
 

diff --git a/mod/settings.php b/mod/settings.php
index ae4c36e0cc0be0e2df3778daeaff4916a1f51ad9..b7148bb3605751c89dc71f064dfe94d2ba5cb812 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -35,7 +35,7 @@ function settings_init(&$a) {
                array(
                        'label' => t('Account'),
                        'url'   => $a->get_baseurl(true).'/settings',
-                       'selected'      => (($a->argc == 1)?'active':''),
+                       'selected'      =>  (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''),
                ),
                array(
                        'label' => t('Additional features'),
@@ -61,7 +61,7 @@ function settings_init(&$a) {
                array(
                        'label' => t('Delegations'),
                        'url'   => $a->get_baseurl(true).'/delegate',
-                       'selected'      => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
+                       'selected'      => (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''),
                ),
                array(
                        'label' => t('Connected apps'),
@@ -71,12 +71,12 @@ function settings_init(&$a) {
                array(
                        'label' => t('Export personal data'),
                        'url' => $a->get_baseurl(true) . '/uexport',
-                       'selected' => ''
+                       'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''),
                ),
                array(
                        'label' => t('Remove account'),
                        'url' => $a->get_baseurl(true) . '/removeme',
-                       'selected' => ''
+                       'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''),
                )
        );