Fixes #3031 using 'priority' now

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

10 files changed, 31 insertions, 10 deletions

diff --git a/views/default/admin/footer.php b/views/default/admin/footer.php
index 3b773bda7..72f00fc55 100644
--- a/views/default/admin/footer.php
+++ b/views/default/admin/footer.php
@@ -1,4 +1,7 @@
 <?php
 /**
  * Elgg admin footer. Extend this view to add content to the admin footer
- */
\ No newline at end of file
+ */
+
+echo elgg_view_menu('admin_footer');
+echo 'test';
\ No newline at end of file
diff --git a/views/default/admin/sidebar.php b/views/default/admin/sidebar.php
index ef3c6a359..b2c520705 100644
--- a/views/default/admin/sidebar.php
+++ b/views/default/admin/sidebar.php
@@ -3,6 +3,6 @@
  * Admin sidebar -- just outputs the page menu
  */
 
-$content = elgg_view_menu('page', array('sort_by' => 'weight'));
+$content = elgg_view_menu('page', array('sort_by' => 'priority'));
 
 echo elgg_view_module('main', '', $content);
\ No newline at end of file
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index b32e1382b..8639af5ea 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -217,7 +217,6 @@ table.mceLayout {
 	border: 2px solid #dddddd;
 }
 
-
 /* ***************************************
 	BODY
 *************************************** */
@@ -247,6 +246,18 @@ table.mceLayout {
 }
 
 /* ***************************************
+	FOOTER
+*************************************** */
+.elgg-page-footer {
+	background-color: black;
+	height: 100%;
+}
+.elgg-page-footer > .elgg-inner {
+	margin: 0 auto;
+	padding: 10px 40px;
+}
+
+/* ***************************************
 	SIDEBAR MENU
 *************************************** */
 .elgg-menu-page a {
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 210ff4cbe..d8c857b8c 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -428,4 +428,11 @@
 /* Ick.  Allows the horizontal menu to hold image blocks without breaking */
 .elgg-menu-metadata .elgg-body:after {
 	content: '.';
-}
\ No newline at end of file
+}
+
+/* ***************************************
+	LONGTEXT
+*************************************** */
+.elgg-menu-longtext {
+	float: right;
+}
diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php
index edff2da87..b4f621f92 100644
--- a/views/default/input/longtext.php
+++ b/views/default/input/longtext.php
@@ -21,5 +21,5 @@ unset($vars['internalid']);
 
 $vars = array_merge($defaults, $vars);
 
-echo elgg_view_menu('longtext', array('sort_by' => 'weight'));
+echo elgg_view_menu('longtext', array('sort_by' => 'priority'));
 echo elgg_view('input/plaintext', $vars);
diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php
index e818c0eff..5c8caf2de 100644
--- a/views/default/page/elements/footer.php
+++ b/views/default/page/elements/footer.php
@@ -8,4 +8,4 @@
  *
  */
 
-echo elgg_view_menu('footer', array('sort_by' => 'weight', 'class' => 'elgg-menu-hz'));
\ No newline at end of file
+echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz'));
\ No newline at end of file
diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
index 849b1fdcd..b69c101a2 100644
--- a/views/default/page/elements/topbar.php
+++ b/views/default/page/elements/topbar.php
@@ -7,7 +7,7 @@
 
 
 // Elgg logo
-echo elgg_view_menu('topbar', array('sort_by' => 'weight', array('elgg-menu-hz')));
+echo elgg_view_menu('topbar', array('sort_by' => 'priority', array('elgg-menu-hz')));
 
 // elgg tools menu
 // need to echo this empty view for backward compatibility.
diff --git a/views/default/page/layouts/content/filter.php b/views/default/page/layouts/content/filter.php
index 7577f2839..649113f5f 100644
--- a/views/default/page/layouts/content/filter.php
+++ b/views/default/page/layouts/content/filter.php
@@ -45,5 +45,5 @@ if (elgg_is_logged_in() && $context) {
 		elgg_register_menu_item('filter', $tab);
 	}
 
-	echo elgg_view_menu('filter', array('sort_by' => 'weight', 'class' => 'elgg-menu-hz'));
+	echo elgg_view_menu('filter', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz'));
 }
diff --git a/views/default/page/layouts/content/header.php b/views/default/page/layouts/content/header.php
index cbdd1071a..830c33885 100644
--- a/views/default/page/layouts/content/header.php
+++ b/views/default/page/layouts/content/header.php
@@ -41,7 +41,7 @@ if ($context) {
 			));
 		}
 		
-		$buttons = elgg_view_menu('title', array('sort_by' => 'weight', 'class' => 'elgg-menu-hz'));
+		$buttons = elgg_view_menu('title', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz'));
 	}
 	echo <<<HTML
 <div class="elgg-head clearfix">
diff --git a/views/default/river/item/controls.php b/views/default/river/item/controls.php
index 96979f2c5..50c1ae09e 100644
--- a/views/default/river/item/controls.php
+++ b/views/default/river/item/controls.php
@@ -47,5 +47,5 @@ if (elgg_is_logged_in()) {
 		}
 	}
 
-	echo elgg_view_menu('river', array('sort_by' => 'weight', 'item' => $vars['item']));
+	echo elgg_view_menu('river', array('sort_by' => 'priority', 'item' => $vars['item']));
 }
\ No newline at end of file