Skip to content
Snippets Groups Projects
Commit 4ae3b94b authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'master' into 'stable-3.1' 

layout-fix for company name



See merge request !319
parents 8cad7837 0ab0644e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
interface/web/index.php
+ 3
− 1
View file @ 4ae3b94b
...@@ -109,7 +109,9 @@ $app->tpl->setVar('base64_logo_height', $logo_dimensions[1].'px'); ...@@ -109,7 +109,9 @@ $app->tpl->setVar('base64_logo_height', $logo_dimensions[1].'px');
$app->tpl->setVar('base64_logo_txt', $base64_logo_txt); $app->tpl->setVar('base64_logo_txt', $base64_logo_txt);
// Title // Title
$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: '); if (!empty($sys_config['company_name'])) {
$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
}
$app->tpl_defaults(); $app->tpl_defaults();
$app->tpl->pparse(); $app->tpl->pparse();
......
interface/web/login/index.php
+ 3
− 1
View file @ 4ae3b94b
...@@ -341,7 +341,9 @@ $app->tpl->setVar('base64_logo_height', $logo_dimensions[1].'px'); ...@@ -341,7 +341,9 @@ $app->tpl->setVar('base64_logo_height', $logo_dimensions[1].'px');
$app->tpl->setVar('base64_logo_txt', $base64_logo_txt); $app->tpl->setVar('base64_logo_txt', $base64_logo_txt);
// Title // Title
$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: '); if (!empty($sys_config['company_name'])) {
$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
}
// Custom Login // Custom Login
if ($sys_config['custom_login_text'] != '') { if ($sys_config['custom_login_text'] != '') {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment