diff options
| author | cash <cash.costello@gmail.com> | 2011-10-27 21:23:28 -0400 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-10-27 21:23:28 -0400 |
| commit | f126deebed40cf175a5b0ef2744737189429a5ca (patch) | |
| tree | 3d3c02d8cba5639187e69b880dad854198ae486c | |
| parent | 4e6c2eaaf23416125f39233372cd9dbf9ff2a97a (diff) | |
| download | elgg-f126deebed40cf175a5b0ef2744737189429a5ca.tar.gz elgg-f126deebed40cf175a5b0ef2744737189429a5ca.tar.bz2 | |
Fixes #3863 introduced elgg-menu-general so that elgg-menu-footer can be specific to site footer
| -rw-r--r-- | mod/externalpages/start.php | 2 | ||||
| -rw-r--r-- | views/default/css/elements/navigation.php | 16 | ||||
| -rw-r--r-- | views/default/css/ie7.php | 7 | ||||
| -rw-r--r-- | views/default/forms/login.php | 2 | ||||
| -rw-r--r-- | views/default/page/walled_garden.php | 7 |
5 files changed, 28 insertions, 6 deletions
diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php index ce911bf10..3169503be 100644 --- 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 bee1312ec..bf1046dda 100644 --- 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 { @@ -429,6 +429,20 @@ } /* *************************************** + 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 *************************************** */ <?php // height depends on line height/font size ?> diff --git a/views/default/css/ie7.php b/views/default/css/ie7.php index 56047b954..754ed3664 100644 --- 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 956b3a87f..07f084660 100644 --- 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 62d8bb077..625c63ddb 100644 --- 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']; ?> |