Fixes #3005. Added links to admin faq, admin manual, blog, and community forums in...

git-svn-id: http://code.elgg.org/elgg/trunk@8634 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 176ef21e5b4a0274dc7444ed23972995b4ee7645..1459c7716c80fe80e5e5eb249c8172ccf28c0276 100644 (file)
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -284,9 +284,27 @@ function admin_pagesetup() {
                // setup footer menu
                elgg_register_menu_item('admin_footer', array(
                        'name' => 'faq',
-                       'text' => elgg_echo('admin:faq'),
+                       'text' => elgg_echo('admin:footer:faq'),
                        'href' => 'http://docs.elgg.org/wiki/Category:Administration_FAQ',
                ));
+
+               elgg_register_menu_item('admin_footer', array(
+                       'name' => 'manual',
+                       'text' => elgg_echo('admin:footer:manual'),
+                       'href' => 'http://docs.elgg.org/wiki/Administration_Manual',
+               ));
+
+               elgg_register_menu_item('admin_footer', array(
+                       'name' => 'community_forums',
+                       'text' => elgg_echo('admin:footer:community_forums'),
+                       'href' => 'http://community.elgg.org/pg/groups/world/',
+               ));
+
+               elgg_register_menu_item('admin_footer', array(
+                       'name' => 'blog',
+                       'text' => elgg_echo('admin:footer:blog'),
+                       'href' => 'http://blog.elgg.org/',
+               ));
        }
 }
 

diff --git a/languages/en.php b/languages/en.php
index 9b6d0f86f2fca68f06e1f3737eac652d3d5e8bd3..e088d16376e6cdb3c782e35a377eff50cd621061 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -559,6 +559,12 @@ $english = array(
        'admin:widget:admin_welcome' => 'Welcome',
        'admin:widget:admin_welcome:help' => "A short introduction to Elgg's admin area",
 
+       'admin:footer:faq' => 'Administration FAQ',
+       'admin:footer:manual' => 'Administration Manual',
+       'admin:footer:community_forums' => 'Elgg Community Forums',
+       'admin:footer:blog' => 'Elgg Blog',
+
+
 /**
  * Plugins
  */

diff --git a/views/default/admin/footer.php b/views/default/admin/footer.php
index 72f00fc55c88542f6080ca242460845e67f0cfce..ce420e99a410c256c9160db2c46a0c805298b103 100644 (file)
--- a/views/default/admin/footer.php
+++ b/views/default/admin/footer.php
@@ -3,5 +3,7 @@
  * Elgg admin footer. Extend this view to add content to the admin footer
  */
 
-echo elgg_view_menu('admin_footer');
-echo 'test';
\ No newline at end of file
+$options = array(
+       'class' => 'elgg-menu-hz'
+);
+echo elgg_view_menu('admin_footer', $options);
\ No newline at end of file

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 8639af5eae88749a4f5de7af52824d2fae1fb327..0da86967b9d552b18aa65ed9b0cc4a185702a312 100644 (file)
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1352,3 +1352,27 @@ p.elgg-state-error {
 <?php //What to do with states that don't have default styles? ?>
 .elgg-state-selected {}
 .elgg-state-disabled {}
+
+/* ***************************************
+       Footer and horizontal menus
+*************************************** */
+
+/* Horizontal menus w/ separator support */
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a {
+       display:inline-block;
+       vertical-align:middle;
+}
+
+/* Allow inline image blocks in horizontal menus */
+.elgg-menu-hz .elgg-body:after {
+       content: '.';
+}
+.elgg-menu-admin-footer a {
+       color: #eeeeee;
+}
+
+.elgg-menu-admin-footer > li {
+       padding-right: 25px;
+}
\ No newline at end of file