[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11694] configurable text on login
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11694] configurable text on login |
|
Date: |
Thu, 13 Feb 2014 22:44:00 +0000 |
Revision: 11694
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11694
Author: sigurdne
Date: 2014-02-13 22:43:57 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
configurable text on login
Modified Paths:
--------------
trunk/header.inc.php.template
trunk/setup/manageheader.php
trunk/setup/templates/base/manageheader.tpl
Modified: trunk/header.inc.php.template
===================================================================
--- trunk/header.inc.php.template 2014-02-13 22:42:07 UTC (rev 11693)
+++ trunk/header.inc.php.template 2014-02-13 22:43:57 UTC (rev 11694)
@@ -115,6 +115,25 @@
$GLOBALS['phpgw_info']['login_template_set'] = 'simple';
/**
+ * @global string $phpgw_info['login_left_message']
+ * 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;
+
+ /**
+ * @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;
+
+
+ /**
* @global boolean $phpgw_info['server']['mcrypt_enabled']
* This is used to control mcrypt's use
*/
@@ -215,7 +234,7 @@
* @global string $phpgw_info['server']['versions']['header']
* Version of this header file
*/
- $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.31';
+ $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.32';
if ( !isset($GLOBALS['phpgw_info']['flags']['noapi'])
Modified: trunk/setup/manageheader.php
===================================================================
--- trunk/setup/manageheader.php 2014-02-13 22:42:07 UTC (rev 11693)
+++ trunk/setup/manageheader.php 2014-02-13 22:43:57 UTC (rev 11694)
@@ -2,7 +2,7 @@
/**
* phpGroupWare Setup - http://phpgroupware.org
*
- * @copyright Portions Copyright (C) 2000-2005 Free Software Foundation,
Inc. http://www.fsf.org/
+ * @copyright Portions Copyright (C) 2000-2014 Free Software Foundation,
Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package setup
* @version $Id$
@@ -647,7 +647,11 @@
// $setup_tpl->set_var('header_admin_password',
isset($GLOBALS['phpgw_info']['server']['header_admin_password']) ?
$GLOBALS['phpgw_info']['server']['header_admin_password'] : '');
$setup_tpl->set_var('system_name',
isset($GLOBALS['phpgw_info']['server']['system_name']) ?
$GLOBALS['phpgw_info']['server']['system_name'] : 'Portico Estate');
$setup_tpl->set_var('default_lang',
isset($GLOBALS['phpgw_info']['server']['default_lang']) ?
$GLOBALS['phpgw_info']['server']['default_lang'] : phpgw::get_var('ConfigLang',
'string', 'POST'));
+ $setup_tpl->set_var('login_left_message',
$GLOBALS['phpgw_info']['login_left_message']);
+ $setup_tpl->set_var('login_right_message',
$GLOBALS['phpgw_info']['login_right_message']);
+
+
if (
isset($GLOBALS['phpgw_info']['server']['db_persistent']) &&
$GLOBALS['phpgw_info']['server']['db_persistent'] )
{
$setup_tpl->set_var('db_persistent_yes','
selected');
@@ -745,6 +749,8 @@
$setup_tpl->set_var('lang_includeroot',lang('Include
Root (this should be the same as Server Root unless you know what you are
doing)'));
$setup_tpl->set_var('lang_adminpass',lang('Admin
password to header manager'));
$setup_tpl->set_var('lang_system_name',lang('System
name'));
+
$setup_tpl->set_var('lang_login_left_message',lang('login left message'));
+
$setup_tpl->set_var('lang_login_right_message',lang('login right message'));
$setup_tpl->set_var('lang_dbhost',lang('DB Host'));
$setup_tpl->set_var('lang_dbhostdescr',lang('Hostname/IP of database server'));
$setup_tpl->set_var('lang_dbname',lang('DB Name'));
@@ -781,4 +787,3 @@
$setup_tpl->pfp('out','manageheader');
// ending the switch default
}
-?>
Modified: trunk/setup/templates/base/manageheader.tpl
===================================================================
--- trunk/setup/templates/base/manageheader.tpl 2014-02-13 22:42:07 UTC (rev
11693)
+++ trunk/setup/templates/base/manageheader.tpl 2014-02-13 22:43:57 UTC (rev
11694)
@@ -22,6 +22,18 @@
<b>{lang_system_name}</b><br><input type="text"
name="setting[system_name]" size="80" value="{system_name}">
</td>
</tr>
+ <tr>
+ <td colspan="2">
+ <b>{lang_login_left_message} - FORMATTING HAS TO BE EDITED MANUALLY in
the resulting header.inc.php</b><br>
+ <textarea cols="80" rows="4" name="setting[login_left_message]"
wrap="virtual">{login_left_message}</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <b>{lang_login_right_message} - FORMATTING HAS TO BE EDITED MANUALLY in
the resulting header.inc.php</b><br>
+ <textarea cols="80" rows="4" name="setting[login_right_message]"
wrap="virtual">{login_right_message}</textarea>
+ </td>
+ </tr>
<br><br>
<tr>
<td><b>{lang_persist}</b><br>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11694] configurable text on login,
Sigurd Nes <=