From 7f15154c6bfb67bab0331708216ab17de0833113 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 3 Apr 2013 15:45:06 +0200
Subject: [PATCH] Qual: Uniformize skins code.

---
 htdocs/comm/index.php                         |  24 +-----------------
 htdocs/exports/index.php                      |  10 +++-----
 htdocs/imports/index.php                      |  12 ++++-----
 htdocs/theme/amarok/img/object_action_rdv.png | Bin 0 -> 1059 bytes
 htdocs/theme/eldy/style.css.php               |   4 +--
 5 files changed, 12 insertions(+), 38 deletions(-)
 create mode 100644 htdocs/theme/amarok/img/object_action_rdv.png

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 48a07dcacba..de442152c14 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -88,16 +88,6 @@ llxHeader();
 print_fiche_titre($langs->trans("CustomerArea"));
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
-/*
-print '<table border="0" width="100%" class="notopnoleftnoright">';
-print '<tr>';
-if ((! empty($conf->propal->enabled) && $user->rights->propale->lire) ||
-    (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) ||
-    (! empty($conf->commande->enabled) && $user->rights->commande->lire))
-{
-	print '<td valign="top" width="30%" class="notopnoleft">';
-}
-*/
 
 // Recherche Propal
 if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
@@ -259,18 +249,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 }
 
 
-/*if ((! empty($conf->propal->enabled) && $user->rights->propale->lire) ||
-    (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) ||
-    (! empty($conf->commande->enabled) && $user->rights->commande->lire))
-{
-	print '</td>';
-	print '<td valign="top" width="70%" class="notopnoleftnoright">';
-}
-else
-{
-	print '<td valign="top" width="100%" class="notopnoleftnoright">';
-}*/
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 $NBMAX=3;
@@ -545,7 +524,6 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 }
 
 
-//print '</td></tr></table>';
 print '</div></div></div>';
 
 llxFooter();
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 73ffdded749..df85821229d 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -51,9 +51,8 @@ print $langs->trans("FormatedExportDesc2").' ';
 print $langs->trans("FormatedExportDesc3").'<br>';
 print '<br>';
 
-print '<table class="notopnoleftnoright" width="100%">';
 
-print '<tr><td valign="top" width="70%" class="notopnoleft">';
+print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
 // List export set
@@ -109,9 +108,9 @@ if (count($export->array_export_code))
 	*/
 }
 print '</center>';
+print '<br>';
 
-
-print '</td><td valign="top" width="30%" class="notopnoleftnoright">';
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // List of available export format
@@ -143,8 +142,7 @@ foreach($liste as $key => $val)
 print '</table>';
 
 
-print '</td></tr>';
-print '</table>';
+print '</div></div></div>';
 
 
 llxFooter();
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index 0ec63ac7e14..0cfdb6dff43 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -47,9 +47,8 @@ print $langs->trans("FormatedImportDesc1").'<br>';
 print $langs->trans("FormatedImportDesc2").'<br>';
 print '<br>';
 
-print '<table class="notopnoleftnoright" width="100%">';
 
-print '<tr><td valign="top" width="70%" class="notopnoleft">';
+print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
 // List of import set
@@ -99,9 +98,10 @@ if (count($import->array_import_code))
 	//}
 }
 print '</center>';
+print '<br>';
 
 
-print '</td><td valign="top" width="30%" class="notopnoleftnoright">';
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // List of available import format
@@ -132,12 +132,10 @@ foreach($liste as $key)
 print '</table>';
 
 
-print '</td></tr>';
-print '</table>';
-
-$db->close();
+print '</div></div></div>';
 
 
 llxFooter();
 
+$db->close();
 ?>
diff --git a/htdocs/theme/amarok/img/object_action_rdv.png b/htdocs/theme/amarok/img/object_action_rdv.png
new file mode 100644
index 0000000000000000000000000000000000000000..b892da1f65587da7a7e3e2da5971c7899b8a9b10
GIT binary patch
literal 1059
zcmeH`&r1|x9L8S_^-Wosz;NgnyAa``m$i}>$=qQV-KjNsHK;k6LqZLOG*X8#=*Ju^
zrb`SFI@h^Kubt*Nuu=>K^0FGfD`i7JpeZ^`C^)Bhd-t#C(#!LGzMtngzVLlKJ~onS
zKhzEYNR>y6i0{tEz<u0%o`3qrSCfuLB(Oq``~;x+&-jJO5&#f@JOB~^I)D;@G7z{7
zAeayuP>`WuKv9Mwf}#RN6J``a5Cy>$L{Sh8K{SP|E#y=orwMsi6ircbMG1>C&Sb4j
z&dEq_hBNXq3YVWz{cJv;m7Oedvx=AHQ44Yi=ky@2`*|~v5Rw#4(gVpPl0{_X%9<f_
zuqaY7G6Up<icJ-Vs=A>Xmg<Hojx=4@3`4Vs=3vdC8gD$JkwkZ?jzb+sI!O$h7&tV%
z$RM$4yQWJ`4kWSs$l^{D+jeZ1*x0lE!1jsFn~*t}IstXU#Pz7_g)WDPVK2l%glUAs
z1V_vZ6E9+Zl=$3Z7DP!9GZMulVuVA&Xq?cP(S(ID3lkP`F&4A`?;rnwb4;0ST*Vw3
zn*hV#w`Lk)`us={EVLXQ<zfHq=oKA+TUKM5o_=|=!OOO}a;4O^-I3}()6=~^w8pDv
z<zitH*3~J{e6Uifl&-hJ+UCGs=kL3<iCW9<oZs=QA1&+K)%lz8#^U16&etEs!@1Vh
zOS{gEbkCiEh1B}zncD5XWzal$x;}jIUb=p^@71Zd<*l{X^$+G!;r;5zbbSb2-l|op
zvs8GuT1^l3o;caNS*<=<dazopg6VTFuHJ91T`P219qxfH(7$)QH2?AuKXd@frLp3Q
HH1+T=BPq3t

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 7112399d3da..cccaedd6247 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1400,7 +1400,7 @@ div.divbutaction { margin-bottom: 1.4em; }
 	text-decoration: none;
 	white-space: nowrap;
 	padding: 0.4em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
-	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.9':'0.7'); ?>em;
+	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
     -moz-border-radius:0px 5px 0px 5px;
 	-webkit-border-radius:0px 5px 0px 5px;
 	border-radius:0px 5px 0px 5px;
@@ -2492,7 +2492,7 @@ div.ecmjqft {
 	bottom: 4px !important;
 <?php } ?>
 	text-align: center;
-	min-width: 500px;
+	min-width: <?php echo $dol_optimize_smallscreen?'200':'480'; ?>px;
 	width: auto;
 	padding-left: 10px !important;
 	padding-right: 10px !important;