From 871eb78da00cf652b5a58c7442f67afeebdb8579 Mon Sep 17 00:00:00 2001
From: Brett Bieber <brett.bieber@gmail.com>
Date: Wed, 25 Mar 2009 20:38:58 +0000
Subject: [PATCH] Add header file, improvements to page shell.

---
 .../views/default/page_elements/header.php    | 48 +++++++++++++++++++
 .../views/default/pageshells/pageshell.php    |  9 +++-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 unl_theme/views/default/page_elements/header.php

diff --git a/unl_theme/views/default/page_elements/header.php b/unl_theme/views/default/page_elements/header.php
new file mode 100644
index 00000000..7d79ca80
--- /dev/null
+++ b/unl_theme/views/default/page_elements/header.php
@@ -0,0 +1,48 @@
+<?php
+
+global $autofeed;
+if (isset($autofeed) && $autofeed == true) {
+    $url = $url2 = full_url();
+    if (substr_count($url,'?')) {
+        $url .= "&view=rss";
+    } else {
+        $url .= "?view=rss";
+    }
+    if (substr_count($url2,'?')) {
+        $url2 .= "&view=odd";
+    } else {
+        $url2 .= "?view=opendd";
+    }
+    $feedref = <<<END
+        
+<link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />
+<link rel="alternate" type="application/odd+xml" title="OpenDD" href="{$url2}" />
+        
+END;
+} else {
+    $feedref = "";
+}
+
+$version = get_version();
+$release = get_version(true);
+?>
+<meta name="ElggRelease" content="<?php echo $release; ?>" />
+<meta name="ElggVersion" content="<?php echo $version; ?>" />
+<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.2.6.pack.js"></script>
+<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-personalized-1.5.3.packed.js"></script>
+<script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;js=initialise_elgg&amp;viewtype=<?php echo $vars['view']; ?>"></script>
+<?php
+global $pickerinuse;
+if (isset($pickerinuse) && $pickerinuse == true) { ?>
+    <!-- only needed on pages where we have friends collections and/or the friends picker -->
+    <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.easing.1.3.packed.js"></script>
+    <script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=friendsPickerv1&viewtype=<?php echo $vars['view']; ?>"></script>
+<?php
+}
+?>
+<!-- include the default css file -->
+<!-- <link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css?lastcache=<?php echo $vars['config']->lastcache; ?>&viewtype=<?php echo $vars['view']; ?>" type="text/css" />  -->
+<?php 
+echo $feedref;
+echo elgg_view('metatags',$vars); 
+?>
\ No newline at end of file
diff --git a/unl_theme/views/default/pageshells/pageshell.php b/unl_theme/views/default/pageshells/pageshell.php
index dd78f466..8dca5e43 100644
--- a/unl_theme/views/default/pageshells/pageshell.php
+++ b/unl_theme/views/default/pageshells/pageshell.php
@@ -16,8 +16,15 @@ if (empty($vars['title'])) {
     $title = $vars['config']->sitename . ": " . $vars['title'];
 }
 
-$page->maincontentarea .= elgg_view('messages/list', array('object' => $vars['sysmessages']));
+$page->doctitle = '<title>'.$title.'</title>';
+$page->head .= elgg_view('page_elements/header', $vars);
+
 
+$page->maincontentarea .= elgg_view('page_elements/elgg_topbar', $vars);
+// Commented out for now because this has unclosed divs.
+//$page->maincontentarea .= elgg_view('page_elements/header_contents', $vars);
+
+$page->maincontentarea .= elgg_view('messages/list', array('object' => $vars['sysmessages']));
 $page->maincontentarea .= $vars['body'];
 
 
-- 
GitLab