diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index f114e117b6d..3d7202d5c70 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -699,19 +699,19 @@ else
$var=true;
$var=!$var;
- print '
| '.$langs->trans("CompanyName").' | ';
+ print ' |
| '.$langs->trans("CompanyName").' | ';
if (! empty($conf->global->MAIN_INFO_SOCIETE_NOM)) print $conf->global->MAIN_INFO_SOCIETE_NOM;
else print img_warning().' '.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyName")).'';
print ' |
';
$var=!$var;
- print '| '.$langs->trans("CompanyAddress").' | ' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS) . ' |
';
+ print '| '.$langs->trans("CompanyAddress").' | ' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS) . ' |
';
$var=!$var;
- print '| '.$langs->trans("CompanyZip").' | ' . (empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP) . ' |
';
+ print '| '.$langs->trans("CompanyZip").' | ' . (empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP) . ' |
';
$var=!$var;
- print '| '.$langs->trans("CompanyTown").' | ' . (empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN) . ' |
';
+ print '| '.$langs->trans("CompanyTown").' | ' . (empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN) . ' |
';
$var=!$var;
print '| '.$langs->trans("CompanyCountry").' | ';
@@ -731,7 +731,7 @@ else
print ' |
';
$var=!$var;
- print '| '.$langs->trans("CompanyCurrency").' | ';
+ print ' |
| '.$langs->trans("CompanyCurrency").' | ';
print currency_name($conf->currency,1);
print ' ('.$conf->currency;
print ($conf->currency != $langs->getCurrencySymbol($conf->currency) ? ' - '.$langs->getCurrencySymbol($conf->currency) : '');
@@ -739,52 +739,54 @@ else
print ' |
';
$var=!$var;
- print '| '.$langs->trans("Phone").' | ' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL,$mysoc->country_code) . ' |
';
+ print '| '.$langs->trans("Phone").' | ' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL,$mysoc->country_code) . ' |
';
$var=!$var;
- print '| '.$langs->trans("Fax").' | ' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX,$mysoc->country_code) . ' |
';
+ print '| '.$langs->trans("Fax").' | ' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX,$mysoc->country_code) . ' |
';
$var=!$var;
- print '| '.$langs->trans("Mail").' | ' . dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL,0,0,0,80) . ' |
';
+ print '| '.$langs->trans("Mail").' | ' . dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL,0,0,0,80) . ' |
';
// Web
$var=!$var;
- print '| '.$langs->trans("Web").' | ' . dol_print_url($conf->global->MAIN_INFO_SOCIETE_WEB,'_blank',80) . ' |
';
+ print '| '.$langs->trans("Web").' | ' . dol_print_url($conf->global->MAIN_INFO_SOCIETE_WEB,'_blank',80) . ' |
';
// Barcode
if (! empty($conf->barcode->enabled))
{
$var=!$var;
- print '| '.$langs->trans("Gencod").' | ' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . ' |
';
+ print '| '.$langs->trans("Gencod").' | ' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . ' |
';
}
// Logo
$var=!$var;
- print '| '.$langs->trans("Logo").' | ';
+ print ' |
| '.$langs->trans("Logo").' | ';
- print '';
+ $tagtd='tagtd ';
+ if ($conf->browser->layout == 'phone') $tagtd='';
+ print '';
print $mysoc->logo;
- print ' | ';
+ print ' | ';
+ print '';
print ' |
';
$var=!$var;
- print '| '.$langs->trans("Note").' | ' . (! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? nl2br($conf->global->MAIN_INFO_SOCIETE_NOTE) : '') . ' |
';
+ print '| '.$langs->trans("Note").' | ' . (! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? nl2br($conf->global->MAIN_INFO_SOCIETE_NOTE) : '') . ' |
';
print '';
@@ -796,22 +798,22 @@ else
print '';
@@ -961,12 +963,12 @@ else
print '
';
print '';
print '';
- print '| '.$langs->trans("FiscalYearInformation").' | '.$langs->trans("Value").' | ';
+ print ''.$langs->trans("FiscalYearInformation").' | '.$langs->trans("Value").' | ';
print "
\n";
$var=true;
$var=!$var;
- print '| '.$langs->trans("FiscalMonthStart").' | ';
+ print ' |
| '.$langs->trans("FiscalMonthStart").' | ';
$monthstart=(! empty($conf->global->SOCIETE_FISCAL_MONTH_START)) ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1;
print dol_print_date(dol_mktime(12,0,0,$monthstart,1,2000,1),'%B','gm') . ' |
';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c53221b3951..5de31c6ee59 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1439,7 +1439,7 @@ table.login_table_securitycode tr td {
#img_securitycode {
border: 1px solid #DDDDDD;
}
-#img_logo {
+#img_logo, .img_logo {
max-width: 200px;
max-height: 100px;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 997b7d33dcd..0edf06380f5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1479,7 +1479,7 @@ table.login_table_securitycode tr td {
#img_securitycode {
border: 1px solid #f4f4f4;
}
-#img_logo {
+#img_logo, .img-logo {
max-width: 200px;
max-height: 100px;
}