This commit is contained in:
Laurent Destailleur 2018-03-01 23:51:06 +01:00
parent 0a27855141
commit a3350d12d8
7 changed files with 56 additions and 26 deletions

View File

@ -559,7 +559,7 @@ if ($object->id > 0)
// Lien recap
$boxstat.='<div class="box">';
$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom" width="100%">';
$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop" width="100%">';
$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
if (! empty($conf->propal->enabled))

View File

@ -1921,7 +1921,7 @@ if ($action == 'create')
print '</form>';
} else {
if ($object->date) {
print dol_print_date($object->date, 'daytext');
print dol_print_date($object->date, 'day');
} else {
print '&nbsp;';
}
@ -1947,7 +1947,7 @@ if ($action == 'create')
print '</form>';
} else {
if (! empty($object->fin_validite)) {
print dol_print_date($object->fin_validite, 'daytext');
print dol_print_date($object->fin_validite, 'day');
if ($object->statut == Propal::STATUS_VALIDATED && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay))
print img_warning($langs->trans("Late"));
} else {

View File

@ -60,8 +60,9 @@ $userstatic=new User($db);
?>
<!-- BEGIN PHP TEMPLATE CONTACTS -->
<div class="underbanner clearboth"></div>
<div class="div-table-responsive">
<div class="tagtable centpercent noborder allwidth">
<div class="tagtable centpercent noborder nobordertop allwidth">
<?php
if ($permission) {

View File

@ -314,9 +314,11 @@ if ($object->id > 0)
// Nbre max d'elements des petites listes
$MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
print '<div class="underbanner clearboth"></div>';
// Lien recap
$boxstat.='<div class="box">';
$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom" width="100%">';
$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop" width="100%">';
$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
if ($conf->supplier_proposal->enabled)

View File

@ -332,7 +332,7 @@ $titletoadd=$langs->trans("Select");
$buttonrecord=$langs->trans("RecordMovement");
$titletoaddnoent=$langs->transnoentitiesnoconv("Select");
$buttonrecordnoent=$langs->transnoentitiesnoconv("RecordMovement");
print $langs->trans("SelectProductInAndOutWareHouse",$titletoaddnoent,$buttonrecordnoent).'<br>';
print '<span class="opacitymedium">'.$langs->trans("SelectProductInAndOutWareHouse",$titletoaddnoent,$buttonrecordnoent).'</span><br>';
print '<br>'."\n";
$var=true;
@ -445,14 +445,14 @@ print '<input type="hidden" name="token" value="' .$_SESSION['newtoken'] . '">';
print '<input type="hidden" name="action" value="createmovements">';
// Button to record mass movement
$codemove=(isset($_POST["codemove"])?GETPOST("codemove",'alpha'):dol_print_date(dol_now(),'%y%m%d%H%M%S'));
$codemove=(isset($_POST["codemove"])?GETPOST("codemove",'alpha'):dol_print_date(dol_now(),'%Y%m%d%H%M%S'));
$labelmovement=GETPOST("label")?GETPOST('label'):$langs->trans("StockTransfer").' '.dol_print_date($now,'%Y-%m-%d %H:%M');
print '<table class="border" width="100%">';
print '<table class="noborder" width="100%">';
print '<tr>';
print '<td class="titlefield">'.$langs->trans("InventoryCode").'</td>';
print '<td class="titlefield fieldrequired">'.$langs->trans("InventoryCode").'</td>';
print '<td>';
print '<input type="text" name="codemove" size="10" value="'.dol_escape_htmltag($codemove).'">';
print '<input type="text" name="codemove" size="15" value="'.dol_escape_htmltag($codemove).'">';
print '</td>';
print '</tr>';
print '<tr>';

View File

@ -39,7 +39,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
$colorbackhmenu1='80,90,120'; // topmenu
$colorbackvmenu1='248,248,248'; // vmenu
$colortopbordertitle1='200,200,200'; // top border of title
$colorbacktitle1='230,230,233'; // title of tables,list
$colorbacktitle1='220,220,223'; // title of tables,list
$colorbacktabcard1='255,255,255'; // card
$colorbacktabactive='234,234,234';
$colorbacklineimpair1='255,255,255'; // line impair
@ -768,13 +768,16 @@ select.flat.selectlimit {
.amountpaymentcomplete {
color: #008800;
font-weight: bold;
font-size: 1.4em;
}
.amountremaintopay {
color: #880000;
font-weight: bold;
font-size: 1.4em;
}
.amountremaintopayback {
font-weight: bold;
font-size: 1.4em;
}
.savingdocmask {
margin-top: 6px;
@ -1053,6 +1056,13 @@ select.selectarrowonleft option {
div.statusrefbis {
padding-right: 3px !important;
}
/* TODO
div.statusref {
padding-top: 0px !important;
padding-left: 0px !important;
border: none !important;
}
*/
input.buttonpayment {
min-width: 300px;
@ -1345,7 +1355,7 @@ div.attachareaformuserfileecm {
div.arearef {
padding-top: 2px;
margin-bottom: 10px;
padding-bottom: 7px;
padding-bottom: 10px;
}
div.arearefnobottom {
padding-top: 2px;
@ -1360,6 +1370,12 @@ div.divphotoref {
div.paginationref {
padding-bottom: 10px;
}
/* TODO
div.statusref {
padding: 10px;
border: 1px solid #bbb;
border-radius: 6px;
} */
div.statusref {
float: right;
padding-left: 12px;
@ -1405,11 +1421,12 @@ img.photorefnoborder {
.underrefbanner {
}
.underbanner {
/* border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>); */
border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>);
border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
/* border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>); */
}
.trextrafieldseparator td {
border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>) !important;
/* border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>) !important; */
border-bottom: 2px solid rgb(<?php echo $colortopbordertitle1 ?>) !important;
}
.tdhrthin {
@ -2447,6 +2464,10 @@ table.borderplus {
.border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
height: 22px;
}
tr.liste_titre.box_titre td table td {
height: 22px;
}
div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar .table-val-border-col {
vertical-align: middle;
}
@ -2483,6 +2504,9 @@ td.border, div.tagtable div div.border {
/* Main boxes */
.nobordertop, .nobordertop tr:first-of-type td {
border-top: none !important;
}
.noborderbottom, .noborderbottom tr:last-of-type td {
border-bottom: none !important;
}
@ -2794,7 +2818,7 @@ td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.imp
background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
}
td.evenodd, tr.nohoverpair td {
td.evenodd, tr.nohoverpair td, #trlinefordates td {
background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
}
@ -2946,9 +2970,10 @@ table.tableforservicepart1 tr td {
}
.paymenttable, .margintable {
border-top-width: <?php echo $borderwidth ?>px !important;
/*border-top-width: <?php echo $borderwidth ?>px !important;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>) !important;
border-top-style: solid !important;
border-top-style: solid !important;*/
border-top: none !important;
margin: 0px 0px 0px 0px !important;
}
.paymenttable tr td:first-child, .margintable tr td:first-child
@ -3144,6 +3169,9 @@ span.dashboardlineko {
table.noborder.boxtable tr td {
height: unset;
}
.boxtablenotop {
border-top-width: 0 !important;
}
.boxtablenobottom {
border-bottom-width: 0 !important;
}
@ -3190,9 +3218,6 @@ img.boxhandle, img.boxclose {
padding-left: 5px;
}
.noborderbottom {
border-bottom: none !important;
}
.formboxfilter {
vertical-align: middle;
margin-bottom: 6px;

View File

@ -2509,7 +2509,10 @@ td.border, div.tagtable div div.border {
/* Main boxes */
.noborderbottom {
.nobordertop, .nobordertop tr:first-of-type td {
border-top: none !important;
}
.noborderbottom, .noborderbottom tr:last-of-type td {
border-bottom: none !important;
}
.ficheaddleft table.noborder {
@ -3153,6 +3156,9 @@ span.dashboardlineko {
margin-bottom: 8px !important;
border-bottom-width: 1px;
}
.boxtablenotop {
/* border-top-width: 0 !important; */
}
.boxtablenobottom {
/* border-bottom-width: 0 !important; */
}
@ -3201,10 +3207,6 @@ img.boxhandle, img.boxclose {
padding-left: 5px;
}
.noborderbottom {
border-bottom: none !important;
}
.formboxfilter {
vertical-align: middle;
margin-bottom: 6px;