diff --git a/api/src/Framework/Login.php b/api/src/Framework/Login.php index ccb2889e36..0a71fbc806 100644 --- a/api/src/Framework/Login.php +++ b/api/src/Framework/Login.php @@ -58,8 +58,8 @@ class Login $tmpl = new Template(EGW_SERVER_ROOT.'/api/templates/default'); $tmpl->set_file(array('login_form' => Api\Header\UserAgent::mobile()?'login_mobile.tpl':'login.tpl')); } - - $tmpl->set_var('lang_message',$GLOBALS['loginscreenmessage']); + $tmpl->set_var('lang_message', empty(strip_tags($GLOBALS['loginscreenmessage'])) || $GLOBALS['loginscreenmessage'] === 'EGroupware' ? + lang('Your Collaboration Platform') : $GLOBALS['loginscreenmessage']); // did admin disable 2FA if ($GLOBALS['egw_info']['server']['2fa_required'] === 'disabled') @@ -192,6 +192,9 @@ class Login $tmpl->set_var('template_set',$this->framework->template); $var['background_file'] = self::pick_login_background($GLOBALS['egw_info']['server']['login_background_file']); + // add "stockLoginBackground" class to div#loginMainDiv to fix positions for stock background + $var['stock_background_class'] = strpos($var['background_file'], '/api/templates/default/images/login_background') !== false ? + 'stockLoginBackground' : ''; $var['logo_file'] = \EGroupware\Api\Framework::get_login_logo_or_bg_url('login_logo_file', 'login_logo'); diff --git a/api/templates/default/images/login_background.jpg b/api/templates/default/images/login_background.jpg index 15d1035a12..fa557839b4 100644 Binary files a/api/templates/default/images/login_background.jpg and b/api/templates/default/images/login_background.jpg differ diff --git a/api/templates/default/images/login_logo.svg b/api/templates/default/images/login_logo.svg new file mode 100644 index 0000000000..ce84ac8bc1 --- /dev/null +++ b/api/templates/default/images/login_logo.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/api/templates/default/images/logo.svg b/api/templates/default/images/logo.svg index 1ce8cff847..ce84ac8bc1 100755 --- a/api/templates/default/images/logo.svg +++ b/api/templates/default/images/logo.svg @@ -1,128 +1,169 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 7683a7b5cf..954213422f 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -1739,6 +1739,33 @@ body { * @package pixelegg * @version $Id$ */ +/** + * 19.1 Login page with stock background image + */ +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo { + position: relative; + top: 100px; + left: -50px; +} +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo div.login_logo_container { + height: 80px; +} +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo div.login_logo_container div.login_logo { + width: 350px; + max-width: 350px; +} +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo div#loginScreenMessage { + font-size: 28.5px; + font-weight: 500; + color: #075ca3; + font-family: arial, helvetica, sans-serif; + margin: 0; + padding-left: 106px; +} +div#loginMainDiv.stockLoginBackground div#centerBox form { + border: 1px solid gray; + border-radius: 0 !important; +} #socialBox { float: left; margin-top: 20px; diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css index f1ad451755..8104782389 100644 --- a/pixelegg/css/monochrome.css +++ b/pixelegg/css/monochrome.css @@ -1728,6 +1728,33 @@ body { * @package pixelegg * @version $Id$ */ +/** + * 19.1 Login page with stock background image + */ +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo { + position: relative; + top: 100px; + left: -50px; +} +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo div.login_logo_container { + height: 80px; +} +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo div.login_logo_container div.login_logo { + width: 350px; + max-width: 350px; +} +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo div#loginScreenMessage { + font-size: 28.5px; + font-weight: 500; + color: #075ca3; + font-family: arial, helvetica, sans-serif; + margin: 0; + padding-left: 106px; +} +div#loginMainDiv.stockLoginBackground div#centerBox form { + border: 1px solid gray; + border-radius: 0 !important; +} #socialBox { float: left; margin-top: 20px; diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 4c28002a30..71dfbb930a 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -1739,6 +1739,33 @@ body { * @package pixelegg * @version $Id$ */ +/** + * 19.1 Login page with stock background image + */ +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo { + position: relative; + top: 100px; + left: -50px; +} +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo div.login_logo_container { + height: 80px; +} +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo div.login_logo_container div.login_logo { + width: 350px; + max-width: 350px; +} +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo div#loginScreenMessage { + font-size: 28.5px; + font-weight: 500; + color: #075ca3; + font-family: arial, helvetica, sans-serif; + margin: 0; + padding-left: 106px; +} +div#loginMainDiv.stockLoginBackground div#centerBox form { + border: 1px solid gray; + border-radius: 0 !important; +} #socialBox { float: left; margin-top: 20px; diff --git a/pixelegg/less/layout_loginPage.less b/pixelegg/less/layout_loginPage.less index eddfe94c93..7b492fab1c 100644 --- a/pixelegg/less/layout_loginPage.less +++ b/pixelegg/less/layout_loginPage.less @@ -15,6 +15,39 @@ @import (reference) "definitions.less"; @import "def_colors.less"; + +/** + * 19.1 Login page with stock background image + */ +div#loginMainDiv.stockLoginBackground { + div#divAppIconBar { + div#divLogo { + position: relative; + top: 100px; + left: -50px; + div.login_logo_container { + height: 80px; + div.login_logo { + width: 350px; + max-width: 350px; + } + } + div#loginScreenMessage { + font-size: 28.5px; + font-weight: 500; + color: #075ca3; + font-family: arial, helvetica, sans-serif; + margin: 0; + padding-left: 106px; + } + } + } + div#centerBox form { + border: 1px solid gray; + border-radius: 0 !important; + } +} + //############################################################################################################## #socialBox { diff --git a/pixelegg/login.tpl b/pixelegg/login.tpl index 3af498aa8a..2f013d2142 100644 --- a/pixelegg/login.tpl +++ b/pixelegg/login.tpl @@ -1,7 +1,7 @@ -
+
{cd} X
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index 35bed3cd81..26294086c0 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -1750,6 +1750,33 @@ body { * @package pixelegg * @version $Id$ */ +/** + * 19.1 Login page with stock background image + */ +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo { + position: relative; + top: 100px; + left: -50px; +} +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo div.login_logo_container { + height: 80px; +} +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo div.login_logo_container div.login_logo { + width: 350px; + max-width: 350px; +} +div#loginMainDiv.stockLoginBackground div#divAppIconBar div#divLogo div#loginScreenMessage { + font-size: 28.5px; + font-weight: 500; + color: #075ca3; + font-family: arial, helvetica, sans-serif; + margin: 0; + padding-left: 106px; +} +div#loginMainDiv.stockLoginBackground div#centerBox form { + border: 1px solid gray; + border-radius: 0 !important; +} #socialBox { float: left; margin-top: 20px;