[Fmsystem-commits] [9021] Login: user registration

[Sigurd Nes]

Revision: 9021
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9021
Author:   sigurdne
Date:     2012-03-21 20:41:51 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
Login: user registration

Modified Paths:
--------------
    trunk/phpgwapi/inc/sso/include_login.inc.php
    trunk/phpgwapi/setup/phpgw_en.lang
    trunk/phpgwapi/setup/phpgw_no.lang
    trunk/phpgwapi/templates/base/login.tpl

Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php        2012-03-21 15:11:31 UTC 
(rev 9020)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php        2012-03-21 20:41:51 UTC 
(rev 9021)
@@ -473,6 +473,9 @@
                                $this->tmpl->set_var('return_sso_login_url', 
$variables['additional_url']);
                        }
 
+                       $this->tmpl->set_var('lang_new_user', lang('new user'));
+                       $this->tmpl->set_var('lang_forgotten_password', 
lang('forgotten password'));
+
                        $this->tmpl->set_var('website_title', 
isset($GLOBALS['phpgw_info']['server']['site_title'])
                                                                ? 
$GLOBALS['phpgw_info']['server']['site_title'] 
                                                                : 'phpGroupWare'

Modified: trunk/phpgwapi/setup/phpgw_en.lang
===================================================================
--- trunk/phpgwapi/setup/phpgw_en.lang  2012-03-21 15:11:31 UTC (rev 9020)
+++ trunk/phpgwapi/setup/phpgw_en.lang  2012-03-21 20:41:51 UTC (rev 9021)
@@ -505,6 +505,8 @@
 use button to search for calendarevent common  en      use Button to search 
for Calendarevent
 use button to search for project       common  en      use Button to search 
for Project
 user   common  en      User
+new user       login   en      New User
+forgotten password     login   en      Forgotten Password or Username
 user accounts  common  en      user accounts
 user groups    common  en      user groups
 username       common  en      Username

Modified: trunk/phpgwapi/setup/phpgw_no.lang
===================================================================
--- trunk/phpgwapi/setup/phpgw_no.lang  2012-03-21 15:11:31 UTC (rev 9020)
+++ trunk/phpgwapi/setup/phpgw_no.lang  2012-03-21 20:41:51 UTC (rev 9021)
@@ -125,6 +125,8 @@
 todays date, eg. %1    common  no      Dagens dato, %1
 use cookies    login   no      use cookies
 username       login   no      Brukernavn
+new user       login   no      Ny bruker
+forgotten password     login   no      Glemt passord eller Brukernavn
 use a valid username and password to gain access to %1 login   no      Angi et 
gyldig brukernavn og passord for få tilgang til %1
 version        common  no      versjon
 you have been successfully logged out  login   no      Du har nå logget ut

Modified: trunk/phpgwapi/templates/base/login.tpl
===================================================================
--- trunk/phpgwapi/templates/base/login.tpl     2012-03-21 15:11:31 UTC (rev 
9020)
+++ trunk/phpgwapi/templates/base/login.tpl     2012-03-21 20:41:51 UTC (rev 
9021)
@@ -150,6 +150,12 @@
                                        </div>
 
                                        <p>{instruction}</p>
+                                       <p >
+                                               <a href="registration/main.php" 
target="_blank">{lang_new_user}</a>
+                                       </p>
+                                       </p>
+                                               <a 
href="registration/main.php?menuaction=registration.boreg.lostpw1" 
target="_blank">{lang_forgotten_password}</a>.
+                                        </p>
 
                                        <div id="lock"></div>
 
@@ -172,12 +178,12 @@
                </div>
        </div>
 </div>
-<div id="footer">
-       <p class="copyright">
-               <a href="http://www.porticoestate.no"; target="_blank">{system} 
{version}</a> is Free Software released under the <a href=
-               "http://www.gnu.org/licenses/gpl-2.0.html";>GNU/GPL License</a>.
-        </p>
-       </div>
+<div id="footer"> 
+       <p class="copyright"> 
+               <a href="http://www.porticoestate.no"; target="_blank">{system} 
{version}</a> is Free Software released under the <a href= 
+                       "http://www.gnu.org/licenses/gpl-2.0.html";>GNU/GPL 
License</a>. 
+       </p> 
+</div>
 </body>
 <!-- END login_form -->
 </html>