From 2417a810cb3799ade1be23b1de88349a3fb1d701 Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 9 Mar 2010 13:45:53 +0000
Subject: 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
---
 views/default/navigation/main_nav.php | 65 -----------------------------------
 views/default/navigation/site_nav.php | 61 ++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 65 deletions(-)
 delete mode 100644 views/default/navigation/main_nav.php
 create mode 100644 views/default/navigation/site_nav.php

(limited to 'views/default/navigation')

diff --git a/views/default/navigation/main_nav.php b/views/default/navigation/main_nav.php
deleted file mode 100644
index 42796ef9a..000000000
--- a/views/default/navigation/main_nav.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Main navigation bar
- **/
- 
-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"';
-	else
-		$selected = "";
-	echo "<li {$selected}><a href=\"{$vars['url']}mod/riverdashboard/\" id='activity'><span>Activity</span></a></li>";
-}
-if(is_plugin_enabled('thewire') && isloggedin()){
-	if(get_context() == 'thewire')
-		$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>";
-}
-if(is_plugin_enabled('blog')){
-	if(get_context() == 'blog')
-		$selected = 'class="selected"';
-	else
-		$selected = "";
-	echo "<li {$selected}><a href=\"{$vars['url']}mod/blog/all.php\" id='blogs'><span>Blogs</span></a></li>";
-}
-if(is_plugin_enabled('pages')){
-	if(get_context() == 'pages')
-		$selected = 'class="selected"';
-	else
-		$selected = "";
-	echo "<li {$selected}><a href=\"{$vars['url']}mod/pages/all.php\" id='pages'><span>Pages</span></a></li>";
-}
-if(is_plugin_enabled('file')){
-	if(get_context() == 'file')
-		$selected = 'class="selected"';
-	else
-		$selected = "";
-	echo "<li {$selected}><a href=\"{$vars['url']}mod/file/all.php\" id='files'><span>Files</span></a></li>";
-}
-if(is_plugin_enabled('bookmarks')){
-	if(get_context() == 'bookmarks')
-		$selected = 'class="selected"';
-	else
-		$selected = "";
-	echo "<li {$selected}><a href=\"{$vars['url']}mod/bookmarks/all.php\" id='bookmarks'><span>Bookmarks</span></a></li>";
-}
-if(is_plugin_enabled('groups')){
-	if(get_context() == '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 "</ul>";
-echo "</div>";
-
-?>
\ No newline at end of file
diff --git a/views/default/navigation/site_nav.php b/views/default/navigation/site_nav.php
new file mode 100644
index 000000000..de37038cf
--- /dev/null
+++ b/views/default/navigation/site_nav.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Main site-wide navigation
+ **/
+ 
+echo "<div id='elgg_main_nav' class='clearfloat'>";
+echo "<ul class='navigation'>";
+
+if(is_plugin_enabled('riverdashboard')){
+	if(get_context() == 'riverdashboard')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}mod/riverdashboard/\" id='activity'><span>Activity</span></a></li>";
+}
+if(is_plugin_enabled('thewire') && isloggedin()){
+	if(get_context() == 'thewire')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	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')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}mod/blog/all.php\" id='blogs'><span>Blogs</span></a></li>";
+}
+if(is_plugin_enabled('pages')){
+	if(get_context() == 'pages')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}mod/pages/all.php\" id='pages'><span>Pages</span></a></li>";
+}
+if(is_plugin_enabled('file')){
+	if(get_context() == 'file')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}mod/file/all.php\" id='files'><span>Files</span></a></li>";
+}
+if(is_plugin_enabled('bookmarks')){
+	if(get_context() == 'bookmarks')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}mod/bookmarks/all.php\" id='bookmarks'><span>Bookmarks</span></a></li>";
+}
+if(is_plugin_enabled('groups')){
+	if(get_context() == 'groups')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}pg/groups/world/\" id='groups'><span>". elgg_echo('groups') . "</span></a></li>";
+}
+echo "</ul>";
+echo "</div>";
+
+?>
\ No newline at end of file
-- 
cgit v1.2.3