diff --git a/build/debian/README.howto b/build/debian/README.howto
index aa104332584..eba9e651915 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -261,7 +261,8 @@ x.y.z+dfsgw
Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit
-* Add an entry into debian/changelog
+* Fix debian/* files used to build package.
+Add an entry into debian/changelog
> dch -v x.y.z+dfsgw-v "My comment" will add entry.
For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increaed for each new import)
Then modify changelog to replace "version" or "unstable" with "UNRELEASED".
@@ -269,7 +270,7 @@ Then check/modify also the user/date signature:
- Date must have format reported by "date -R"
- Name and email must match value into debian/control file (Entry added here is used by next step).
-* We try to build package
+* Try to build package
> rm -fr ../build-area; git-buildpackage -us -uc
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index f9e5cd99e5d..561e299b937 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -371,7 +371,7 @@ if ($action == 'edit' || $action == 'updateedit')
print '
'.$langs->trans("Logo").' (png,jpg) ';
print '';
print ' ';
- print ' ';
+ print ' ';
if (! empty($mysoc->logo_mini))
{
print ''.img_delete($langs->trans("Delete")).' ';
@@ -756,7 +756,7 @@ else
print '';
print $mysoc->logo;
- print ' ';
+ print ' ';
// On propose la generation de la vignette si elle n'existe pas
if (!is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini) && preg_match('/(\.jpg|\.jpeg|\.png)$/i',$mysoc->logo))
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index c4ef27645d4..8fe870f8cdc 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -64,6 +64,7 @@ $id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
$socid = GETPOST('socid', 'int');
$action = GETPOST('action', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
$origin = GETPOST('origin', 'alpha');
$originid = GETPOST('originid', 'int');
$confirm = GETPOST('confirm', 'alpha');
@@ -113,6 +114,8 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
if (empty($reshook))
{
+ if ($cancel) $action = '';
+
include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once
// Action clone object
@@ -232,7 +235,7 @@ if (empty($reshook))
}
else if ($action == 'setdate_livraison' && $user->rights->propal->creer)
{
- $result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
+ $result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
if ($result < 0)
dol_print_error($db, $object->error);
}
@@ -256,7 +259,7 @@ if (empty($reshook))
$object->fetch_thirdparty();
$datep = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
- $date_delivery = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
+ $date_delivery = dol_mktime(12, 0, 0, GETPOST('date_livraisonmonth'), GETPOST('date_livraisonday'), GETPOST('date_livraisonyear'));
$duration = GETPOST('duree_validite');
if (empty($datep)) {
@@ -1437,9 +1440,9 @@ if ($action == 'create')
$syear = date("Y", $tmpdte);
$smonth = date("m", $tmpdte);
$sday = date("d", $tmpdte);
- $form->select_date($syear."-".$smonth."-".$sday, 'liv_', '', '', '', "addprop");
+ $form->select_date($syear."-".$smonth."-".$sday, 'date_livraison', '', '', '', "addprop");
} else {
- $form->select_date(-1, 'liv_', '', '', '', "addprop", 1, 1);
+ $form->select_date(-1, 'date_livraison', '', '', '', "addprop", 1, 1);
}
print ' ';
@@ -1860,23 +1863,9 @@ if ($action == 'create')
// Delivery date
$langs->load('deliveries');
print '';
- print '';
+ print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->date_livraison, $object, $user->rights->propal->creer);
print ' ';
- if ($action == 'editdate_livraison') {
- print '';
- } else {
- print dol_print_date($object->date_livraison, 'daytext');
- }
+ print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->date_livraison, $object, $user->rights->propal->creer, 'day');
print ' ';
print ' ';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 00eca8b661a..ad11e08c4ca 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -74,7 +74,7 @@ class Form
* Output key field for an editable field
*
* @param string $text Text of label or key to translate
- * @param string $htmlname Name of select field
+ * @param string $htmlname Name of select field ('edit' prefix will be added)
* @param string $preselected Name of Value to show/edit (not used in this function)
* @param object $object Object
* @param boolean $perm Permission to allow button to edit parameter
@@ -167,11 +167,11 @@ class Form
}
else if ($typeofdata == 'day' || $typeofdata == 'datepicker')
{
- $ret.=$this->form_date($_SERVER['PHP_SELF'].'?id='.$object->id,$value,$htmlname);
+ $ret.=$this->select_date($value,$htmlname,0,0,1,'form'.$htmlname,1,0,1);
}
- else if ($typeofdata == 'datehourpicker')
+ else if ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
{
- $ret.=$this->form_date($_SERVER['PHP_SELF'].'?id='.$object->id,$value,$htmlname,1,1);
+ $ret.=$this->select_date($value,$htmlname,1,1,1,'form'.$htmlname,1,0,1);
}
else if (preg_match('/^select;/',$typeofdata))
{
@@ -191,14 +191,14 @@ class Form
$ret.=$doleditor->Create(1);
}
$ret.='';
- if ($typeofdata != 'day' && $typeofdata != 'datepicker' && $typeofdata != 'datehourpicker')
- {
+ //if ($typeofdata != 'day' && $typeofdata != 'dayhour' && $typeofdata != 'datepicker' && $typeofdata != 'datehourpicker')
+ //{
$ret.='';
$ret.=' ';
if (preg_match('/ckeditor|textarea/',$typeofdata)) $ret.=' '."\n";
$ret.=' ';
$ret.=' ';
- }
+ //}
$ret.='
'."\n";
$ret.=''."\n";
}
@@ -208,7 +208,7 @@ class Form
elseif ($typeofdata == 'amount') $ret.=($value != '' ? price($value,'',$langs,0,-1,-1,$conf->currency) : '');
elseif (preg_match('/^text/',$typeofdata) || preg_match('/^note/',$typeofdata)) $ret.=dol_htmlentitiesbr($value);
elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret.=dol_print_date($value,'day');
- elseif ($typeofdata == 'datehourpicker') $ret.=dol_print_date($value,'dayhour');
+ elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret.=dol_print_date($value,'dayhour');
else if (preg_match('/^select;/',$typeofdata))
{
$arraydata=explode(',',preg_replace('/^select;/','',$typeofdata));
@@ -1332,7 +1332,7 @@ class Form
$nodatarole=($comboenhancement?' data-role="none"':'');
}
- $out.= '';
+ $out.= '';
if ($show_empty) $out.= ' '."\n";
if ($show_every) $out.= '-- '.$langs->trans("Everybody").' -- '."\n";
@@ -3475,32 +3475,32 @@ class Form
* @return void
* @see select_date
*/
- function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0)
+ function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0, $noouput=0)
{
global $langs;
+ $ret='';
+
if ($htmlname != "none")
{
- print '';
+ $ret.='';
}
else
{
- if ($selected)
- {
- $this->load_cache_types_paiements();
- print $this->cache_types_paiements[$selected]['label'];
- } else {
- print " ";
- }
+ if ($displayhour) $ret.=dol_print_date($selected,'dayhour');
+ else $ret.=dol_print_date($selected,'day');
}
+
+ if (empty($noouput)) print $ret;
+ return $ret;
}
@@ -4776,7 +4776,7 @@ class Form
$nodatarole=($comboenhancement?' data-role="none"':'');
}
- $out.= '';
+ $out.= '';
$num = $this->db->num_rows($resql);
$i = 0;
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 38e783765f9..8013896d7bd 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -64,16 +64,16 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print '';
if (! empty($conf->browser->phone)) print '
';
- else print '
';
+ else print '';
print '';
if ($canedit)
{
print '';
- print '';
+ print ' ';
print $langs->trans("ActionsToDoBy").' ';
- print ' ';
+ print ' ';
print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit);
if (empty($conf->dol_optimize_smallscreen)) print ' '.$langs->trans("or") . ' '.$langs->trans("Group").' ';
print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
@@ -83,16 +83,16 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
$formactions=new FormActions($db);
print ' ';
- print '';
+ print ' ';
print $langs->trans("Type");
- print ' ';
+ print ' ';
print $formactions->select_type_actions($actioncode, "actioncode", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0));
print ' ';
print '';
- print '';
+ print ' ';
print $langs->trans("Status");
- print ' ';
+ print ' ';
$formactions->form_select_status_action('formaction',$status,1,'status',1,2);
print ' ';
}
@@ -100,7 +100,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
{
print '';
- print '';
+ print ' ';
print $langs->trans("ThirdParty").' ';
print ' ';
print $form->select_thirdparty($socid, 'socid');
@@ -124,7 +124,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
{
// Filter on hours
print ' ';
- print ''.$langs->trans("WorkingTimeRange").' ';
+ print ''.$langs->trans("WorkingTimeRange").' ';
print "";
print ' ';
if (empty($conf->dol_use_jmobile)) print ' - ';
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index 967a8906157..faf94a352fa 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -51,7 +51,7 @@ MemberIsInCategories=This member owns to following members tags/categories
ContactIsInCategories=This contact owns to following contacts tags/categories
ProductHasNoCategory=This product/service is not in any tags/categories
SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
MemberHasNoCategory=This member is not in any tags/categories
ContactHasNoCategory=This contact is not in any tags/categories
ClassifyInCategory=Classify in tag/category
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
CatCusList=List of customer/prospect tags/categories
CatProdList=List of products tags/categories
CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
CatSupLinks=Links between suppliers and tags/categories
CatCusLinks=Links between customers/prospects and tags/categories
CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index a73526ca08a..9c3a956727e 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -51,7 +51,7 @@ MemberIsInCategories=This member is linked to following members tags/categories
ContactIsInCategories=This contact is linked to following contacts tags/categories
ProductHasNoCategory=This product/service is not in any tags/categories
SupplierHasNoCategory=This supplier is not in any tags/categories
-CompanyHasNoCategory=This company is not in any tags/categories
+CompanyHasNoCategory=This thirdparty is not in any tags/categories
MemberHasNoCategory=This member is not in any tags/categories
ContactHasNoCategory=This contact is not in any tags/categories
ClassifyInCategory=Add to tag/category
@@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
CatCusList=List of customer/prospect tags/categories
CatProdList=List of products tags/categories
CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories and contact
+CatContactList=List of contact tags/categories
CatSupLinks=Links between suppliers and tags/categories
CatCusLinks=Links between customers/prospects and tags/categories
CatProdLinks=Links between products/services and tags/categories
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index d5a4b0b3722..496aeef731f 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -97,7 +97,7 @@ $colorbackvmenu1b=($colred+5).','.($colgreen+6).','.($colblue+7); // vmen
$colorbackvmenu2=($colred-15).','.($colgreen-15).','.($colblue-15);
$colorbacktitle1=($colred-5).','.($colgreen-5).','.($colblue-5); // title of array
$colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15);
-$colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17); // card
+$colorbacktabcard1='255,255,255'; // card
$colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15);
$colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15);
$colorbacklineimpair1='255,255,255'; // line impair
@@ -106,7 +106,7 @@ $colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+roun
$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line pair
$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line pair
$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line pair
-$colorbackbody='#f9f9f9';
+$colorbackbody='#f3f3f3';
$colortext='40,40,40';
$fontsize='12';
$fontsizesmaller='11';
@@ -121,10 +121,10 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240';
$conf->global->THEME_ELDY_BACKTITLE1='140,160,185'; // title of arrays
$conf->global->THEME_ELDY_BACKTITLE2='230,230,230';
+ $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';
$conf->global->THEME_ELDY_BACKTABCARD2='210,210,210'; // card
- $conf->global->THEME_ELDY_BACKTABCARD1='234,234,234';
$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
- $conf->global->THEME_ELDY_BACKBODY='#f9f9f9;';
+ $conf->global->THEME_ELDY_BACKBODY='#f3f3f3;';
$conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
$conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
$conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252';
@@ -168,10 +168,6 @@ if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->
$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2));
-// Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
-$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
-$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2));
-
// Set text color to black or white
$tmppart=explode(',',$colorbackhmenu1);
$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
@@ -188,7 +184,7 @@ else { $colortexttitle='444'; $colorshadowtitle='FFF'; }
$tmppart=explode(',',$colorbacktabcard1);
$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
if ($tmpval <= 340) { $colortextbacktab='FFF'; }
-else { $colortextbacktab='444'; }
+else { $colortextbacktab='111'; }
$usecss3=true;
@@ -552,6 +548,7 @@ margin : 0px auto;
#pictotitle {
margin-right: 8px;
+ margin-bottom: 4px;
}
@@ -1010,7 +1007,7 @@ div.vmenu, td.vmenu {
}
-.menu_contenu { padding-top: 1px; }
+.menu_contenu { padding-top: 3px; padding-top: 2px; }
#menu_contenu_logo { padding-right: 4px; }
a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:px; font-family: ; text-align: ; font-weight: bold; }
@@ -1407,11 +1404,12 @@ div.tabBar {
-moz-border-radius:6px;
-webkit-border-radius: 6px;
border-radius: 6px;
- border-right: 1px solid #BBB;
- border-bottom: 1px solid #BBB;
- border-left: 1px solid #BBB;
- border-top: 1px solid #CCC;
+ border-right: 1px solid #AAA;
+ border-bottom: 1px solid #AAA;
+ border-left: 1px solid #AAA;
+ border-top: 1px solid #BBB;
width: auto;
+/*
background-image: -o-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%);
background-image: -moz-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%);
@@ -1421,6 +1419,8 @@ div.tabBar {
background: rgb();
+*/
+ background: rgb();
-moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD;
@@ -1452,7 +1452,6 @@ a.tabTitle {
a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
font-family: ;
padding: 5px 12px 5px;
- /* padding: 3px 6px 2px 6px;*/
margin: 0em 0.2em;
text-decoration: none;
white-space: nowrap;
@@ -1461,15 +1460,19 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
-webkit-border-radius:6px 6px 0px 0px;
border-radius:6px 6px 0px 0px;
+/*
-moz-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
-webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
box-shadow: 0 -1px 4px rgba(0,0,0,.1);
+*/
border-bottom: none;
+/*
border-right: 1px solid #BBB;
border-left: 1px solid #BBB;
border-top: 1px solid #CCC;
-
+*/
+/*
background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%);
background-image: -moz-linear-gradient(bottom, rgb() 35%, rgb() 100%);
@@ -1478,28 +1481,40 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%);
background-image: none !important;
+*/
+ background: rgb();
+
+ border-right: 1px solid #BBB;
+ border-left: 1px solid #BBB;
+ border-top: 1px solid #CCC;
+ margin: 0 0.2em 0 0.2em !important;
+ color: #444;
}
.tabactive {
+/*
-/* border-bottom: 1px solid rgb() !important; */
background: rgba(, 0.5) url() 50% 0 repeat-x;
background: rgb() url() 50% 0 repeat-x;
+*/
/*background-image: none !important; */
- color: #;
+ color: # !important;
+ background: rgb() !important;
+ -moz-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
+ -webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
+ box-shadow: 0 -1px 4px rgba(0,0,0,.1);
+ margin-bottom: 0 0.2em 0 0.2em !important;
+ border-right: 1px solid #AAA !important;
+ border-left: 1px solid #AAA !important;
+ border-top: 1px solid #BBB !important;
}
a.tab:hover
{
background: rgba(, 0.5) url() 50% 0 repeat-x;
color: #;
}
-a.tab:link, a.tab:visited
-{
- /* color: #888; */
- /* font-weight: normal !important; */
-}
a.tabimage {
color: #434956;
font-family: ;
@@ -1693,6 +1708,10 @@ End bootstrap */
margin: 0px !important;
padding: 0px !important;
}
+tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
+{
+ border: 0px;
+}
.notopnoleft {
border-collapse: collapse;
@@ -1720,6 +1739,13 @@ table.border, table.dataTable, .table-border, .table-border-col, .table-key-bord
padding: 1px 2px 1px 3px; /* t r b l */
}
+.border tbody tr, .border tbody tr td {
+ height: 20px;
+}
+div.tabBar table.border tr {
+ height: 20px;
+}
+
table.border td, div.border div div.tagtd {
padding: 2px 2px 2px 2px;
border: 1px solid #D0D0D0;
@@ -1753,11 +1779,6 @@ table.noborder, table.formdoc, div.noborder {
border-right-color: #CCC;
border-right-style: solid;
-/*
- border-bottom-width: 1px;
- border-bottom-color: #BBBBBB;
- border-bottom-style: solid;
-*/
border-left-width: 1px;
border-left-color: #CCC;
border-left-style: solid;
@@ -1798,10 +1819,21 @@ table.nobordernopadding tr {
border: 0px !important;
padding: 0px 0px !important;
}
-table.nobordernopadding td {
- border: 0px !important;
- padding: 0px 0px !important;
+table.nobordernopadding tr td {
+ border: 0px;
+ padding: 0 3px 0 0 !important;
}
+table.border tr td table.nobordernopadding tr td {
+ padding-top: 0px;
+ padding-bottom: 0px;
+}
+td.borderright {
+ border: none; /* to erase value for table.nobordernopadding td */
+ border-right-width: 1px !important;
+ border-right-color: #BBB !important;
+ border-right-style: solid !important;
+}
+
/* For lists */
@@ -1921,10 +1953,13 @@ table.liste td {
background-color: #f9f9f9;
}
-tr.pair td, tr.impair td {
+tr.pair td, tr.impair td, form.impair div.tagtd, form.pair div.tagtd {
padding: 5px 2px;
border-bottom: 1px solid #ddd;
}
+tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td {
+ border-bottom: 0px !important;
+}
div.liste_titre .tagtd {
vertical-align: middle;
}
@@ -1952,11 +1987,14 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list
border-bottom: 1px solid #FDFFFF;
text-align: ;
}
+tr.liste_titre th, th.liste_titre, form.liste_titre div, div.liste_titre
+{
+ border-bottom: 1px solid #FDFFFF;
+}
tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div, div.liste_titre
{
font-family: ;
font-weight: bold;
- border-bottom: 1px solid #FDFFFF;
text-shadow: 1px 0px 1px #;
vertical-align: middle;
}