aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/css/elements/navigation.php183
-rw-r--r--views/default/css/elements/page_layout.php202
-rw-r--r--views/default/navigation/site_nav.php16
-rw-r--r--views/default/page/elements/header_logo.php7
4 files changed, 178 insertions, 230 deletions
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 1321dac4b..f5871f33e 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -6,11 +6,10 @@
* @subpackage UI
*/
?>
+
/* ***************************************
- Navigation
+ PAGINATION
*************************************** */
-
-/* Pagination */
.elgg-pagination {
margin: 10px 0;
display: block;
@@ -42,7 +41,9 @@
color: #555555;
border-color: #555555;
}
-/* Tabs */
+/* ***************************************
+ TABS
+*************************************** */
.elgg-horizontal-tabbed-nav {
margin-bottom:5px;
padding: 0;
@@ -87,7 +88,9 @@
top: 2px;
background: white;
}
-/* Breadcrumbs */
+/* ***************************************
+ BREADCRUMBS
+*************************************** */
.elgg-breadcrumbs {
font-size: 80%;
font-weight: bold;
@@ -118,98 +121,43 @@
top:-6px;
left:0;
}
-/* Menu */
-.submenu {
- margin:0;
- padding:0;
- list-style: none;
-}
-.submenu ul {
- margin-bottom:0;
- padding-left:0;
- list-style: none;
-}
-.submenu li.selected a,
-.submenu li.selected li.selected a,
-.submenu li.selected li.selected li.selected a {
- background: #4690D6;
- color:white;
-}
-.submenu li a {
- display:block;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
- background-color:white;
- margin:0 0 3px 0;
- padding:2px 4px 2px 8px;
-}
-.submenu li a:hover {
- background:#0054A7;
- color:white;
- text-decoration:none;
-}
-.submenu .child li a {
- margin-left:15px;
- background-color:white;
- color:#4690D6;
-}
-.submenu .child li a:hover {
- background:#0054A7;
- color:white;
- text-decoration:none;
-}
-
-.navigation,
-.navigation ul {
- margin:0;
- padding:0;
- display:inline;
- float:left;
- list-style-type: none;
+/* ***************************************
+ SITE MENU
+*************************************** */
+.elgg-site-menu {
+ position: absolute;
+ height: 23px;
+ bottom: 0;
+ left: 0;
+ width: auto;
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;
+.elgg-site-menu li {
+ display: block;
+ float: left;
+ height: 23px;
+ margin-right: 1px;
}
-.navigation a {
- color:white;
- margin:0 1px 0 0px;
- text-decoration:none;
+.elgg-site-menu a {
+ color: white;
+ text-decoration: none;
font-weight: bold;
- font-size: 1em;
- padding:3px 13px 0px 13px;
- height:20px;
- cursor: pointer;
- display:block;
+ padding: 3px 13px 0px 13px;
+ height: 20px;
+ display: block;
}
-.navigation li a:hover {
- background:white;
- color:#555555;
- -moz-border-radius-topleft:4px;
- -moz-border-radius-topright:4px;
- -webkit-border-top-left-radius:4px;
- -webkit-border-top-right-radius:4px;
+.elgg-site-menu li.selected a, .elgg-site-menu li a:hover {
+ background: white;
+ color: #555555;
-webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
+ -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:#555555;
- -moz-border-radius-topleft:4px;
- -moz-border-radius-topright:4px;
- -webkit-border-top-left-radius:4px;
- -webkit-border-top-right-radius:4px;
- margin-top:1px;
- -webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
- -moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
+
+.elgg-site-menu .elgg-more {
}
li.navigation-more {
overflow:hidden;
@@ -217,6 +165,7 @@ li.navigation-more {
li.navigation-more:hover {
overflow:visible;
}
+
li.navigation-more:hover a {
background:white;
color:#555555;
@@ -227,6 +176,7 @@ li.navigation-more:hover a {
-webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
}
+
li.navigation-more a.subnav span {
background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
background-repeat: no-repeat;
@@ -255,7 +205,7 @@ li.navigation-more ul {
li.navigation-more ul li {
float:none;
}
-.navigation li.navigation-more ul li a {
+.elgg-site-menu li.navigation-more ul li a {
background:white;
color:#555555;
margin:0;
@@ -264,14 +214,14 @@ li.navigation-more ul li {
-webkit-box-shadow: none;
-moz-box-shadow: none;
}
-.navigation li.navigation-more ul li:last-child a,
-.navigation li.navigation-more ul li:last-child a:hover {
+.elgg-site-menun li.navigation-more ul li:last-child a,
+.elgg-site-menu li.navigation-more ul li:last-child a:hover {
-moz-border-radius-bottomleft:4px;
-moz-border-radius-bottomright:4px;
-webkit-border-bottom-left-radius:4px;
-webkit-border-bottom-right-radius:4px;
}
-.navigation li.navigation-more ul li a:hover {
+.elgg-site-menu li.navigation-more ul li a:hover {
background:#4690D6;
color:white;
margin:0;
@@ -280,7 +230,52 @@ li.navigation-more ul li {
-webkit-box-shadow: none;
-moz-box-shadow: none;
}
-.navigation li.navigation-more ul li.selected a {
+.elgg-site-menu li.navigation-more ul li.selected a {
background:#4690D6;
color:white;
}
+
+
+/* ***************************************
+ PAGE MENU
+*************************************** */
+.submenu {
+ margin:0;
+ padding:0;
+ list-style: none;
+}
+.submenu ul {
+ margin-bottom:0;
+ padding-left:0;
+ list-style: none;
+}
+.submenu li.selected a,
+.submenu li.selected li.selected a,
+.submenu li.selected li.selected li.selected a {
+ background: #4690D6;
+ color:white;
+}
+.submenu li a {
+ display:block;
+ -webkit-border-radius: 8px;
+ -moz-border-radius: 8px;
+ background-color:white;
+ margin:0 0 3px 0;
+ padding:2px 4px 2px 8px;
+}
+.submenu li a:hover {
+ background:#0054A7;
+ color:white;
+ text-decoration:none;
+}
+.submenu .child li a {
+ margin-left:15px;
+ background-color:white;
+ color:#4690D6;
+}
+.submenu .child li a:hover {
+ background:#0054A7;
+ color:white;
+ text-decoration:none;
+}
+
diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php
index 6250f79ba..17f792ad0 100644
--- a/views/default/css/elements/page_layout.php
+++ b/views/default/css/elements/page_layout.php
@@ -10,69 +10,6 @@
Page Layout
*************************************** */
-.elgg-page-topbar {
- background: #333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left;
- border-bottom: 1px solid #000000;
- min-width: 998px;
- position: relative;
- height: 24px;
- z-index: 9000;
-}
-.elgg-page-header {
- x-overflow: hidden;
- position: relative;
- background-color: #4690D6;
- background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/header_shadow.png);
- background-repeat: repeat-x;
- background-position: bottom left;
-}
-
-.elgg-page-header .elgg-inner {
- width: 990px;
- margin: 0 auto;
- height: 90px;
- position: relative;
-}
-
-.elgg-page-footer {
- position: relative;
- z-index: 999;
-}
-
-.elgg-layout-one_column {
- padding: 10px 0;
-}
-.elgg-layout-sidebar {
- background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif);
- background-repeat:repeat-y;
- background-position: right top;
-}
-.elgg-layout-two-sidebar {
- background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/two_sidebar_background.gif);
- background-repeat:repeat-y;
- background-position: right top;
-}
-.elgg-main {
- position: relative;
- min-height: 360px;
- padding: 10px;
-}
-.elgg-aside {
- padding: 20px 10px;
- position: relative;
- min-height: 360px;
-}
-.elgg-sidebar {
- float: right;
- width: 210px;
- margin-left: 10px;
-}
-.elgg-sidebar-alt {
- float: left;
- width: 160px;
- margin-right: 10px;
-}
-
/* move elgg-body to one of the css components */
/**
* elgg-body fills the space available to it.
@@ -126,16 +63,7 @@
}
-.elgg-main-header {
- border-bottom: 1px solid #CCCCCC;
- padding-bottom: 3px;
-}
-.elgg-main-heading {
- float: left;
- max-width: 530px;
- margin-right: 10px;
-}
.elgg-list {
border-top: 1px dotted #CCCCCC;
@@ -162,19 +90,26 @@
position:absolute;
right:0;
}
-#elgg-main-nav {
- z-index: 7000;
- position: absolute;
- height:23px;
- bottom:0;
- left:0;
- width:auto;
-}
+
/* ***************************************
ELGG TOPBAR
*************************************** */
+.elgg-page-topbar {
+ background: #333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left;
+ border-bottom: 1px solid #000000;
+ min-width: 998px;
+ position: relative;
+ height: 24px;
+ z-index: 9000;
+}
+.elgg-page-header .elgg-inner {
+ width: 990px;
+ margin: 0 auto;
+ height: 90px;
+ position: relative;
+}
.elgg-page-topbar .elgg-inner {
padding: 2px 10px 2px 8px;
}
@@ -197,63 +132,82 @@
margin-top: -1px;
}
-
-
-
-
/* ***************************************
- HEADER CONTENTS
+ HEADER
*************************************** */
-.elgg-page-header-inner {
+.elgg-page-header {
+ x-overflow: hidden;
position: relative;
- height: 90px;
+ background-color: #4690D6;
+ background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/header_shadow.png);
+ background-repeat: repeat-x;
+ background-position: bottom left;
}
-
-.elgg-page-header h1 a span.network-title {
+.elgg-page-header h1 a {
font-size: 2em;
- line-height:1.4em;
+ line-height: 1.4em;
color: white;
font-style: italic;
font-family: Georgia, times, serif;
- display: block;
+ text-shadow: 1px 2px 4px #333333;
text-decoration: none;
- text-shadow:1px 2px 4px #333333;
-}
-.elgg-page-header #elgg-search input.search-input {
- -webkit-border-radius: 10px;
- -moz-border-radius: 10px;
- background-color:transparent;
- border:1px solid #71b9f7;
- color:white;
- font-size:12px;
- font-weight:bold;
- margin:0;
- padding:2px 4px 2px 26px;
- width:198px;
- background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
- background-position: 2px -220px;
- background-repeat: no-repeat;
-}
-.elgg-page-header #elgg-search input.search-input:focus {
- background-color:white;
- color:#0054A7;
- border:1px solid white;
- background-position: 2px -257px;
-}
-.elgg-page-header #elgg-search input.search-input:active {
- background-color:white;
- color:#0054A7;
- border:1px solid white;
- background-position: 2px -257px;
-}
-.elgg-page-header #elgg-search input.search-submit-button {
- display:none;
}
-
/* ***************************************
- FOOTER CONTENTS
+ BODY
*************************************** */
+.elgg-layout-one_column {
+ padding: 10px 0;
+}
+.elgg-layout-sidebar {
+ background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif);
+ background-repeat:repeat-y;
+ background-position: right top;
+}
+.elgg-layout-two-sidebar {
+ background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/two_sidebar_background.gif);
+ background-repeat:repeat-y;
+ background-position: right top;
+}
+.elgg-main {
+ position: relative;
+ min-height: 360px;
+ padding: 10px;
+}
+.elgg-aside {
+ padding: 20px 10px;
+ position: relative;
+ min-height: 360px;
+}
+.elgg-sidebar {
+ float: right;
+ width: 210px;
+ margin-left: 10px;
+}
+.elgg-sidebar-alt {
+ float: left;
+ width: 160px;
+ margin-right: 10px;
+}
+
+.elgg-main-header {
+ border-bottom: 1px solid #CCCCCC;
+ padding-bottom: 3px;
+}
+
+.elgg-main-heading {
+ float: left;
+ max-width: 530px;
+ margin-right: 10px;
+}
+
+/* ***************************************
+ FOOTER
+*************************************** */
+.elgg-page-footer {
+ position: relative;
+ z-index: 999;
+}
.elgg-page-footer .elgg-inner {
width: 990px;
margin: 0 auto;
diff --git a/views/default/navigation/site_nav.php b/views/default/navigation/site_nav.php
index 84ac75569..50be4ce3c 100644
--- a/views/default/navigation/site_nav.php
+++ b/views/default/navigation/site_nav.php
@@ -1,8 +1,8 @@
<?php
/**
- * Main site-wide navigation
+ * Site-wide navigation
*
- **/
+ */
$nav_items = elgg_get_nav_items();
$featured = $nav_items['featured'];
@@ -34,7 +34,7 @@ if ($featured) {
$nav_html .= "<li $selected><a href=\"$url\" title=\"$title\"><span>$title</span></a></li>";
}
} elseif ($more) {
- for ($i=0; $i<6; $i++) {
+ for ($i=0; $i<5; $i++) {
if (!array_key_exists($i, $more)) {
break;
}
@@ -44,7 +44,7 @@ if ($featured) {
$title = htmlentities($info->name, ENT_QUOTES, 'UTF-8');
$url = htmlentities($info->value->url, ENT_QUOTES, 'UTF-8');
- $nav_html .= "<li $selected><a href=\"$url\" title=\"$title\"><span>$title</span></a></li>";
+ $nav_html .= "<li $selected><a href=\"$url\" title=\"$title\">$title</a></li>";
$more[$i]->used = TRUE;
$item_count++;
}
@@ -59,7 +59,7 @@ foreach ($more as $info) {
$title = htmlentities($info->name, ENT_QUOTES, 'UTF-8');
$url = htmlentities($info->value->url, ENT_QUOTES, 'UTF-8');
- $more_nav_html .= "<li $selected><a href=\"$url\" title=\"$title\"><span>$title</span></a></li>\n";
+ $more_nav_html .= "<li $selected><a href=\"$url\" title=\"$title\">$title</a></li>\n";
$item_count++;
}
@@ -75,11 +75,9 @@ if ($more_nav_html) {
// only display, if there are nav items to display
if ($nav_html) {
echo <<<___END
- <div id="elgg-main-nav" class="clearfix">
- <ul class="navigation">
+ <ul class="elgg-site-menu">
$nav_html
</ul>
- </div>
___END;
}
-?>
+
diff --git a/views/default/page/elements/header_logo.php b/views/default/page/elements/header_logo.php
index 6ae6a0fab..45bb9cc16 100644
--- a/views/default/page/elements/header_logo.php
+++ b/views/default/page/elements/header_logo.php
@@ -3,10 +3,11 @@
* Elgg header logo
* The logo to display in elgg-header.
*/
+
+$site = elgg_get_site_entity();
+$site_name = $site->name;
?>
<h1>
- <a href="<?php echo elgg_get_site_url(); ?>">
- <span class='network-title'><?php echo $vars['config']->sitename; ?></span>
- </a>
+ <a href="<?php echo elgg_get_site_url(); ?>"><?php echo $site_name; ?></a>
</h1>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 18:00:12 +0000