Added basic (stage1) site-wide navigation. Needs improving with a way for admin and plugin authors to decide which mods display in the primary nav-bar, and which page within each tool they point at.

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

1 files changed, 4 insertions, 8 deletions

diff --git a/views/default/navigation/main_nav.php b/views/default/navigation/site_nav.php
index 42796ef9a..de37038cf 100644
--- a/views/default/navigation/main_nav.php
+++ b/views/default/navigation/site_nav.php
@@ -1,15 +1,11 @@
 <?php
 /**
- * Main navigation bar
+ * Main site-wide navigation
  **/
  
 echo "<div id='elgg_main_nav' class='clearfloat'>";
 echo "<ul class='navigation'>";
-//if(get_context() == 'home')
-//	$selected = "class=selected";
-//else
-//	$selected = "";
-//echo "<li {$selected}><a href=\"{$vars['url']}\" id='home'><span>Home</span></a></li>";
+
 if(is_plugin_enabled('riverdashboard')){
 	if(get_context() == 'riverdashboard')
 		$selected = 'class="selected"';
@@ -22,7 +18,7 @@ if(is_plugin_enabled('thewire') && isloggedin()){
 		$selected = 'class="selected"';
 	else
 		$selected = "";
-	echo "<li {$selected}><a href=\"{$vars['url']}mod/thewire/all.php\" id='thewire'><span>" . elgg_echo('thewire') . "</span></a></li>";
+	echo "<li {$selected}><a href=\"{$vars['url']}mod/thewire/everyone.php\" id='thewire'><span>" . elgg_echo('thewire:title') . "</span></a></li>";
 }
 if(is_plugin_enabled('blog')){
 	if(get_context() == 'blog')
@@ -57,7 +53,7 @@ if(is_plugin_enabled('groups')){
 		$selected = 'class="selected"';
 	else
 		$selected = "";
-	echo "<li {$selected}><a href=\"{$vars['url']}pg/groups/all/\" id='groups'><span>". elgg_echo('groups') . "</span></a></li>";
+	echo "<li {$selected}><a href=\"{$vars['url']}pg/groups/world/\" id='groups'><span>". elgg_echo('groups') . "</span></a></li>";
 }
 echo "</ul>";
 echo "</div>";