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, 59 insertions, 59 deletions

diff --git a/views/default/css.php b/views/default/css.php
index 3fe37b959..aac500871 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -12,12 +12,13 @@
 	ELGG TOPBAR					elgg topbar
 	TOOLS MENU					drop-down tools menu in topbar
 	HEADER CONTENTS
+	ELGG SITE NAVIGATION		Primary site navigation in header
 	FOOTER CONTENTS
 	SYSTEM MESSAGES				system messages overlay
 	BREADCRUMBS
 	SUBMENU						current page/tool submenu in sidebar
 	PAGINATION					re-usable default page navigation
-	ELGG TABBED NAVIGATION 		primary tabbed elgg navigation in header
+	ELGG TABBED NAVIGATION 		re-usable tabbed navigation
 	LOGIN / REGISTER			login box, register, and lost password page styles
 	CONTENT HEADER
 	ENTITY LISTINGS				elgg's default entity listings
@@ -328,63 +329,6 @@ h2 {
 }
 
 
-
-/* ***************************************
-	ELGG MAIN NAVIGATION in header
-*************************************** */
-.navigation,
-.navigation ul {
-	margin:0;
-	padding:0;
-	display:inline;
-	float:left;
-	list-style-type: none;
-	z-index: 7000;
-	position: relative;
-}
-.navigation li {
-	list-style: none;
-	font-weight: bold;
-	position: relative;
-	display:block;
-	height:23px;
-	float:left;
-	margin:0;
-	padding:0;
-}
-.navigation a {
-	display:block;
-}
-.navigation a {
-	color:white;
-	margin:0 1px 0 0px;
-	text-decoration:none;
-	font-weight: bold;
-	font-size: 1em;
-	padding:3px 13px 0px 13px;
-	height:20px;
-}
-.navigation li a.hover,
-.navigation a:hover {
-	background:white;
-	color:#43575e;
-	-moz-border-radius-topleft:4px;
-	-moz-border-radius-topright:4px;
-	-webkit-border-top-left-radius:4px;
-	-webkit-border-top-right-radius:4px;
-}
-.navigation li.selected a {
-	background:white;
-	color:#43575e;
-	-moz-border-radius-topleft:4px;
-	-moz-border-radius-topright:4px;
-	-webkit-border-top-left-radius:4px;
-	-webkit-border-top-right-radius:4px;
-	margin-top:2px;
-}
-
-
-
 /* ***************************************
   ELGG TOPBAR
 *************************************** */
@@ -590,6 +534,61 @@ h2 {
 
 
 /* ***************************************
+	ELGG SITE NAVIGATION in header
+*************************************** */
+.navigation,
+.navigation ul {
+	margin:0;
+	padding:0;
+	display:inline;
+	float:left;
+	list-style-type: none;
+	z-index: 7000;
+	position: relative;
+}
+.navigation li {
+	list-style: none;
+	font-weight: bold;
+	position: relative;
+	display:block;
+	height:23px;
+	float:left;
+	margin:0;
+	padding:0;
+}
+.navigation a {
+	display:block;
+}
+.navigation a {
+	color:white;
+	margin:0 1px 0 0px;
+	text-decoration:none;
+	font-weight: bold;
+	font-size: 1em;
+	padding:3px 13px 0px 13px;
+	height:20px;
+}
+.navigation li a.hover,
+.navigation a:hover {
+	background:white;
+	color:#43575e;
+	-moz-border-radius-topleft:4px;
+	-moz-border-radius-topright:4px;
+	-webkit-border-top-left-radius:4px;
+	-webkit-border-top-right-radius:4px;
+}
+.navigation li.selected a {
+	background:white;
+	color:#43575e;
+	-moz-border-radius-topleft:4px;
+	-moz-border-radius-topright:4px;
+	-webkit-border-top-left-radius:4px;
+	-webkit-border-top-right-radius:4px;
+	margin-top:2px;
+}
+
+
+/* ***************************************
 	FOOTER CONTENTS
 *************************************** */
 #elgg_footer_contents,
@@ -997,7 +996,8 @@ p.entity_subtext {
 
 
 /* ***************************************
-	USER SETTINGS & ADMIN AREA
+	USER SETTINGS & ADMIN AREA 
+	@todo - pull admin css into stand-alone css
 *************************************** */
 /* GENERAL STYLES */
 .user_settings,