[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13808] minimize lightbox login
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [13808] minimize lightbox login |
Date: |
Sun, 30 Aug 2015 09:50:37 +0000 |
Revision: 13808
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13808
Author: sigurdne
Date: 2015-08-30 09:50:36 +0000 (Sun, 30 Aug 2015)
Log Message:
-----------
minimize lightbox login
Modified Paths:
--------------
trunk/phpgwapi/inc/sso/include_login.inc.php
trunk/phpgwapi/templates/base/login.tpl
Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php 2015-08-29 16:57:47 UTC
(rev 13807)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php 2015-08-30 09:50:36 UTC
(rev 13808)
@@ -208,6 +208,7 @@
{
// If the lastloginid cookies isn't set, we will
default to default_lang - then to english.
// Change this if you need.
+ $lightbox = isset($_REQUEST['lightbox']) &&
$_REQUEST['lightbox'] ? true : false;
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] =
isset($GLOBALS['phpgw_info']['server']['default_lang']) &&
$GLOBALS['phpgw_info']['server']['default_lang']?
$GLOBALS['phpgw_info']['server']['default_lang'] : 'en';
if (isset($_COOKIE['last_loginid']))
@@ -548,9 +549,13 @@
$this->tmpl->set_var('rounded_css', $rounded_css);
$this->tmpl->set_var('flag_no', $flag_no);
$this->tmpl->set_var('flag_en', $flag_en);
+ $this->tmpl->set_var('lightbox', $lightbox);
- $this->tmpl->set_var('login_left_message',
$GLOBALS['phpgw_info']['login_left_message']);
- $this->tmpl->set_var('login_right_message',
$GLOBALS['phpgw_info']['login_right_message']);
+ if(!$lightbox)
+ {
+ $this->tmpl->set_var('login_left_message',
$GLOBALS['phpgw_info']['login_left_message']);
+ $this->tmpl->set_var('login_right_message',
$GLOBALS['phpgw_info']['login_right_message']);
+ }
$autocomplete = '';
if (
isset($GLOBALS['phpgw_info']['server']['autocomplete_login'])
Modified: trunk/phpgwapi/templates/base/login.tpl
===================================================================
--- trunk/phpgwapi/templates/base/login.tpl 2015-08-29 16:57:47 UTC (rev
13807)
+++ trunk/phpgwapi/templates/base/login.tpl 2015-08-30 09:50:36 UTC (rev
13808)
@@ -82,8 +82,8 @@
<div id="content-box">
<div class="rawimages">
- <span><a href="login.php?lang=no"><img src="{flag_no}"
alt="Norsk (Norway)" title="Norsk (Norway)" ></a></span>
- <span><a href="login.php?lang=en"><img src="{flag_en}"
alt="English (United Kingdom)" title="English (United Kingdom)" ></a></span>
+ <span><a
href="login.php?lang=no&lightbox={lightbox}"><img src="{flag_no}" alt="Norsk
(Norway)" title="Norsk (Norway)" ></a></span>
+ <span><a
href="login.php?lang=en&lightbox={lightbox}"><img src="{flag_en}" alt="English
(United Kingdom)" title="English (United Kingdom)" ></a></span>
</div>
<div class="padding">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13808] minimize lightbox login,
Sigurd Nes <=