Moved toolbar dropdown menu to main nav.

Added CSS for main nav dropdown.
Emptied navigation/topbar_tools view.



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

1 files changed, 1 insertions, 12 deletions

diff --git a/views/default/admin/menu_items.php b/views/default/admin/menu_items.php
index 68f3688d8..c9bdc5bca 100644
--- a/views/default/admin/menu_items.php
+++ b/views/default/admin/menu_items.php
@@ -27,7 +27,7 @@ echo elgg_view('output/longtext', array('value' => elgg_echo("admin:menu_items:d
 $form_body = '';
 
 // @todo Could probably make this number configurable
-for ($i=0; $i<7; $i++) {
+for ($i=0; $i<6; $i++) {
 	if (array_key_exists($i, $featured_urls)) {
 		$current_value = $featured_urls[$i]->value->url;
 	} else {
@@ -40,17 +40,6 @@ for ($i=0; $i<7; $i++) {
 		'value' => $current_value
 	));
 }
-$form_body .= '<br /><br />';
-$form_body .= '<label for="menu_items_hide_toolbar_entries">'
-	. elgg_echo('admin:menu_items:hide_toolbar_entries') . '</label>';
-$form_body .= elgg_view('input/pulldown', array(
-	'internalname' => 'menu_items_hide_toolbar_entries',
-	'internalid' => 'menu_items_hide_toolbar_entries',
-	'value' => get_config('menu_items_hide_toolbar_entries'),
-	'options_values' => array(
-		'yes' => elgg_echo('option:yes'),
-		'no' => elgg_echo('option:no')
-)));
 
 $form_body .= '<br /><br />';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));