Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-22 4ae3b94bce6b2f26002c1a50247a01ab4cf2219a

Merge branch 'master' into 'stable-3.1'

layout-fix for company name



See merge request !319

 interface/web/index.php

@@ -109,7 +109,9 @@
$app->tpl->setVar('base64_logo_txt', $base64_logo_txt);

// Title
if (!empty($sys_config['company_name'])) {
$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
}

$app->tpl_defaults();
$app->tpl->pparse();

 interface/web/login/index.php

@@ -341,7 +341,9 @@
$app->tpl->setVar('base64_logo_txt', $base64_logo_txt);

// Title
if (!empty($sys_config['company_name'])) {
$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
}

// Custom Login
if ($sys_config['custom_login_text'] != '') {