From 2417a810cb3799ade1be23b1de88349a3fb1d701 Mon Sep 17 00:00:00 2001 From: pete 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 --- mod/thewire/languages/en.php | 1 + views/default/css.php | 118 ++++++++++++++-------------- views/default/navigation/main_nav.php | 65 --------------- views/default/navigation/site_nav.php | 61 ++++++++++++++ views/default/page_elements/elgg_header.php | 2 + 5 files changed, 123 insertions(+), 124 deletions(-) delete mode 100644 views/default/navigation/main_nav.php create mode 100644 views/default/navigation/site_nav.php diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php index c2e23d04f..23e243716 100644 --- a/mod/thewire/languages/en.php +++ b/mod/thewire/languages/en.php @@ -6,6 +6,7 @@ * Menu items and titles */ + 'thewire:title' => "The Wire", 'thewire' => "My wire posts", 'thewire:user' => "%s's wire posts", 'thewire:posttitle' => "%s's notes on the wire: %s", 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 *************************************** */ @@ -589,6 +533,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 *************************************** */ @@ -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, 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 @@ -"; -echo ""; -echo ""; - -?> \ 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 @@ +"; +echo ""; +echo ""; + +?> \ No newline at end of file diff --git a/views/default/page_elements/elgg_header.php b/views/default/page_elements/elgg_header.php index 0f99334df..0733268f4 100644 --- a/views/default/page_elements/elgg_header.php +++ b/views/default/page_elements/elgg_header.php @@ -10,6 +10,8 @@

sitename; ?>

-- cgit v1.2.3