aboutsummaryrefslogtreecommitdiff
path: root/views/default/page_elements/header.php
diff options
context:
space:
mode:
Diffstat (limited to 'views/default/page_elements/header.php')
-rw-r--r--views/default/page_elements/header.php48
1 files changed, 24 insertions, 24 deletions
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index 498f26d97..53f6285fb 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -24,23 +24,23 @@
$title = $vars['title'];
} else {
$title = $vars['config']->sitename . ": " . $vars['title'];
- }
-
- global $autofeed;
- if (isset($autofeed) && $autofeed == true) {
- $url = full_url();
- if (substr_count($url,'?')) {
- $url .= "&view=rss";
- } else {
- $url .= "?view=rss";
- }
- $feedref = <<<END
-
- <link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />
-
-END;
- } else {
- $feedref = "";
+ }
+
+ global $autofeed;
+ if (isset($autofeed) && $autofeed == true) {
+ $url = full_url();
+ if (substr_count($url,'?')) {
+ $url .= "&view=rss";
+ } else {
+ $url .= "?view=rss";
+ }
+ $feedref = <<<END
+
+ <link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />
+
+END;
+ } else {
+ $feedref = "";
}
?>
@@ -55,15 +55,17 @@ END;
<script type="text/javascript" src="<?php echo $vars['url']; ?>javascript/initialise_elgg.js"></script>
<!-- include the default css file -->
<link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css" type="text/css" />
- <?php
-
- echo $feedref;
- echo elgg_view('metatags',$vars);
-
+ <?php
+
+ echo $feedref;
+ echo elgg_view('metatags',$vars);
+
?>
</head>
<body>
+
+<?php echo elgg_view('page_elements/elgg_topbar', $vars); ?>
<div id="page_container">
<div id="page_wrapper">
@@ -72,7 +74,5 @@ END;
<div id="wrapper_header">
<!-- display the page title -->
<h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>
- <!-- display top level navigation -->
- <?php echo elgg_view('navigation/topmenu'); ?>
</div><!-- /#wrapper_header -->
</div><!-- /#layout_header -->