From a3350d12d8c19d771c74d9b1065a156bad87853a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 1 Mar 2018 23:51:06 +0100 Subject: [PATCH] css --- htdocs/comm/card.php | 2 +- htdocs/comm/propal/card.php | 4 +-- htdocs/core/tpl/contacts.tpl.php | 3 +- htdocs/fourn/card.php | 4 ++- htdocs/product/stock/massstockmove.php | 10 +++--- htdocs/theme/eldy/style.css.php | 47 ++++++++++++++++++++------ htdocs/theme/md/style.css.php | 12 ++++--- 7 files changed, 56 insertions(+), 26 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 4c675b2ca50..fb8154e76ba 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -559,7 +559,7 @@ if ($object->id > 0) // Lien recap $boxstat.='
'; - $boxstat.=''; + $boxstat.='
'; $boxstat.='
'; if (! empty($conf->propal->enabled)) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 9194ec62c49..148f24a7fb5 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1921,7 +1921,7 @@ if ($action == 'create') print ''; } else { if ($object->date) { - print dol_print_date($object->date, 'daytext'); + print dol_print_date($object->date, 'day'); } else { print ' '; } @@ -1947,7 +1947,7 @@ if ($action == 'create') print ''; } 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 { diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index aa392489987..c700f4d6984 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -60,8 +60,9 @@ $userstatic=new User($db); ?> +
-
+
id > 0) // Nbre max d'elements des petites listes $MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT; + print '
'; + // Lien recap $boxstat.='
'; - $boxstat.=''; + $boxstat.='
'; $boxstat.='
'; if ($conf->supplier_proposal->enabled) diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index e6a2b59e700..caea260118f 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -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).'
'; +print ''.$langs->trans("SelectProductInAndOutWareHouse",$titletoaddnoent,$buttonrecordnoent).'
'; print '
'."\n"; $var=true; @@ -445,14 +445,14 @@ print ''; print ''; // 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 ''; +print '
'; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f8ccade235e..dfe54cfa17d 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -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: px solid rgb(); */ - border-bottom: 2px solid rgb(); + border-bottom: px solid rgb(); + /* border-bottom: 2px solid rgb(); */ } .trextrafieldseparator td { - border-bottom: 2px solid rgb() !important; + /* border-bottom: 2px solid rgb() !important; */ + border-bottom: 2px solid rgb() !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: # !important; background: # !important; } -td.evenodd, tr.nohoverpair td { +td.evenodd, tr.nohoverpair td, #trlinefordates td { background-color: # !important; background: # !important; } @@ -2946,9 +2970,10 @@ table.tableforservicepart1 tr td { } .paymenttable, .margintable { - border-top-width: px !important; + /*border-top-width: px !important; border-top-color: rgb() !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; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 9d5fe28b1e9..23ec6a98428 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -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;
'.$langs->trans("InventoryCode").''.$langs->trans("InventoryCode").''; - print ''; + print ''; print '