aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-05 16:17:38 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-05 16:17:38 +0000
commite653f20df28c493811d5c66667cc2d614bc47531 (patch)
treeab9160f7b9f60971cef86a412dcc76e241927bd9
parent5d9f88a89ac15608edbc1f7076409108368c6028 (diff)
downloadelgg-e653f20df28c493811d5c66667cc2d614bc47531.tar.gz
elgg-e653f20df28c493811d5c66667cc2d614bc47531.tar.bz2
pulled power by icon out of menu in footer as it serves a different purpose than other menu items
git-svn-id: http://code.elgg.org/elgg/trunk@8583 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/elgglib.php10
-rw-r--r--mod/externalpages/start.php1
-rw-r--r--mod/reportedcontent/start.php1
-rw-r--r--views/default/css/elements/navigation.php2
-rw-r--r--views/default/page/elements/footer.php11
5 files changed, 12 insertions, 13 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 24227e0e8..3511be0ca 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1821,16 +1821,6 @@ function elgg_init() {
'priority' => 1,
));
- $powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif";
-
- elgg_register_menu_item('footer', array(
- 'name' => 'powered_by_elgg',
- 'href' => 'http://elgg.org',
- 'text' => "<img src=\"$powered_url\" alt=\"Powered by Elgg\" width=\"106\" height=\"15\" />",
- 'section' => 'alt',
- 'priority' => 1000,
- ));
-
// Sets a blacklist of words in the current language.
// This is a comma separated list in word:blacklist.
// @todo possibly deprecate
diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php
index cdc400274..4dffe93c5 100644
--- a/mod/externalpages/start.php
+++ b/mod/externalpages/start.php
@@ -29,6 +29,7 @@ function expages_setup_footer_menu() {
foreach ($pages as $page) {
$url = "pg/expages/read/$page";
$item = new ElggMenuItem($page, elgg_echo("expages:$page"), $url);
+ $item->setSection('alt');
elgg_register_menu_item('footer', $item);
}
}
diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php
index b92ab0f30..e42d86cf8 100644
--- a/mod/reportedcontent/start.php
+++ b/mod/reportedcontent/start.php
@@ -30,7 +30,6 @@ function reportedcontent_init() {
'href' => $href,
'title' => elgg_echo('reportedcontent:this:tooltip'),
'text' => elgg_view_icon('report-this') . elgg_echo('reportedcontent:this'),
- 'section' => 'alt',
'priority' => 500,
));
}
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index bedc4ad8b..bac4b4605 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -431,7 +431,7 @@ li:hover > .elgg-menu-site-more {
}
/* ***************************************
- LONGTEXT
+ OWNER BLOCK
*************************************** */
.elgg-menu-owner_block > li {
float: left;
diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php
index 5c8caf2de..5e572844c 100644
--- a/views/default/page/elements/footer.php
+++ b/views/default/page/elements/footer.php
@@ -8,4 +8,13 @@
*
*/
-echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz')); \ No newline at end of file
+echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz'));
+
+$powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif";
+
+echo '<div class="mts right">';
+echo elgg_view('output/url', array(
+ 'href' => 'http://elgg.org',
+ 'text' => "<img src=\"$powered_url\" alt=\"Powered by Elgg\" width=\"106\" height=\"15\" />",
+ 'class' => '',
+));