diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 100d1e23e74..924d9bc4481 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -1045,7 +1045,7 @@ else { if ($object->photo) print "
\n"; print ''; - if ($object->photo) print ''; + if ($object->photo) print ''; print ''; print ''; print '
'.$langs->trans("Delete").'

'.$langs->trans("Delete").'

'.$langs->trans("PhotoFile").'
'; diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php index ae1fad8c272..4ea716c322b 100644 --- a/htdocs/admin/tools/index.php +++ b/htdocs/admin/tools/index.php @@ -53,7 +53,9 @@ print '

'; // Show logo -print '
'; +//print '
'; +print '
'; // For a reason I don't know, the div class="center does not works, we must keep the
+ llxFooter(); $db->close(); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index bb03435d25e..e67315adebb 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4839,13 +4839,13 @@ class Form { // TODO Link to large image $ret.=''; - $ret.=''; + $ret.=''; $ret.=''; } else if ($altfile && file_exists($dir."/".$altfile)) { $ret.=''; - $ret.=''; + $ret.=''; $ret.=''; } else @@ -4874,7 +4874,7 @@ class Form { if ($object->photo) $ret.="
\n"; $ret.=''; - if ($object->photo) $ret.=''; + if ($object->photo) $ret.=''; $ret.=''; $ret.=''; $ret.='
'.$langs->trans("Delete").'

'.$langs->trans("Delete").'

'.$langs->trans("PhotoFile").'
'; diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index bf94d35fedc..9d7a0cf8a1e 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1738,7 +1738,7 @@ else { if ($object->logo) print "
\n"; print ''; - if ($object->logo) print ''; + if ($object->logo) print ''; //print ''; print ''; print '
'.$langs->trans("Delete").'

'.$langs->trans("Delete").'

'.$langs->trans("PhotoFile").'
'; diff --git a/htdocs/theme/amarok/img/title_accountancy.png b/htdocs/theme/amarok/img/title_accountancy.png new file mode 100644 index 00000000000..6e7c2a412c6 Binary files /dev/null and b/htdocs/theme/amarok/img/title_accountancy.png differ diff --git a/htdocs/theme/amarok/img/title_bank.png b/htdocs/theme/amarok/img/title_bank.png new file mode 100644 index 00000000000..034a8d0c5e4 Binary files /dev/null and b/htdocs/theme/amarok/img/title_bank.png differ diff --git a/htdocs/theme/amarok/img/title_commercial.png b/htdocs/theme/amarok/img/title_commercial.png new file mode 100644 index 00000000000..46394177698 Binary files /dev/null and b/htdocs/theme/amarok/img/title_commercial.png differ diff --git a/htdocs/theme/amarok/img/title_companies.png b/htdocs/theme/amarok/img/title_companies.png new file mode 100644 index 00000000000..b2539dba849 Binary files /dev/null and b/htdocs/theme/amarok/img/title_companies.png differ diff --git a/htdocs/theme/amarok/img/title_generic.png b/htdocs/theme/amarok/img/title_generic.png new file mode 100644 index 00000000000..ae224327549 Binary files /dev/null and b/htdocs/theme/amarok/img/title_generic.png differ diff --git a/htdocs/theme/amarok/img/title_home.png b/htdocs/theme/amarok/img/title_home.png new file mode 100644 index 00000000000..e9273e727f5 Binary files /dev/null and b/htdocs/theme/amarok/img/title_home.png differ diff --git a/htdocs/theme/amarok/img/title_products.png b/htdocs/theme/amarok/img/title_products.png new file mode 100644 index 00000000000..d3c5b125bbe Binary files /dev/null and b/htdocs/theme/amarok/img/title_products.png differ diff --git a/htdocs/theme/amarok/img/title_project.png b/htdocs/theme/amarok/img/title_project.png new file mode 100644 index 00000000000..05d8ea630b8 Binary files /dev/null and b/htdocs/theme/amarok/img/title_project.png differ diff --git a/htdocs/theme/amarok/img/title_setup.png b/htdocs/theme/amarok/img/title_setup.png new file mode 100644 index 00000000000..d7548d28709 Binary files /dev/null and b/htdocs/theme/amarok/img/title_setup.png differ diff --git a/htdocs/theme/auguria/img/title_accountancy.png b/htdocs/theme/auguria/img/title_accountancy.png new file mode 100644 index 00000000000..6e7c2a412c6 Binary files /dev/null and b/htdocs/theme/auguria/img/title_accountancy.png differ diff --git a/htdocs/theme/auguria/img/title_bank.png b/htdocs/theme/auguria/img/title_bank.png new file mode 100644 index 00000000000..034a8d0c5e4 Binary files /dev/null and b/htdocs/theme/auguria/img/title_bank.png differ diff --git a/htdocs/theme/auguria/img/title_commercial.png b/htdocs/theme/auguria/img/title_commercial.png new file mode 100644 index 00000000000..46394177698 Binary files /dev/null and b/htdocs/theme/auguria/img/title_commercial.png differ diff --git a/htdocs/theme/auguria/img/title_companies.png b/htdocs/theme/auguria/img/title_companies.png new file mode 100644 index 00000000000..b2539dba849 Binary files /dev/null and b/htdocs/theme/auguria/img/title_companies.png differ diff --git a/htdocs/theme/auguria/img/title_generic.png b/htdocs/theme/auguria/img/title_generic.png new file mode 100644 index 00000000000..ae224327549 Binary files /dev/null and b/htdocs/theme/auguria/img/title_generic.png differ diff --git a/htdocs/theme/auguria/img/title_home.png b/htdocs/theme/auguria/img/title_home.png new file mode 100644 index 00000000000..e9273e727f5 Binary files /dev/null and b/htdocs/theme/auguria/img/title_home.png differ diff --git a/htdocs/theme/auguria/img/title_products.png b/htdocs/theme/auguria/img/title_products.png new file mode 100644 index 00000000000..d3c5b125bbe Binary files /dev/null and b/htdocs/theme/auguria/img/title_products.png differ diff --git a/htdocs/theme/auguria/img/title_project.png b/htdocs/theme/auguria/img/title_project.png new file mode 100644 index 00000000000..05d8ea630b8 Binary files /dev/null and b/htdocs/theme/auguria/img/title_project.png differ diff --git a/htdocs/theme/auguria/img/title_setup.png b/htdocs/theme/auguria/img/title_setup.png new file mode 100644 index 00000000000..d7548d28709 Binary files /dev/null and b/htdocs/theme/auguria/img/title_setup.png differ diff --git a/htdocs/theme/bureau2crea/img/title_accountancy.png b/htdocs/theme/bureau2crea/img/title_accountancy.png new file mode 100644 index 00000000000..6e7c2a412c6 Binary files /dev/null and b/htdocs/theme/bureau2crea/img/title_accountancy.png differ diff --git a/htdocs/theme/bureau2crea/img/title_bank.png b/htdocs/theme/bureau2crea/img/title_bank.png new file mode 100644 index 00000000000..034a8d0c5e4 Binary files /dev/null and b/htdocs/theme/bureau2crea/img/title_bank.png differ diff --git a/htdocs/theme/bureau2crea/img/title_commercial.png b/htdocs/theme/bureau2crea/img/title_commercial.png new file mode 100644 index 00000000000..46394177698 Binary files /dev/null and b/htdocs/theme/bureau2crea/img/title_commercial.png differ diff --git a/htdocs/theme/bureau2crea/img/title_companies.png b/htdocs/theme/bureau2crea/img/title_companies.png new file mode 100644 index 00000000000..b2539dba849 Binary files /dev/null and b/htdocs/theme/bureau2crea/img/title_companies.png differ diff --git a/htdocs/theme/bureau2crea/img/title_generic.png b/htdocs/theme/bureau2crea/img/title_generic.png new file mode 100644 index 00000000000..ae224327549 Binary files /dev/null and b/htdocs/theme/bureau2crea/img/title_generic.png differ diff --git a/htdocs/theme/bureau2crea/img/title_home.png b/htdocs/theme/bureau2crea/img/title_home.png new file mode 100644 index 00000000000..e9273e727f5 Binary files /dev/null and b/htdocs/theme/bureau2crea/img/title_home.png differ diff --git a/htdocs/theme/bureau2crea/img/title_products.png b/htdocs/theme/bureau2crea/img/title_products.png new file mode 100644 index 00000000000..d3c5b125bbe Binary files /dev/null and b/htdocs/theme/bureau2crea/img/title_products.png differ diff --git a/htdocs/theme/bureau2crea/img/title_project.png b/htdocs/theme/bureau2crea/img/title_project.png new file mode 100644 index 00000000000..05d8ea630b8 Binary files /dev/null and b/htdocs/theme/bureau2crea/img/title_project.png differ diff --git a/htdocs/theme/bureau2crea/img/title_setup.png b/htdocs/theme/bureau2crea/img/title_setup.png new file mode 100644 index 00000000000..d7548d28709 Binary files /dev/null and b/htdocs/theme/bureau2crea/img/title_setup.png differ diff --git a/htdocs/theme/cameleo/img/title_accountancy.png b/htdocs/theme/cameleo/img/title_accountancy.png new file mode 100644 index 00000000000..6e7c2a412c6 Binary files /dev/null and b/htdocs/theme/cameleo/img/title_accountancy.png differ diff --git a/htdocs/theme/cameleo/img/title_bank.png b/htdocs/theme/cameleo/img/title_bank.png new file mode 100644 index 00000000000..034a8d0c5e4 Binary files /dev/null and b/htdocs/theme/cameleo/img/title_bank.png differ diff --git a/htdocs/theme/cameleo/img/title_commercial.png b/htdocs/theme/cameleo/img/title_commercial.png new file mode 100644 index 00000000000..46394177698 Binary files /dev/null and b/htdocs/theme/cameleo/img/title_commercial.png differ diff --git a/htdocs/theme/cameleo/img/title_companies.png b/htdocs/theme/cameleo/img/title_companies.png new file mode 100644 index 00000000000..b2539dba849 Binary files /dev/null and b/htdocs/theme/cameleo/img/title_companies.png differ diff --git a/htdocs/theme/cameleo/img/title_generic.png b/htdocs/theme/cameleo/img/title_generic.png new file mode 100644 index 00000000000..ae224327549 Binary files /dev/null and b/htdocs/theme/cameleo/img/title_generic.png differ diff --git a/htdocs/theme/cameleo/img/title_home.png b/htdocs/theme/cameleo/img/title_home.png new file mode 100644 index 00000000000..e9273e727f5 Binary files /dev/null and b/htdocs/theme/cameleo/img/title_home.png differ diff --git a/htdocs/theme/cameleo/img/title_products.png b/htdocs/theme/cameleo/img/title_products.png new file mode 100644 index 00000000000..d3c5b125bbe Binary files /dev/null and b/htdocs/theme/cameleo/img/title_products.png differ diff --git a/htdocs/theme/cameleo/img/title_project.png b/htdocs/theme/cameleo/img/title_project.png new file mode 100644 index 00000000000..05d8ea630b8 Binary files /dev/null and b/htdocs/theme/cameleo/img/title_project.png differ diff --git a/htdocs/theme/cameleo/img/title_setup.png b/htdocs/theme/cameleo/img/title_setup.png new file mode 100644 index 00000000000..d7548d28709 Binary files /dev/null and b/htdocs/theme/cameleo/img/title_setup.png differ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index fa5d8681f4f..477bded4696 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -448,6 +448,7 @@ textarea.centpercent { #formuserfile_link { margin-left: 1px; } + /* Style to move picto into left of button */ /* .buttonactionview { @@ -2434,14 +2435,19 @@ div.dolgraph div.legend table tbody tr { height: auto; } margin-bottom: 2px; margin-top: 2px; } -.photointooltip { +.photointooltip, .photologo { -webkit-box-shadow: 0px 0px 3px #777; -moz-box-shadow: 0px 0px 3px #777; box-shadow: 0px 0px 3px #777; margin-top: 6px; +} +.photointoolitp { float: left; /*text-align: center; */ } +.photodelete { + margin-top: 6px !important; +} .logo_setup {