3 files changed, 22 insertions, 1 deletions
diff --git a/themes/default/js/login.js b/themes/default/js/login.js
new file mode 100644
index 00000000..bc18fe41
--- /dev/null
+++ b/themes/default/js/login.js
@@ -0,0 +1,11 @@
+function show_login() {
+  $("#gLoginLink").fadeOut("fast");  
+  $("#gLoginForm").fadeIn("fast");  
+  $("#gLoginClose").fadeIn("fast");
+}
+
+function close_login() {
+  $("#gLoginLink").fadeIn("fast");  
+  $("#gLoginForm").fadeOut("fast");  
+  $("#gLoginClose").fadeOut("fast");
+}
+\ No newline at end of file
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 59e1f161..8ebc1295 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -4,12 +4,21 @@
 
 <div id="gLoginMenu">
   <? if (!user::is_logged_in($user)): ?>
+    <a href="#"><?=_("Recover password") ?></a> |
     <a href="<?= url::site("user/register")?>"><?= _("Register") ?></a> | 
-    <a href="<?= url::site("login")?>"><?= _("Login") ?></a>
+    <span id="gLoginLink">
+      <a href="javascript:show_login()"><?= _("Login") ?></a>
+    </span>
+    <span id="gLoginClose" class="gDisplayNone">
+      <?= _("Login") ?> | <a href="javascript:close_login()">X</a>
+    </span>
   <? else: ?>
     <a href="<?= url::site("user/update")?>"><?= _("Modify Profile") ?></a> | 
     <a href="<?= url::site("logout")?>"><?= _("Logout") ?></a>
   <? endif; ?>
+  <span id="gLoginForm"  class="gDisplayNone" >
+    <?= Login_Form::factory()->render() ?>
+  </span>
 </div>
 <ul id="gSiteMenu">
   <li><a href="<?= url::base() ?>"><?= _("HOME") ?></a></li>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 2f6a30d4..b8655c18 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -13,6 +13,7 @@
           media="screen,print,projection" />
     <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
     <script src="<?= url::file("lib/jquery.jeditable.js") ?>" type="text/javascript"></script>
+    <script src="<?= $theme->url("js/login.js") ?>" type="text/javascript"></script>
   </head>
 
   <body>