The 'Log in' button now routes to GetLoggedInFirst(do_welcome)

diff --git a/webcit/auth.c b/webcit/auth.c
index c3a3cac50eb6c11ba5c1efa15ed195e41d628569..0303f292be8ef92f2cd05fb3b50d8a3453d01811 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -1078,6 +1078,7 @@ InitModule_AUTH
        WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
        WebcitAddUrlHandler(HKEY("ajax_login_username_password"), "", 0, ajax_login_username_password, AJAX);
        WebcitAddUrlHandler(HKEY("validate"), "", 0, validate, 0);
+       WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, 0);
        WebcitAddUrlHandler(HKEY("display_reg"), "", 0, _display_reg, 0);
        WebcitAddUrlHandler(HKEY("display_changepw"), "", 0, display_changepw, 0);
        WebcitAddUrlHandler(HKEY("changepw"), "", 0, changepw, 0);

diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index 57b830389216a2b931dc9ac261c998cfebab3489..06114786f964448964cd929fb10e3f2f35bac63d 100644 (file)
--- a/webcit/static/t/iconbar.html
+++ b/webcit/static/t/iconbar.html
@@ -84,7 +84,7 @@
 <??("X",2)>
 <?!("COND:LOGGEDIN",4)>
 <div id="ib_logoff" class="ib_button">
-<a class="ib_button_link" href="login" title="<?_("Log in")>"><span><?_("Log in")></span></a>
+<a class="ib_button_link" href="javascript:GetLoggedInFirst('do_welcome')" title="<?_("Log in")>"><span><?_("Log in")></span></a>
 </div>
 <?!("X",4)>
 <div class="ctdlTemplate">

diff --git a/webcit/static/t/navbar.html b/webcit/static/t/navbar.html
index 645d258d3b0975eed9a77fa207f68fdc15de86e7..2a1362a174150bb3ca85ced3038f6482ec9b4520 100644 (file)
--- a/webcit/static/t/navbar.html
+++ b/webcit/static/t/navbar.html
@@ -35,7 +35,7 @@
                </a>
        </li>
        <li class="addnewcontact">
-               <a href="display_enter">
+               <a href="javascript:GetLoggedInFirst('display_enter')">
                        <img src="static/addnewcontact_24x.gif" alt="" width="24" height="24">
                        <span class="navbar_link"><?_("Add new contact")></span>
                </a>
@@ -80,7 +80,7 @@
                </a>
        </li>
        <li class="newmess">
-               <a href="display_enter">
+               <a href="javascript:GetLoggedInFirst('display_enter')">
                        <img  src="static/newmess3_24x.gif" alt="" width="24" height="24">
                        <span class="navbar_link"><?_("Add new task")></span>
                </a>
@@ -118,7 +118,7 @@
                </a>
        </li>
        <li class="newmess">
-               <a href="display_enter">
+               <a href="javascript:GetLoggedInFirst('display_enter')">
                        <img  src="static/newmess3_24x.gif" alt="" width="24" height="24">
                        <span class="navbar_link"><?_("Write mail")></span>
                </a>