From ae7839ffaada72c522ffcd9b3f4f1cc04027a720 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 15 Nov 2008 06:23:09 +0000
Subject: Revise the user login code.

* Remove user registration link and popup from the theme; this
  shouldn't be done in a popup. Use ajaxform to simplify the way
  that we load the login popup.

* Create form.html.php, this is a template for Forge based forms.

* Move user validation rules into User_Model and let forms
  populate the rules into their forms as useful.

* Undo r18688's changes regarding the REST code.  We should never
  accept a null resource, this breaks the REST abstraction.

* Change login and user controllers to use Forge which lets us delete
  login.html.php and user.html.php since those now are generated by
  the theme-owned form template
---
 themes/default/views/header.html.php | 40 +++++++++++++++---------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

(limited to 'themes/default/views/header.html.php')

diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 24dd9331..8cba82ba 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -2,31 +2,25 @@
 <img id="gLogo" alt="<?= _("Logo") ?>" src="<?= $theme->url("images/logo.png") ?>" />
 <h1><?= $item->title_edit ?></h1>
 
-<div id="gLoginMenu">
+<ul id="gLoginMenu">
   <? if ($user): ?>
-    <a href="<?= url::site("user/update")?>"><?= _("Modify Profile") ?></a> 
-    | <a href="<?= url::site("logout")?>" id="gLogoutLink"><?= _("Logout") ?></a>
+  <a href="<?= url::site("user/update")?>"><?= _("Modify Profile") ?></a>
+  | <a href="<?= url::site("logout?continue=" . url::current(true)) ?>" id="gLogoutLink">
+    <?= _("Logout") ?>
+  </a>
   <? else: ?>
-    <a href="#"><?=_("Recover password") ?></a>
-    <span id="gUserLink" >
-      | <a href="javascript:show_form('#gUser')"><?= _("Register") ?></a>
-    </span>
-    <span id="gUserLinkText" class="gDisplayNone">
-      | <?= _("Register") ?>
-    </span>
-    <span id="gLoginLink">
-      | <a href="javascript:show_form('#gLogin')"><?= _("Login") ?></a>
-    </span>
-    <span id="gLoginText" class="gDisplayNone">
-      | <?= _("Login") ?> 
-    </span>
-    <span id="gLoginClose" class="gDisplayNone">
-      | <a href="javascript:hide_form('#gLogin')">X</a>
-    </span>
+  <span id="gLoginLink">
+    <a href="javascript:show_login('<?= url::site("login") ?>')">
+      <?= _("Login") ?>
+    </a>
+  </span>
+  <span id="gLoginClose" class="gDisplayNone">
+    <?= _("Login") ?> | <a href="javascript:close_login()">X</a>
+  </span>
+  <div id="gLoginFormContainer"></div>
   <? endif; ?>
-  <span id="gUserForm" class="gDisplayNone" formSrc="<?= url::site("user/dispatch/") ?>"></span>
-  <span id="gLoginForm" class="gDisplayNone" formSrc="<?= url::site("login") ?>"></span>
-</div>
+</ul>
+
 <ul id="gSiteMenu">
   <li><a href="<?= url::base() ?>"><?= _("HOME") ?></a></li>
   <li><a class="active" href="<?= url::site("album/1") ?>"><?= _("BROWSE") ?></a></li>
@@ -38,7 +32,7 @@
 <form id="gSearchForm" class="gInline">
   <ul class="gNoLabels">
     <li><input type="text" value="<?= _("Search Gallery ...") ?>"/></li>
-    <li><input type="submit" value="search" /></li>
+    <li><input type="submit" value="<?= _("search") ?>" /></li>
   </ul>
 </form>
 
-- 
cgit v1.2.3