summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2008-11-10 16:36:56 +0000
committerTim Almdal <tnalmdal@shaw.ca>2008-11-10 16:36:56 +0000
commitd4415d0d3e1c82afbf85d156a6f8598eb6a051b6 (patch)
tree82496d494e00ff40192c1ecc7125f181f2a66369
parent92b1ae14f971434b6a9aebe817071b16f1fb1aae (diff)
Reset the links in the header and update the readme
-rw-r--r--README6
-rw-r--r--core/controllers/album.php5
-rw-r--r--core/controllers/photo.php5
-rw-r--r--themes/default/views/header.html.php6
4 files changed, 9 insertions, 13 deletions
diff --git a/README b/README
index 8a1e86f0..9436df48 100644
--- a/README
+++ b/README
@@ -1,6 +1,8 @@
To get started, point your browser at the gallery3 dir. That should
take you to the scaffolding page which will walk you through the
-process of getting installed. Questions, problems? Send an email to
-gallery-devel@lists.sourceforge.net.
+process of getting installed. Questions, problems?
+
+Check out the gallery3 FAQ http://codex.gallery2.org/Gallery3:FAQ, or
+Send an email to gallery-devel@lists.sourceforge.net.
diff --git a/core/controllers/album.php b/core/controllers/album.php
index 47811fd2..c94bcbef 100644
--- a/core/controllers/album.php
+++ b/core/controllers/album.php
@@ -35,11 +35,6 @@ class Album_Controller extends Item_Controller {
$template->set_global('theme', $theme);
$template->content = new View("album.html");
- $login_view = new View("login.html");
- $user = Session::instance()->get("user", null);
- $login_view->logged_in = !empty($user);
- $template->set_global("login", $login_view);
-
print $template->render();
}
}
diff --git a/core/controllers/photo.php b/core/controllers/photo.php
index 87d76e5e..55ab6247 100644
--- a/core/controllers/photo.php
+++ b/core/controllers/photo.php
@@ -30,11 +30,6 @@ class Photo_Controller extends Item_Controller {
$template->set_global('theme', $theme);
$template->content = new View("photo.html");
- $login_view = new View("login.html");
- $user = Session::instance()->get("user", null);
- $login_view->logged_in = !empty($user);
- $template->set_global("login", $login_view);
-
print $template->render();
}
}
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index b46faa8a..37884315 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -1,7 +1,11 @@
<? defined("SYSPATH") or die("No direct script access."); ?>
<img id="gLogo" alt="<?= _("Logo") ?>" src="<?= $theme->url("images/logo.png") ?>" />
<h1><?= $item->title_edit ?></h1>
-<?= $login ?>
+
+<div id="gLoginMenu">
+ <a href="#"><?= _("Register") ?></a> |
+ <a href="#"><?= _("Login") ?></a>
+</div>
<ul id="gSiteMenu">
<li><a href="index.php"><?= _("HOME") ?></a></li>