diff options
| -rw-r--r-- | mod/thewire/languages/en.php | 1 | ||||
| -rw-r--r-- | views/default/css.php | 118 | ||||
| -rw-r--r-- | views/default/navigation/site_nav.php (renamed from views/default/navigation/main_nav.php) | 12 | ||||
| -rw-r--r-- | views/default/page_elements/elgg_header.php | 2 |
4 files changed, 66 insertions, 67 deletions
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 *************************************** */ @@ -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, 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>"; 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 @@ <!-- display site name --> <h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1> <?php + // insert site-wide navigation + echo elgg_view('navigation/site_nav'); // insert a view which can be extended echo elgg_view('header/extend'); ?> |