Fixes #3863 introduced elgg-menu-general so that elgg-menu-footer can be specific...

diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php
index ce911bf107003b2f8a1e751000ec53a47ec8f6d4..3169503be1f1e9a9dee381dd191ca8e159d129b9 100644 (file)
--- a/mod/externalpages/start.php
+++ b/mod/externalpages/start.php
@@ -44,7 +44,7 @@ function expages_setup_footer_menu() {
        foreach ($pages as $page) {
                $url = "$page";
                $item = new ElggMenuItem($page, elgg_echo("expages:$page"), $url);
-               elgg_register_menu_item('footer', $item);
+               elgg_register_menu_item('walled_garden', $item);
        }
 }
 

diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index bee1312ec551b945e0567b1a378a2ce2b2827282..bf1046dda9b52664e5c1bbfd94bd7b9165219db0 100644 (file)
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -407,7 +407,7 @@
 }
 
 /* ***************************************
-       FOOTER
+       SITE FOOTER
 *************************************** */
 .elgg-menu-footer > li,
 .elgg-menu-footer > li > a {
@@ -428,6 +428,20 @@
        float: left;
 }
 
+/* ***************************************
+       GENERAL MENU
+*************************************** */
+.elgg-menu-general > li,
+.elgg-menu-general > li > a {
+       display: inline-block;
+       color: #999;
+}
+
+.elgg-menu-general > li:after {
+       content: "\007C";
+       padding: 0 4px;
+}
+
 /* ***************************************
        ENTITY AND ANNOTATION
 *************************************** */

diff --git a/views/default/css/ie7.php b/views/default/css/ie7.php
index 56047b9544bb511d4216ff426adb27cfe23016ed..754ed3664ceb72fbc553da6335dd9a3c2e4b2b9c 100644 (file)
--- a/views/default/css/ie7.php
+++ b/views/default/css/ie7.php
@@ -22,7 +22,9 @@
 .elgg-menu-hz > li > span,
 .elgg-breadcrumbs > li,
 .elgg-menu-footer > li > a,
-.elgg-menu-footer li {
+.elgg-menu-footer li,
+.elgg-menu-general > li > a,
+.elgg-menu-general li {
        display: inline;
 }
 
@@ -34,7 +36,8 @@
        border-right: 1px solid #bababa;
 }
 .elgg-menu-footer li,
-.elgg-menu-user li {
+.elgg-menu-user li,
+.elgg-menu-general li {
        padding-left: 4px;
        padding-right: 4px;
 }

diff --git a/views/default/forms/login.php b/views/default/forms/login.php
index 956b3a87f704655facbe16f88a24e2e2143e8758..07f084660c95a6e0ed049a38225d18efb5db681c 100644 (file)
--- a/views/default/forms/login.php
+++ b/views/default/forms/login.php
@@ -36,7 +36,7 @@
        }
        ?>
 
-       <ul class="elgg-menu elgg-menu-footer mtm">
+       <ul class="elgg-menu elgg-menu-general mtm">
        <?php
                if (elgg_get_config('allow_registration')) {
                        echo '<li><a class="registration_link" href="' . elgg_get_site_url() . 'register">' . elgg_echo('register') . '</a></li>';

diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php
index 62d8bb077250379be1699e5cae526dd09ec44c6d..625c63ddbe5cfebfe9fa2095d7d7ce0514d3d5cc 100644 (file)
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -31,7 +31,12 @@ $title = $site->name;
                                                echo $title;
                                        ?>
                                </h1>
-                               <?php echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz')); ?>
+                               <?php
+                               echo elgg_view_menu('walled_garden', array(
+                                       'sort_by' => 'priority',
+                                       'class' => 'elgg-menu-general elgg-menu-hz',
+                               ));
+                               ?>
                        </div>
                        <div id="elgg-walledgarden-login">
                                <?php echo $vars['body']; ?>