[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16345] table: Merge 16343:16344 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16345] table: Merge 16343:16344 from trunk |
|
Date: |
Sun, 19 Feb 2017 16:44:52 -0500 (EST) |
Revision: 16345
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16345
Author: sigurdne
Date: 2017-02-19 16:44:51 -0500 (Sun, 19 Feb 2017)
Log Message:
-----------
table: Merge 16343:16344 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
branches/Version-2_0-branch/phpgwapi/templates/base/css/login.css
branches/Version-2_0-branch/phpgwapi/templates/base/login.tpl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-19 21:43:26 UTC (rev 16344)
+++ branches/Version-2_0-branch 2017-02-19 21:44:51 UTC (rev 16345)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16300
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344
\ No newline at end of property
Modified: branches/Version-2_0-branch/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/sso/include_login.inc.php
2017-02-19 21:43:26 UTC (rev 16344)
+++ branches/Version-2_0-branch/phpgwapi/inc/sso/include_login.inc.php
2017-02-19 21:44:51 UTC (rev 16345)
@@ -11,7 +11,7 @@
* @version $Id$
*/
- /*
+ /*
* Generic include for login.php like pages
*/
if(!empty( $GLOBALS['phpgw_info']['flags']['session_name'] ))
@@ -70,7 +70,7 @@
* Generic include for mapping / remoteuser mode
*/
$phpgw_url_for_sso = '/login.php';
- if(isset($GLOBALS['phpgw_info']['server']['half_remote_user']) &&
$GLOBALS['phpgw_info']['server']['half_remote_user'] == 'remoteuser')
+ if(isset($GLOBALS['phpgw_info']['server']['half_remote_user']) &&
$GLOBALS['phpgw_info']['server']['half_remote_user'] == 'remoteuser')
{
$phpgw_url_for_sso = '/phpgwapi/inc/sso/login_server.php';
}
@@ -84,7 +84,7 @@
}
//Create the mapping if necessary :
- if(isset($GLOBALS['phpgw_info']['server']['mapping'])
+ if(isset($GLOBALS['phpgw_info']['server']['mapping'])
&& !empty($GLOBALS['phpgw_info']['server']['mapping']))
{
if ( !is_object($GLOBALS['phpgw']->mapping) )
@@ -186,8 +186,8 @@
if (file_exists($fname))
{
$ctime = filectime($fname);
- $ltime =
isset($GLOBALS['phpgw_info']['server']['lang_ctimes'][$lang]) &&
-
isset($GLOBALS['phpgw_info']['server']['lang_ctimes'][$lang][$app]) ?
+ $ltime =
isset($GLOBALS['phpgw_info']['server']['lang_ctimes'][$lang]) &&
+
isset($GLOBALS['phpgw_info']['server']['lang_ctimes'][$lang][$app]) ?
(int)
$GLOBALS['phpgw_info']['server']['lang_ctimes'][$lang][$app] : 0;
//echo "checking lang='$lang',
app='$app', ctime='$ctime', ltime='$ltime'<br>\n";
@@ -261,6 +261,10 @@
$this->tmpl->set_file(array('login_form' =>
'login.tpl'));
+ $this->tmpl->set_block('login_form', 'header_block',
'header_blocks');
+ $this->tmpl->set_block('login_form',
'instruction_block', 'instruction_blocks');
+
+
$this->tmpl->set_block('login_form', 'message_block',
'message_blocks');
$this->tmpl->set_block('login_form', 'domain_option',
'domain_options');
$this->tmpl->set_block('login_form', 'domain_select',
'domain_selects');
@@ -269,9 +273,12 @@
$this->tmpl->set_block('login_form',
'domain_from_host', 'domain_from_hosts');
$this->tmpl->set_block('login_form', 'password_block',
'password_blocks');
$this->tmpl->set_block('login_form', 'loging_block',
'loging_blocks');
+ $this->tmpl->set_block('login_form',
'forgotten_password_block', 'forgotten_password_blocks');
+ $this->tmpl->set_block('login_form', 'info_block',
'info_blocks');
$this->tmpl->set_block('login_form', 'button_block',
'button_blocks');
+ $this->tmpl->set_block('login_form', 'footer_block',
'footer_blocks');
- if(
$GLOBALS['phpgw_info']['server']['domain_from_host']
+ if( $GLOBALS['phpgw_info']['server']['domain_from_host']
&&
!$GLOBALS['phpgw_info']['server']['show_domain_selectbox'] )
{
$this->tmpl->set_var(
@@ -423,7 +430,7 @@
}
$system_name =
isset($GLOBALS['phpgw_info']['server']['system_name']) ?
$GLOBALS['phpgw_info']['server']['system_name'] : 'Portico Estate';
-
+
if($variables['lang_frontend'])
{
$system_name .=
"::{$variables['lang_frontend']}";
@@ -520,13 +527,13 @@
);
$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']
+ ?
$GLOBALS['phpgw_info']['server']['site_title']
: 'phpGroupWare'
);
@@ -560,7 +567,7 @@
}
$rounded_css =
"{$webserver_url}/phpgwapi/templates/base/css/rounded.css";
-
+
$flag_no =
"{$webserver_url}/phpgwapi/templates/base/images/flag_no.gif";
$flag_en =
"{$webserver_url}/phpgwapi/templates/base/images/flag_en.gif";
@@ -576,10 +583,30 @@
$this->tmpl->set_var('flag_en', $flag_en);
$this->tmpl->set_var('lightbox', $lightbox);
- if(!$lightbox)
+ if($lightbox)
{
+ $lightbox_css = <<<HTML
+
+ <style id='lightbox-login-css' type='text/css' scoped='scoped'>
+ .content-wrapper {
+ top: 0px;
+ }
+ </style>
+
+HTML;
+ $this->tmpl->set_var('lightbox_css',
$lightbox_css);
+
+ }
+ else
+ {
$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']);
+ $this->tmpl->parse('header_blocks',
'header_block');
+ $this->tmpl->parse('instruction_blocks',
'instruction_block');
+ $this->tmpl->parse('forgotten_password_blocks',
'forgotten_password_block');
+ $this->tmpl->parse('info_blocks', 'info_block');
+ $this->tmpl->parse('footer_blocks',
'footer_block');
+
}
$autocomplete = '';
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2017-02-19
21:43:26 UTC (rev 16344)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2017-02-19
21:44:51 UTC (rev 16345)
@@ -774,7 +774,8 @@
{
var oArgs = {lightbox: 1};
var strURL = phpGWLink('login.php', oArgs);
- TINY.box.show({iframe: strURL, boxid: 'frameless', width:
$(window).width(), height: 400, fixed: false, maskid: 'darkmask', maskopacity:
40, mask: true, animate: true, close: false, closejs: false});
+ var width = $(window).width() * 0.80;
+ TINY.box.show({iframe: strURL, boxid: 'frameless', width: width,
height: 400, fixed: false, maskid: 'darkmask', maskopacity: 40, mask: true,
animate: false, close: false, closejs: false});
};
JqueryPortico.showlightbox_history = function (sUrl)
Modified: branches/Version-2_0-branch/phpgwapi/templates/base/css/login.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/css/login.css
2017-02-19 21:43:26 UTC (rev 16344)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/css/login.css
2017-02-19 21:44:51 UTC (rev 16345)
@@ -179,7 +179,7 @@
*/
.content-wrapper {
position: absolute;
- top: 7%;
+ top: 14px;
width: 100%;
min-height: 12%;
z-index: 2;
@@ -209,9 +209,9 @@
.content-subhead {
color: #1f8dd6;
}
- .content-subhead i {
- margin-right: 7px;
- }
+.content-subhead i {
+ margin-right: 7px;
+}
/* This is the class used for the dark-background areas. */
.ribbon {
@@ -250,14 +250,14 @@
.home-menu {
text-align: left;
}
- .home-menu ul {
- float: right;
- }
+ .home-menu ul {
+ float: right;
+ }
/* We increase the height of the splash-container */
-/* .splash-container {
- height: 500px;
- }*/
+ /* .splash-container {
+ height: 500px;
+ }*/
/* We decrease the width of the .splash, since we have more width
to work with */
@@ -276,6 +276,11 @@
border: none;
}
+ .content-wrapper {
+ top: 56px;
+
+ }
+
}
/*
@@ -288,4 +293,5 @@
.splash-head {
font-size: 300%;
}
+
}
Modified: branches/Version-2_0-branch/phpgwapi/templates/base/login.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/login.tpl
2017-02-19 21:43:26 UTC (rev 16344)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/login.tpl
2017-02-19 21:44:51 UTC (rev 16345)
@@ -75,6 +75,9 @@
<body>
+ {lightbox_css}
+
+ <!-- BEGIN header_block -->
<div class="header">
<div class="home-menu pure-menu pure-menu-horizontal
pure-menu-fixed">
<a class="pure-menu-heading" href="">{system}
{lang_login}</a>
@@ -85,88 +88,91 @@
</ul>
</div>
</div>
+ <!-- END header_block -->
<div class="content-wrapper">
+ <div class="content">
- <div class="content">
+ <!-- BEGIN instruction_block -->
<h2 class="content-head
is-center">{instruction}</h2>
+ <!-- END instruction_block -->
<div class="pure-g">
- <div class="l-box-lrg pure-u-1
pure-u-md-1-2">
- <div class="l-box">
- <!-- BEGIN
message_block -->
- <dl id="system-message">
- <dt
class="{message_class}">{lang_message}</dt>
- <dd
class="{message_class_item}">
- <ul>
-
<li>{cd}</li>
- </ul>
- </dd>
- </dl>
- <!-- END message_block
-->
+ <div class="l-box l-box-lrg pure-u-1
pure-u-md-1-2">
- <form name="login"
method="post" action="{login_url}" {autocomplete} id="form-login"
class="pure-form pure-form-stacked">
- <fieldset>
- <input
type="hidden" name="passwd_type" value="text">
- <!--
BEGIN loging_block -->
- <div
class="pure-control-group">
-
<label for="login">{lang_username}</label>
-
<input type="text" value="{last_loginid}" name="login" id="login"
{login_read_only} required="required"/>
-
<input type="hidden" name="skip_remote" value="{skip_remote}">
-
<input type="hidden" name="lightbox" value="{lightbox}">
- </div>
- <!--
END loging_block -->
- <!--
BEGIN domain_from_host -->
-
@{logindomain}<input type="hidden" id="logindomain" name="logindomain"
value="{logindomain}">
- <!--
END domain_from_host -->
- <br>
- <!--
BEGIN login_additional_info -->
- <div
class="pure-control-group">
-
<label for="firstname">{lang_firstname}</label>
-
<input type="text" value="{firstname}" maxlength="100" name="firstname"
id="firstname" >
- </div>
- <div
class="pure-control-group">
-
<label for="lastname">{lang_lastname}</label>
-
<input type="text" value="{lastname}" name="lastname" id="lastname"
maxlength="100">
- </div>
+ <!-- BEGIN message_block -->
+ <dl id="system-message">
+ <dt
class="{message_class}">{lang_message}</dt>
+ <dd
class="{message_class_item}">
+ <ul>
+
<li>{cd}</li>
+ </ul>
+ </dd>
+ </dl>
+ <!-- END message_block -->
- <!--
END login_additional_info -->
- <!--
BEGIN password_block -->
- <div
class="pure-control-group">
-
<label for="passwd">{lang_password}</label>
-
<input type="password" name="passwd" id="passwd" required="required"/>
- </div>
- <!--
END password_block -->
- <!--
BEGIN login_check_passwd -->
- <div
class="pure-control-group">
-
<label for="passwd_confirm">{lang_confirm_password}</label>
-
<input type="password" name="passwd_confirm" id="passwd_confirm"
required="required"/>
- </div>
- <!--
END login_check_passwd -->
- <!--
BEGIN domain_select -->
- <div
class="pure-control-group">
-
<label for="logindomain">{lang_domain}</label>
-
<select name="logindomain" id="logindomain">
-
<!-- BEGIN domain_option -->
-
<option value="{domain_name}"
{domain_selected}>{domain_display_name}</option>
-
<!-- END domain_option -->
-
</select>
- </div>
- <!--
END domain_select -->
- <!--
BEGIN button_block -->
+ <form name="login"
method="post" action="{login_url}" {autocomplete} id="form-login"
class="pure-form pure-form-stacked">
+ <fieldset>
+ <input
type="hidden" name="passwd_type" value="text">
+ <!-- BEGIN
loging_block -->
+ <div
class="pure-control-group">
+ <label
for="login">{lang_username}</label>
+ <input
type="text" value="{last_loginid}" name="login" id="login" {login_read_only}
required="required"/>
+ <input
type="hidden" name="skip_remote" value="{skip_remote}">
+ <input
type="hidden" name="lightbox" value="{lightbox}">
+ </div>
+ <!-- END
loging_block -->
+ <!-- BEGIN
domain_from_host -->
+
@{logindomain}<input type="hidden" id="logindomain" name="logindomain"
value="{logindomain}">
+ <!-- END
domain_from_host -->
+ <br>
+ <!-- BEGIN
login_additional_info -->
+ <div
class="pure-control-group">
+ <label
for="firstname">{lang_firstname}</label>
+ <input
type="text" value="{firstname}" maxlength="100" name="firstname" id="firstname"
>
+ </div>
+ <div
class="pure-control-group">
+ <label
for="lastname">{lang_lastname}</label>
+ <input
type="text" value="{lastname}" name="lastname" id="lastname" maxlength="100">
+ </div>
- <div
class="pure-controls">
-
<button type="submit" class="pure-button pure-button-primary" name="submitit_"
onclick="do_login();">{lang_login}</button>
- </div>
- <input
type="hidden" name="submitit" value="1">
- <p
class="link_group"><a
href="{return_sso_login_url}">{lang_return_sso_login}</a></p>
- <!--
END button_block -->
- </fieldset>
- </form>
- </div>
+ <!-- END
login_additional_info -->
+ <!-- BEGIN
password_block -->
+ <div
class="pure-control-group">
+ <label
for="passwd">{lang_password}</label>
+ <input
type="password" name="passwd" id="passwd" required="required"/>
+ </div>
+ <!-- END
password_block -->
+ <!-- BEGIN
login_check_passwd -->
+ <div
class="pure-control-group">
+ <label
for="passwd_confirm">{lang_confirm_password}</label>
+ <input
type="password" name="passwd_confirm" id="passwd_confirm" required="required"/>
+ </div>
+ <!-- END
login_check_passwd -->
+ <!-- BEGIN
domain_select -->
+ <div
class="pure-control-group">
+ <label
for="logindomain">{lang_domain}</label>
+ <select
name="logindomain" id="logindomain">
+
<!-- BEGIN domain_option -->
+
<option value="{domain_name}" {domain_selected}>{domain_display_name}</option>
+
<!-- END domain_option -->
+
</select>
+ </div>
+ <!-- END
domain_select -->
+ <!-- BEGIN
button_block -->
+ <div
class="pure-controls">
+ <button
type="submit" class="pure-button pure-button-primary" name="submitit_"
onclick="do_login();">{lang_login}</button>
+ </div>
+ <input
type="hidden" name="submitit" value="1">
+ <p
class="link_group"><a
href="{return_sso_login_url}">{lang_return_sso_login}</a></p>
+ <!-- END
button_block -->
+ </fieldset>
+ </form>
+
</div>
+ <!-- BEGIN forgotten_password_block -->
<div class="l-box-lrg pure-u-1
pure-u-md-1-2">
<p>
<a
href="{action_new_user}">{lang_new_user}</a>
@@ -176,8 +182,11 @@
<a
href="{action_lost_password}">{lang_forgotten_password}</a>.
</p>
</div>
+ <!-- END forgotten_password_block -->
</div>
+ <!-- BEGIN info_block -->
+
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-2">
@@ -191,14 +200,17 @@
</div>
</div>
</div>
+ <!-- END info_block -->
</div>
- <div class="footer l-box is-center">
- <noscript>Warning! JavaScript must be enabled for
proper operation of the Administrator back-end.</noscript>
- <p class="copyright">
- <a
href="http://savannah.nongnu.org/projects/fmsystem/"; 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>
+ <!-- BEGIN footer_block -->
+ <div class="footer is-center">
+ <noscript>Warning! JavaScript must be enabled
for proper operation of the Administrator back-end.</noscript>
+ <p class="copyright">
+ <a
href="http://savannah.nongnu.org/projects/fmsystem/"; 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>
+ <!-- END footer_block -->
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16345] table: Merge 16343:16344 from trunk,
sigurdne <=