")
+ * @return boolean true if email syntax is OK, false if KO or empty string
*/
function isValidEmail($address)
{
@@ -1234,9 +1251,10 @@ function isValidEmail($address)
}
/**
- * Return true if phone number syntax is ok.
- * @param address phone (Ex: "0601010101")
- * @return boolean true if phone syntax is OK, false if KO or empty string
+ * Return true if phone number syntax is ok
+ *
+ * @param string $address phone (Ex: "0601010101")
+ * @return boolean true if phone syntax is OK, false if KO or empty string
*/
function isValidPhone($address)
{
@@ -1245,10 +1263,11 @@ function isValidPhone($address)
/**
- * Make a strlen call. Works even if mbstring module not enabled.
- * @param $string
- * @param $stringencoding
- * @return int
+ * Make a strlen call. Works even if mbstring module not enabled
+ *
+ * @param string $string String to calculate length
+ * @param string $stringencoding Encoding of string
+ * @return int Length of string
*/
function dol_strlen($string,$stringencoding='UTF-8')
{
@@ -1260,6 +1279,7 @@ function dol_strlen($string,$stringencoding='UTF-8')
/**
* Make a substring. Works even in mbstring module not enabled
+ *
* @param $string
* @param $start
* @param $length
@@ -2552,79 +2572,71 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar
/**
* Get title line of an array
+ *
* @param name Label of field
* @param thead For thead format
* @param file Url used when we click on sort picto
* @param field Field to use for new sorting
* @param begin ("" by defaut)
* @param moreparam Add more parameters on sort url links ("" by default)
- * @param td Options of attribute td ("" by defaut)
+ * @param moreattrib Add more attributes on th ("" by defaut)
* @param sortfield Current field used to sort
* @param sortorder Current sort order
*/
-function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $moreparam="", $td="", $sortfield="", $sortorder="")
+function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $moreparam="", $moreattrib="", $sortfield="", $sortorder="")
{
global $conf;
- //print "$name, $file, $field, $begin, $options, $td, $sortfield, $sortorder
\n";
-
+ //print "$name, $file, $field, $begin, $options, $moreattrib, $sortfield, $sortorder
\n";
+
$out='';
-
- if ($thead)
+ // If field is used as sort criteria we use a specific class
+ // Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
+ if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field)))
{
- $out.= ''.$name.' | ';
+ $out.= '';
}
else
{
- // Le champ de tri est mis en evidence.
- // Exemple si (sortfield,field)=("nom","xxx.nom") ou (sortfield,field)=("nom","nom")
- if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field)))
- {
- $out.= ' | ';
- }
- else
- {
- $out.= ' | ';
- }
- $out.= $name;
-
- // If this is a sort field
- if ($field)
- {
- $options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam);
- $options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options);
- $options=preg_replace('/&+/i','&',$options);
- if (! preg_match('/^&/',$options)) $options='&'.$options;
-
- //print " ";
- $out.= ' ';
- if (! $sortorder)
- {
- $out.= ''.img_down("A-Z",0).'';
- $out.= ''.img_up("Z-A",0).'';
- }
- else
- {
- if ($field != $sortfield)
- {
- $out.= ''.img_down("A-Z",0).'';
- $out.= ''.img_up("Z-A",0).'';
- }
- else {
- $sortorder=strtoupper($sortorder);
- if ($sortorder == 'DESC' ) {
- $out.= ''.img_down("A-Z",0).'';
- $out.= ''.img_up("Z-A",1).'';
- }
- if ($sortorder == 'ASC' ) {
- $out.= ''.img_down("A-Z",1).'';
- $out.= ''.img_up("Z-A",0).'';
- }
- }
- }
- }
- $out.= " | ";
+ $out.= '';
}
-
+ $out.=$name;
+
+ if (empty($thead) && $field) // If this is a sort field
+ {
+ $options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam);
+ $options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options);
+ $options=preg_replace('/&+/i','&',$options);
+ if (! preg_match('/^&/',$options)) $options='&'.$options;
+
+ //print " ";
+ $out.= '';
+ if (! $sortorder)
+ {
+ $out.= ''.img_down("A-Z",0).'';
+ $out.= ''.img_up("Z-A",0).'';
+ }
+ else
+ {
+ if ($field != $sortfield)
+ {
+ $out.= ''.img_down("A-Z",0).'';
+ $out.= ''.img_up("Z-A",0).'';
+ }
+ else {
+ $sortorder=strtoupper($sortorder);
+ if ($sortorder == 'DESC' ) {
+ $out.= ''.img_down("A-Z",0).'';
+ $out.= ''.img_up("Z-A",1).'';
+ }
+ if ($sortorder == 'ASC' ) {
+ $out.= ''.img_down("A-Z",1).'';
+ $out.= ''.img_up("Z-A",0).'';
+ }
+ }
+ }
+ }
+ $out.=' | ';
+
return $out;
}
@@ -2652,6 +2664,7 @@ function print_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpat
/**
* Load a title with picto
+ *
* @param titre Title to show
* @param mesg Added message to show on right
* @param picto Icon to use before title (should be a 32x32 transparent png file)
@@ -2684,6 +2697,7 @@ function load_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath
/**
* Print a title with navigation controls for pagination
+ *
* @param titre Title to show (required)
* @param page Numero of page (required)
* @param file Url of page (required)
@@ -2793,6 +2807,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
/**
* Fonction servant a afficher les fleches de navigation dans les pages de listes
+ *
* @param page Numero of page
* @param file Lien
* @param options Autres parametres d'url a propager dans les liens ("" par defaut)
@@ -2817,6 +2832,7 @@ function print_fleche_navigation($page,$file,$options='',$nextpage,$betweenarrow
/**
* Fonction qui retourne un taux de tva formate pour visualisation
* Utilisee dans les pdf et les pages html
+ *
* @param rate Rate value to format (19.6 19,6 19.6% 19,6%,...)
* @param addpercent Add a percent % sign in output
* @param info_bits Miscellanous information on vat
@@ -2845,6 +2861,7 @@ function vatrate($rate,$addpercent=false,$info_bits=0)
/**
* Fonction qui formate un montant pour visualisation
* Fonction utilisee dans les pdf et les pages html
+ *
* @param amount Montant a formater
* @param html Type de formatage, html ou pas (par defaut)
* @param outlangs Objet langs pour formatage text
@@ -2917,7 +2934,8 @@ function price($amount, $html=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou
/**
* Function that return a number with universal decimal format (decimal separator is '.') from
* an amount typed by a user.
- * Function to use on each input amount before any numeric test or database insert.
+ * Function to use on each input amount before any numeric test or database insert
+ *
* @param amount Amount to convert/clean
* @param rounding ''=No rounding
* 'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)
@@ -3002,6 +3020,7 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
/**
* Return localtaxe rate for a particular tva
+ *
* @param tva Vat taxe
* @param local Local taxe to search and return
* @param societe_acheteuse Object of buying third party
@@ -3040,7 +3059,8 @@ function get_localtax($tva, $local, $societe_acheteuse="")
/**
* Return vat rate of a product in a particular selling country or default country
- * vat if product is unknown.
+ * vat if product is unknown
+ *
* @param idprod Id of product or 0 if not a predefined product
* @param countrycode Country code (FR, US, IT, ...)
* @return int <0 if KO, Vat rate if OK
@@ -3099,6 +3119,7 @@ function get_product_vat_for_country($idprod, $countrycode)
/**
* Return localtax rate of a product in a particular selling country
+ *
* @param idprod Id of product
* @package local 1 for localtax1, 2 for localtax 2
* @param countrycode Country code (FR, US, IT, ...)
@@ -3256,6 +3277,7 @@ function get_default_localtax($societe_vendeuse, $societe_acheteuse, $local, $id
/**
* Return yes or no in current language
+ *
* @param yesno Value to test (1, 'yes', 'true' or 0, 'no', 'false')
* @param case 1=Yes/No, 0=yes/no
* @param color 0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color.
@@ -3284,6 +3306,7 @@ function yn($yesno, $case=1, $color=0)
* Return a path to have a directory according to an id
* Examples: '001' with level 3->"0/0/1/", '015' with level 3->"0/1/5/"
* Examples: 'ABC-1' with level 3 ->"0/0/1/", '015' with level 1->"5/"
+ *
* @param $num Id to develop
* @param $level Level of development (1, 2 or 3 level)
* @param $alpha Use alpha ref
@@ -3310,6 +3333,7 @@ function create_exdir($dir)
/**
* Creation of a directory (recursive)
+ *
* @param $dir Directory to create
* @return int < 0 if KO, 0 = already exists, > 0 if OK
*/
@@ -3371,6 +3395,7 @@ function dol_mkdir($dir)
/**
* Return picto saying a field is required
+ *
* @return string Chaine avec picto obligatoire
*/
function picto_required()
@@ -3381,6 +3406,7 @@ function picto_required()
/**
* Clean a string from all HTML tags and entities
+ *
* @param StringHtml String to clean
* @param removelinefeed Replace also all lines feeds by a space
* @return string String cleaned
@@ -3405,7 +3431,8 @@ function dol_string_nohtmltag($StringHtml,$removelinefeed=1)
/**
- * Replace CRLF in string with a HTML BR tag.
+ * Replace CRLF in string with a HTML BR tag
+ *
* @param stringtoencode String to encode
* @param nl2brmode 0=Adding br before \n, 1=Replacing \n by br
* @param forxml false=Use
, true=Use
@@ -3435,7 +3462,8 @@ function dol_nl2br($stringtoencode,$nl2brmode=0,$forxml=false)
* - writeHTMLCell -> param must be encoded into HTML.
* - MultiCell -> param must not be encoded into HTML.
* Because writeHTMLCell convert also \n into
, if function
- * is used to build PDF, nl2brmode must be 1.
+ * is used to build PDF, nl2brmode must be 1
+ *
* @param stringtoencode String to encode
* @param nl2brmode 0=Adding br before \n, 1=Replacing \n by br (for use with FPDF writeHTMLCell function for example)
* @param pagecodefrom Pagecode stringtoencode is encoded
@@ -3462,6 +3490,7 @@ function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8')
/**
* This function is called to decode a HTML string (it decodes entities and br tags)
+ *
* @param stringtodecode String to decode
* @param pagecodeto Page code for result
*/
@@ -3477,6 +3506,7 @@ function dol_htmlentitiesbr_decode($stringtodecode,$pagecodeto='UTF-8')
/**
* This function remove all ending \n and br at end
+ *
* @param stringtodecode String to decode
*/
function dol_htmlcleanlastbr($stringtodecode)
@@ -3487,6 +3517,7 @@ function dol_htmlcleanlastbr($stringtodecode)
/**
* This function is called to decode a string with HTML entities (it decodes entities tags)
+ *
* @param stringhtml stringhtml
* @param pagecodeto Encoding of input string
* @return string decodestring
@@ -3499,6 +3530,7 @@ function dol_entity_decode($stringhtml,$pagecodeto='UTF-8')
/**
* Replace html_entity_decode functions to manage errors
+ *
* @param a
* @param b
* @param c
@@ -3513,6 +3545,7 @@ function dol_html_entity_decode($a,$b,$c)
/**
* Replace htmlentities functions to manage errors
+ *
* @param a
* @param b
* @param c
@@ -3529,7 +3562,8 @@ function dol_htmlentities($a,$b,$c)
/**
* Check if a string is a correct iso string
* If not, it will we considered not HTML encoded even if it is by FPDF.
- * Example, if string contains euro symbol that has ascii code 128.
+ * Example, if string contains euro symbol that has ascii code 128
+ *
* @param s String to check
* @return int 0 if bad iso, 1 if good iso
*/
@@ -3550,6 +3584,7 @@ function dol_string_is_good_iso($s)
/**
* Return nb of lines of a clear text
+ *
* @param s String to check
* @param maxchar Not yet used
* @return int Number of lines
@@ -3566,6 +3601,7 @@ function dol_nboflines($s,$maxchar=0)
/**
* Return nb of lines of a formated text with \n and
+ *
* @param text Text
* @param maxlinesize Largeur de ligne en caracteres (ou 0 si pas de limite - defaut)
* @param charset Give the charset used to encode the $text variable in memory.
@@ -3602,6 +3638,7 @@ function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8')
/**
* Same function than microtime in PHP 5 but compatible with PHP4
+ *
* @return float Time (millisecondes) with microsecondes in decimal part
*/
function dol_microtime_float()
@@ -3612,6 +3649,7 @@ function dol_microtime_float()
/**
* Return if a text is a html content
+ *
* @param msg Content to check
* @param option 0=Full detection, 1=Fast check
* @return boolean true/false
@@ -4074,7 +4112,8 @@ function verifCond($strRights)
/**
* Replace eval function to add more security.
- * This function is called by verifCond().
+ * This function is called by verifCond()
+ *
* @param string $s
*/
function dol_eval($s)
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index c30bea39788..3bae01cfd80 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -125,26 +125,26 @@ print ''.$langs->trans("Value").' | ';
print "\n";
$var=!$var;
-print '| ';
+print ' |
| ';
print $langs->trans("PAYPAL_API_SANDBOX").' | ';
print $form->selectyesno("PAYPAL_API_SANDBOX",$conf->global->PAYPAL_API_SANDBOX,1);
print ' |
';
$var=!$var;
-print '| ';
+print ' |
| ';
print $langs->trans("PAYPAL_API_USER").' | ';
print '';
print ' '.$langs->trans("Example").': paypal_api1.mywebsite.com';
print ' |
';
$var=!$var;
-print '| ';
+print ' |
| ';
print $langs->trans("PAYPAL_API_PASSWORD").' | ';
print '';
print ' |
';
$var=!$var;
-print '| ';
+print ' |
| ';
print $langs->trans("PAYPAL_API_SIGNATURE").' | ';
print '';
print '
'.$langs->trans("Example").': ASsqXEmw4KzmX-CPChWSVDNCNfd.A3YNR7uz-VncXXAERFDFDFDF';
@@ -157,7 +157,7 @@ print ' | '.$langs->trans("Value").' | ';
print "
\n";
$var=!$var;
-print '| ';
+print ' |
| ';
print $langs->trans("PAYPAL_API_INTEGRAL_OR_PAYPALONLY").' | ';
print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY",array('integral'=>'Integral','paypalonly'=>'Paypal only'),$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY);
print ' |
';
@@ -240,7 +240,7 @@ print '';
print '
';
$token='';
-if (! empty($conf->global->PAYPAL_SECURITY_TOKEN)) $token='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+if (! empty($conf->global->PAYPAL_SECURITY_TOKEN)) $token='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
// Url list
print ''.$langs->trans("FollowingUrlAreAvailableToMakePayments").':
';
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index e8c7b805f8f..fb0d19d721c 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -1200,64 +1200,68 @@ padding: 0px 0px;
/* For lists */
table.liste {
-width: 100%;
-border-collapse: collapse;
-border-top-color: #FEFEFE;
+ width: 100%;
+ border-collapse: collapse;
+ border-top-color: #FEFEFE;
-border-left-width: 1px;
-border-left-color: #BBBBBB;
-border-left-style: solid;
+ border-left-width: 1px;
+ border-left-color: #BBBBBB;
+ border-left-style: solid;
-border-right-width: 1px;
-border-right-color: #BBBBBB;
-border-right-style: solid;
+ border-right-width: 1px;
+ border-right-color: #BBBBBB;
+ border-right-style: solid;
-border-bottom-width: 1px;
-border-bottom-color: #BBBBBB;
-border-bottom-style: solid;
+ border-bottom-width: 1px;
+ border-bottom-color: #BBBBBB;
+ border-bottom-style: solid;
-margin-bottom: 2px;
-margin-top: 0px;
+ margin-bottom: 2px;
+ margin-top: 0px;
--moz-box-shadow: 4px 4px 4px #CCC;
--webkit-box-shadow: 4px 4px 4px #CCC;
-box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 4px 4px 4px #CCC;
+ -webkit-box-shadow: 4px 4px 4px #CCC;
+ box-shadow: 4px 4px 4px #CCC;
}
table.liste td {
-padding-right: 2px;
+ padding-right: 2px;
}
-tr.liste_titre {
-height: 24px;
-background: #7699A9;
-background-image: url();
-background-repeat: repeat-x;
-color: #FFFFFF;
-font-family: ;
-/* border-bottom: 1px solid #FDFFFF; */
-white-space: nowrap;
-}
-td.liste_titre {
-background: #7699A9;
-background-image: url();
-background-repeat: repeat-x;
-color: #FFFFFF;
-font-family: ;
-font-weight: normal;
-/* border-bottom: 1px solid #FDFFFF; */
-white-space: nowrap;
-}
-td.liste_titre_sel
+tr.liste_titre
{
-background: #7699A9;
-background-image: url();
-background-repeat: repeat-x;
-color: #FFFFFF;
-font-family: ;
-font-weight: normal;
-/* text-decoration: underline; */
-/* border-bottom: 1px solid #FDFFFF; */
-white-space: nowrap;
+ height: 24px;
+ background: #7699A9;
+ background-image: url();
+ background-repeat: repeat-x;
+ color: #FFFFFF;
+ font-family: ;
+ /* border-bottom: 1px solid #FDFFFF; */
+ white-space: nowrap;
+}
+th.liste_titre, td.liste_titre
+{
+ background: #7699A9;
+ background-image: url();
+ background-repeat: repeat-x;
+ color: #FFFFFF;
+ font-family: ;
+ font-weight: normal;
+ /* border-bottom: 1px solid #FDFFFF; */
+ white-space: nowrap;
+ text-align: ;
+}
+th.liste_titre_sel, td.liste_titre_sel
+{
+ background: #7699A9;
+ background-image: url();
+ background-repeat: repeat-x;
+ color: #FFFFFF;
+ font-family: ;
+ font-weight: normal;
+ /* text-decoration: underline; */
+ /* border-bottom: 1px solid #FDFFFF; */
+ white-space: nowrap;
+ text-align: ;
}
input.liste_titre {
background: transparent;
@@ -1274,19 +1278,6 @@ font-weight: normal;
white-space: nowrap;
}
-th {
-/* background: #7699A9; */
-background: #91ABB3;
-color: #334444;
-font-family: ;
-font-weight: bold;
-border-left: 1px solid #FFFFFF;
-border-right: 1px solid #FFFFFF;
-border-top: 1px solid #FFFFFF;
-border-bottom: 1px solid #FFFFFF;
-white-space: nowrap;
-}
-
.impair {
/* background: #d0d4d7; */
background: #eaeaea;
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 4aa1e974344..7312b757d11 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -1402,8 +1402,8 @@ tr.liste_titre:first-child {
background-position: top right;
}
-td.liste_titre_sel,
-tr.liste_titre:first-child td {
+th.liste_titre_sel, td.liste_titre_sel,
+tr.liste_titre:first-child td {
color: #FFFFFF !important;
}
@@ -1430,7 +1430,8 @@ tr.liste_titre td {
background: none !important;
}
-td.liste_titre {
+th.liste_titre, td.liste_titre
+{
background-repeat: repeat-x;
color: #333333;
font-family: ;
@@ -1438,6 +1439,7 @@ td.liste_titre {
white-space: nowrap;
background-image: none;
background: none;
+ text-align: ;
}
/*tr.liste_titre select.flat {
@@ -1453,7 +1455,8 @@ tr.liste_titre input.button {
/*margin: 30px 10px 10px 0px;*/
}
-td.liste_titre_sel {
+th.liste_titre_sel, td.liste_titre_sel
+{
background: #505050;
background-repeat: repeat-x;
color: #FFFFFF;
@@ -1462,6 +1465,7 @@ td.liste_titre_sel {
/* text-decoration: underline; */
/* border-bottom: 1px solid #FDFFFF; */
white-space: nowrap;
+ text-align: ;
}
input.liste_titre {
@@ -1481,19 +1485,6 @@ white-space: nowrap;
padding: 5px;
}
-th {
-/* background: #7699A9; */
-background: #91ABB3;
-color: #334444;
-font-family: ;
-font-weight: bold;
-border-left: 1px solid #FFFFFF;
-border-right: 1px solid #FFFFFF;
-border-top: 1px solid #FFFFFF;
-border-bottom: 1px solid #FFFFFF;
-white-space: nowrap;
-}
-
.impair {
/* background: #d0d4d7; */
background: #eaeaea;
@@ -2221,7 +2212,7 @@ a.cke_dialog_ui_button
margin-left: -240px;
margin-bottom: 30px;
}
-
+
div#infoVersion {
position: relative;
width: 100%;
@@ -2231,14 +2222,14 @@ div#infoVersion {
font-size: 10px;
background-color: #D6D6D6;
}
-
+
div#logoBox {
position: relative;
width: 100%;
height: auto;
margin-top: 30px;
}
-
+
div#parameterBox {
position: relative;
width: 100%;
@@ -2249,14 +2240,14 @@ div#parameterBox {
background-repeat: no-repeat;
background-position: top center;
}
-
+
div#parameterBox div {
width: 100%;
height: 20px;
position: relative;
line-height: 20px;
}
-
+
div#parameterBox div label {
width: 190px;
text-align: right;
@@ -2264,7 +2255,7 @@ div#parameterBox div label {
float: left;
margin-right: 10px;
}
-
+
div#parameterBox div input[type="text"],
div#parameterBox div input[type="password"] {
width: 180px;
@@ -2272,12 +2263,12 @@ div#parameterBox div input[type="password"] {
font-size: 10px;
margin-top: 2px;
}
-
+
div#connectionLine {
margin: 10px 0px;
text-align: center;
}
-
+
div#logBox {
margin-top: 25px;
}
@@ -2285,7 +2276,7 @@ margin-top: 25px;
div.captchaBox {
margin-top: 10px;
}
-
+
div.captchaImg {
margin-bottom: 10px;
margin-top: 5px;
@@ -2295,7 +2286,7 @@ div.captchaImg {
img#captcha {
margin-left: 200px;
}
-
+
div#infoLogin {
width: 100%;
height: auto;
@@ -2314,11 +2305,11 @@ div.other {
left: 50%;
margin-left: -240px;
}
-
+
form.listactionsfilter img {
display: none;
}
-
+
form.listactionsfilter input[type="submit"] {
margin: 2px 0px;
}
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 4af783fde2d..42f43efc8c8 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -1339,30 +1339,31 @@ table.liste td {
}
tr.liste_titre {
-height: 20px;
-color: #842F00;
-font-weight: bold;
-font-family: "Trebuchet MS",Arial,Helvetica,sans-serif;
-/*border-bottom: 1px solid #FDFFFF;*/
-border-radius: 8px;
-line-height: 18px;
-padding-left: 10px;
-padding-right: 10px;
-white-space: nowrap;
+ height: 20px;
+ color: #842F00;
+ font-weight: bold;
+ font-family: "Trebuchet MS",Arial,Helvetica,sans-serif;
+ /*border-bottom: 1px solid #FDFFFF;*/
+ border-radius: 8px;
+ line-height: 18px;
+ padding-left: 10px;
+ padding-right: 10px;
+ white-space: nowrap;
}
-
-tr.liste_titre td {
- padding-left: 6px;
- padding-right: 6px;
- /*vertical-align: text-top;*/
-}
-
-td.liste_titre_sel
+th.liste_titre, td.liste_titre
{
-background-position: top right;
-color: #A51B00;
-font-weight: bold;
-white-space: nowrap;
+ padding-left: 6px;
+ padding-right: 6px;
+ /*vertical-align: text-top;*/
+ text-align: ;
+}
+th.liste_titre_sel, td.liste_titre_sel
+{
+ background-position: top right;
+ color: #A51B00;
+ font-weight: bold;
+ white-space: nowrap;
+ text-align: ;
}
input.liste_titre {
@@ -1383,19 +1384,6 @@ font-weight: normal;
white-space: nowrap;
}
-th {
-/* background: #7699A9; */
-background: #91ABB3;
-color: #334444;
-font-family: ;
-font-weight: bold;
-border-left: 1px solid #FFFFFF;
-border-right: 1px solid #FFFFFF;
-border-top: 1px solid #FFFFFF;
-border-bottom: 1px solid #FFFFFF;
-white-space: nowrap;
-}
-
.impair {
/* background: #d0d4d7; */
background: #eaeaea;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9de61eaaa77..58e2ced4c1e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -228,12 +228,12 @@ div.fichecenter {
div.fichethirdleft {
browser->phone)) { print "float: ".$left.";\n"; } ?>
browser->phone)) { print "width: 35%;\n"; } ?>
- browser->phone)) { print "padding-bottom: 6px;\n"; } ?>
+ browser->phone)) { print "padding-bottom: 6px;\n"; } ?>
}
div.fichetwothirdright {
browser->phone)) { print "float: ".$left.";\n"; } ?>
browser->phone)) { print "width: 65%;\n"; } ?>
- browser->phone)) { print "padding-bottom: 6px\n"; } ?>
+ browser->phone)) { print "padding-bottom: 6px\n"; } ?>
}
div.fichehalfleft {
browser->phone)) { print "float: ".$left.";\n"; } ?>
@@ -1222,59 +1222,63 @@ padding: 0px 0px;
/* For lists */
table.liste {
-width: 100%;
-border-collapse: collapse;
-border-top-color: #FEFEFE;
+ width: 100%;
+ border-collapse: collapse;
+ border-top-color: #FEFEFE;
-border-right-width: 1px;
-border-right-color: #BBBBBB;
-border-right-style: solid;
+ border-right-width: 1px;
+ border-right-color: #BBBBBB;
+ border-right-style: solid;
-border-bottom-width: 1px;
-border-bottom-color: #BBBBBB;
-border-bottom-style: solid;
+ border-bottom-width: 1px;
+ border-bottom-color: #BBBBBB;
+ border-bottom-style: solid;
-margin-bottom: 2px;
-margin-top: 0px;
+ margin-bottom: 2px;
+ margin-top: 0px;
--moz-box-shadow: 4px 4px 4px #CCC;
--webkit-box-shadow: 4px 4px 4px #CCC;
-box-shadow: 4px 4px 4px #CCC;
+ -moz-box-shadow: 4px 4px 4px #CCC;
+ -webkit-box-shadow: 4px 4px 4px #CCC;
+ box-shadow: 4px 4px 4px #CCC;
}
table.liste td {
-padding-right: 2px;
+ padding-right: 2px;
}
-tr.liste_titre {
-height: 20px !important;
-background: #7699A9;
-background-image: url();
-background-repeat: repeat-x;
-color: #334444;
-font-family: ;
-border-bottom: 1px solid #FDFFFF;
-white-space: nowrap;
-}
-td.liste_titre {
-background: #7699A9;
-background-image: url();
-background-repeat: repeat-x;
-color: #334444;
-font-family: ;
-font-weight: normal;
-border-bottom: 1px solid #FDFFFF;
-white-space: nowrap;
-}
-td.liste_titre_sel
+tr.liste_titre
{
-background: #7699A9;
-background-image: url();
-background-repeat: repeat-x;
-color: #F5FFFF;
-font-family: ;
-font-weight: normal;
-border-bottom: 1px solid #FDFFFF;
-white-space: nowrap;
+ height: 20px !important;
+ background: #7699A9;
+ background-image: url();
+ background-repeat: repeat-x;
+ color: #334444;
+ font-family: ;
+ border-bottom: 1px solid #FDFFFF;
+ white-space: nowrap;
+}
+th.liste_titre, td.liste_titre
+{
+ background: #7699A9;
+ background-image: url();
+ background-repeat: repeat-x;
+ color: #334444;
+ font-family: ;
+ font-weight: normal;
+ border-bottom: 1px solid #FDFFFF;
+ white-space: nowrap;
+ text-align: ;
+}
+th.liste_titre_sel, td.liste_titre_sel
+{
+ background: #7699A9;
+ background-image: url();
+ background-repeat: repeat-x;
+ color: #F5FFFF;
+ font-family: ;
+ font-weight: normal;
+ border-bottom: 1px solid #FDFFFF;
+ white-space: nowrap;
+ text-align: ;
}
input.liste_titre {
background: #7699A9;
@@ -1292,18 +1296,6 @@ font-weight: normal;
white-space: nowrap;
}
-th {
-/* background: #7699A9; */
-background: #91ABB3;
-color: #334444;
-font-family: ;
-font-weight: bold;
-border-left: 1px solid #FFFFFF;
-border-right: 1px solid #FFFFFF;
-border-top: 1px solid #FFFFFF;
-border-bottom: 1px solid #FFFFFF;
-white-space: nowrap;
-}
.impair {
/* background: #d0d4d7; */
diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php
index 89048687034..4145de0a326 100644
--- a/htdocs/theme/phones/smartphone/theme/default/default.css.php
+++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php
@@ -316,33 +316,37 @@ padding: 0px 0px;
-tr.liste_titre {
-height: 24px;
-background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
-border: 1px solid #456F9A;
-color: #FFFFFF;
-font-family: ;
-/* border-bottom: 1px solid #FDFFFF; */
-white-space: nowrap;
-}
-td.liste_titre {
-background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
-border: 1px solid #456F9A;
-color: #FFFFFF;
-font-family: ;
-font-weight: normal;
-/* border-bottom: 1px solid #FDFFFF; */
-white-space: nowrap;
-}
-td.liste_titre_sel
+tr.liste_titre
{
-background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
-color: #FFFFFF;
-font-family: ;
-font-weight: normal;
-/* text-decoration: underline; */
-/* border-bottom: 1px solid #FDFFFF; */
-white-space: nowrap;
+ height: 24px;
+ background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
+ border: 1px solid #456F9A;
+ color: #FFFFFF;
+ font-family: ;
+ /* border-bottom: 1px solid #FDFFFF; */
+ white-space: nowrap;
+}
+th.liste_titre, td.liste_titre
+{
+ background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
+ border: 1px solid #456F9A;
+ color: #FFFFFF;
+ font-family: ;
+ font-weight: normal;
+ /* border-bottom: 1px solid #FDFFFF; */
+ white-space: nowrap;
+ text-align: ;
+}
+th.liste_titre_sel, td.liste_titre_sel
+{
+ background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
+ color: #FFFFFF;
+ font-family: ;
+ font-weight: normal;
+ /* text-decoration: underline; */
+ /* border-bottom: 1px solid #FDFFFF; */
+ white-space: nowrap;
+ text-align: ;
}
input.liste_titre {
background: transparent;