[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11726] login messages
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11726] login messages |
|
Date: |
Thu, 20 Feb 2014 18:49:24 +0000 |
Revision: 11726
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11726
Author: sigurdne
Date: 2014-02-20 18:49:23 +0000 (Thu, 20 Feb 2014)
Log Message:
-----------
login messages
Modified Paths:
--------------
trunk/header.inc.php.template
trunk/phpgwapi/inc/sso/include_login.inc.php
trunk/phpgwapi/templates/base/login.tpl
Modified: trunk/header.inc.php.template
===================================================================
--- trunk/header.inc.php.template 2014-02-19 15:02:57 UTC (rev 11725)
+++ trunk/header.inc.php.template 2014-02-20 18:49:23 UTC (rev 11726)
@@ -119,19 +119,23 @@
* An optional text to be displayed to the left on the login form.
* FORMATTING HAS TO BE EDITED MANUALLY (links and linebreak)
*/
- $GLOBALS['phpgw_info']['login_left_message'] = <<<HTML
+ $login_left_message = <<<HTML
{LOGIN_LEFT_MESSAGE}
HTML;
+ $GLOBALS['phpgw_info']['login_left_message'] =
nl2br(str_replace(array('[',']'), array('<','>'), $login_left_message));
+
/**
* @global string $phpgw_info['login_right_message']
* An optional text to be displayed to the right on the login form.
* FORMATTING HAS TO BE EDITED MANUALLY (links and linebreak)
*/
- $GLOBALS['phpgw_info']['login_right_message'] = <<<HTML
+ $login_right_message = <<<HTML
{LOGIN_RIGHT_MESSAGE}
HTML;
+ $GLOBALS['phpgw_info']['login_right_message'] =
nl2br(str_replace(array('[',']'), array('<','>'), $login_right_message));
+
/**
* @global string $phpgw_info['new_user_url']
* An otpional url to new user registration
Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php 2014-02-19 15:02:57 UTC
(rev 11725)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php 2014-02-20 18:49:23 UTC
(rev 11726)
@@ -481,25 +481,32 @@
if(isset($GLOBALS['phpgw_info']['server']['new_user_url']) &&
$GLOBALS['phpgw_info']['server']['new_user_url'])
{
$url_new_user =
$GLOBALS['phpgw_info']['server']['new_user_url'];
+ $action_new_user = $url_new_user;
+
}
else
{
$url_new_user =
"{$webserver_url}/registration/main.php";
+ $action_new_user = 'javascript:new_user();';
}
$this->tmpl->set_var('url_new_user', $url_new_user);
if(isset($GLOBALS['phpgw_info']['server']['lost_password_url']) &&
$GLOBALS['phpgw_info']['server']['lost_password_url'])
{
$url_lost_password =
$GLOBALS['phpgw_info']['server']['lost_password_url'];
+ $action_lost_password = $url_lost_password;
}
else
{
$url_lost_password =
"{$webserver_url}/registration/main.php?" . http_build_query(array(
'menuaction'
=>'registration.uireg.lostpw1')
);
+ $action_lost_password =
'javascript:lost_password();';
}
$this->tmpl->set_var('url_lost_password',
$url_lost_password);
+ $this->tmpl->set_var('action_new_user',
$action_new_user);
+ $this->tmpl->set_var('action_lost_password',
$action_lost_password);
$this->tmpl->set_var('website_title',
isset($GLOBALS['phpgw_info']['server']['site_title'])
?
$GLOBALS['phpgw_info']['server']['site_title']
Modified: trunk/phpgwapi/templates/base/login.tpl
===================================================================
--- trunk/phpgwapi/templates/base/login.tpl 2014-02-19 15:02:57 UTC (rev
11725)
+++ trunk/phpgwapi/templates/base/login.tpl 2014-02-20 18:49:23 UTC (rev
11726)
@@ -202,10 +202,10 @@
<p>{instruction}</p>
<p >
- <a
href="javascript:new_user();">{lang_new_user}</a>
+ <a
href="{action_new_user}">{lang_new_user}</a>
</p>
</p>
- <a
href="javascript:lost_password();">{lang_forgotten_password}</a>.
+ <a
href="{action_lost_password}">{lang_forgotten_password}</a>.
</p>
<div id="lock"></div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11726] login messages,
Sigurd Nes <=