aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-08 06:35:36 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-08 06:35:36 +0000
commit09acef596481519fa9327950fa9e724357d840b8 (patch)
treea03f578d2638739820b323be9f6243743e1fd133
parent978c2a7bba800e92d21b17d5398cba02ccd63645 (diff)
downloadelgg-09acef596481519fa9327950fa9e724357d840b8.tar.gz
elgg-09acef596481519fa9327950fa9e724357d840b8.tar.bz2
Fixes #3005. Added links to admin faq, admin manual, blog, and community forums in the admin footer.
git-svn-id: http://code.elgg.org/elgg/trunk@8634 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/admin.php20
-rw-r--r--languages/en.php6
-rw-r--r--views/default/admin/footer.php6
-rw-r--r--views/default/css/admin.php24
4 files changed, 53 insertions, 3 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 176ef21e5..1459c7716 100644
--- 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 9b6d0f86f..e088d1637 100644
--- 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 72f00fc55..ce420e99a 100644
--- 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 8639af5ea..0da86967b 100644
--- 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