Skip to content
Snippets Groups Projects
Commit 60f0d1a5 authored by Michael Fairchild's avatar Michael Fairchild
Browse files

Merge branch 'develop' of git.unl.edu:iim/PlanetRed into develop

parents 3f7a7e86 a6146d8f
Branches
No related tags found
4 merge requests!15WIP: Support WDN version 5.3,!8Update for elgg upgrade,!3Develop,!1Git fixes
...@@ -119,7 +119,11 @@ function unl_theme_setup_head($hook, $type, $data) { ...@@ -119,7 +119,11 @@ function unl_theme_setup_head($hook, $type, $data) {
'name' => 'viewport', 'name' => 'viewport',
'content' => 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0', 'content' => 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0',
); );
$data['links'][] = array(
'id' => 'favicon',
'rel' => 'shortcut icon',
'href' => 'https://unlcms.unl.edu/wdn/templates_4.1/includes/icons/favicon.ico',
);
$data['links'][] = array( $data['links'][] = array(
'rel' => 'apple-touch-icon', 'rel' => 'apple-touch-icon',
'href' => elgg_normalize_url('mod/unl_theme/graphics/homescreen.png'), 'href' => elgg_normalize_url('mod/unl_theme/graphics/homescreen.png'),
...@@ -127,3 +131,6 @@ function unl_theme_setup_head($hook, $type, $data) { ...@@ -127,3 +131,6 @@ function unl_theme_setup_head($hook, $type, $data) {
return $data; return $data;
} }
...@@ -49,6 +49,10 @@ if (elgg_is_logged_in()) { ...@@ -49,6 +49,10 @@ if (elgg_is_logged_in()) {
echo elgg_echo("admin"); echo elgg_echo("admin");
echo "</a></li>"; echo "</a></li>";
} }
echo "<li>";
echo "<a href='{$url}action/logout'>";
echo elgg_echo("logout");
echo "</a></li>";
echo "</ul></li>"; echo "</ul></li>";
} else { } else {
echo "<li><a href='" . elgg_get_site_url() . "login'>Login</a></li>"; echo "<li><a href='" . elgg_get_site_url() . "login'>Login</a></li>";
......
...@@ -58,6 +58,10 @@ if (elgg_is_logged_in()) { ...@@ -58,6 +58,10 @@ if (elgg_is_logged_in()) {
echo elgg_echo("admin"); echo elgg_echo("admin");
echo "</a></li>"; echo "</a></li>";
} }
echo "<li>";
echo "<a href='{$url}action/logout'>";
echo elgg_echo("logout");
echo "</a></li>";
echo "</ul></li>"; echo "</ul></li>";
} else { } else {
// echo "<li><a href='" . elgg_get_site_url() . "login'>Login</a></li>"; // echo "<li><a href='" . elgg_get_site_url() . "login'>Login</a></li>";
......
...@@ -43,6 +43,7 @@ $head = elgg_view('page/elements/head', $vars['head']); ...@@ -43,6 +43,7 @@ $head = elgg_view('page/elements/head', $vars['head']);
$params = array( $params = array(
'head' => $head, 'head' => $head,
'body' => $body, 'body' => $body,
'title'=> $vars["title"]
); );
if (isset($vars['body_attrs'])) { if (isset($vars['body_attrs'])) {
......
...@@ -36,6 +36,7 @@ $unl_template->breadcrumbs = "<!-- WDN: see glossary item \'breadcrumbs\' --> <u ...@@ -36,6 +36,7 @@ $unl_template->breadcrumbs = "<!-- WDN: see glossary item \'breadcrumbs\' --> <u
$unl_template->maincontentarea = $vars['body']; $unl_template->maincontentarea = $vars['body'];
$unl_template->titlegraphic ="Planet Red"; $unl_template->titlegraphic ="Planet Red";
$unl_template->pagetitle =""; $unl_template->pagetitle ="";
$unl_template->doctitle ="<title>UNL | Planet Red | ".$vars["title"]." </title>";
$unl_template->affiliation =""; $unl_template->affiliation ="";
$unl_template->head = $vars['head']; $unl_template->head = $vars['head'];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment