This commit is contained in:
Laurent Destailleur 2020-05-25 10:58:18 +02:00
parent 0041bca82f
commit c67eeeaf6c
4 changed files with 25 additions and 12 deletions

View File

@ -89,6 +89,8 @@ if ($mode == 'sconly') $param = '&mode=sconly';
if ($sortfield) $param .= '&sortfield='.$sortfield;
if ($sortorder) $param .= '&sortorder='.$sortorder;
$totalnboflines = 0;
$num = 0;
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@ -99,14 +101,15 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="page" value="'.$page.'">';
print '<input type="hidden" name="mode" value="'.$mode.'">';
$nav = '';
if ($mode != 'sconly')
{
$center = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'object_payment', 0, '', '', $limit, 1);
$nav = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 1);
}
else
{
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'object_payment', 0, '', '', $limit, 0);
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 0);
}
if ($year) $param .= '&year='.$year;

View File

@ -20,6 +20,7 @@
--colorbacklinebreak: rgb(<?php print $colorbacklinebreak; ?>);
--colorbackbody: rgb(<?php print $colorbackbody; ?>);
--colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
--colortexttitlenotab2: rgb(<?php print $colortexttitlenotab2; ?>);
--colortexttitle: rgb(<?php print $colortexttitle; ?>);
--colortext: rgb(<?php print $colortext; ?>);
--colortextlink: rgb(<?php print $colortextlink; ?>);
@ -31,7 +32,7 @@
--tooltipbgcolor: <?php print $toolTipBgColor; ?>;
--tooltipfontcolor : <?php print $toolTipFontColor; ?>;
--oddevencolor: #202020;
--colorboxstatsborder: #ddd;
--colorboxstatsborder: #e0e0e0;
--dolgraphbg: rgba(255,255,255,0);
--fieldrequiredcolor: #000055;
--colortextbacktab: #<?php print $colortextbacktab; ?>;
@ -62,6 +63,7 @@ if (!empty($conf->global->MAIN_THEME_DARKMODEENABLED)) {
--colorbackbody: #1d1e20;
--tooltipbgcolor: #2b2d2f;
--colortexttitlenotab: rgb(220,220,220);
--colortexttitlenotab2: rgb(220,220,220);
--colortexttitle: rgb(220,220,220);
--colortext: rgb(220,220,220);
--colortextlink: #4390dc;
@ -2688,7 +2690,7 @@ div.tabBar.tabBarNoTop {
/* tabBar used for creation/update/send forms */
div.tabBarWithBottom {
padding-bottom: 18px;
border-bottom: 1px solid #aaa;
border-bottom: 1px solid #bbb;
}
div.tabBarWithBottom tr {
background: unset !important;
@ -3588,7 +3590,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
background: var(--colorbackbody);
border: 1px solid var(--colorboxstatsborder);
border-left: 6px solid var(--colorboxstatsborder);
box-shadow: 1px 1px 8px var(--colorboxstatsborder);
/* box-shadow: 1px 1px 8px var(--colorboxstatsborder); */
border-radius: 0px;
}
.boxstats, .boxstats130, .boxstatscontent {
@ -3981,9 +3983,14 @@ div.titre {
padding-top: 5px;
padding-bottom: 5px;
}
div.titre, .secondary {
font-family: <?php print $fontlist ?>;
color: var(--colortexttitlenotab);
.secondary, div.titre {
color: var(--colortexttitlenotab);
}
.tertiary {
color: var(--colortexttitlenotab2);
}
table.table-fiche-title:first-of-type div {
color: var(--colortexttitlenotab);
}
table.table-fiche-title .col-title div.titre{

View File

@ -67,7 +67,8 @@ $colorbacklinepairhover = '230,237,244'; // line hover
$colorbacklinepairchecked = '230,237,244'; // line checked
$colorbacklinebreak = '248,247,244'; // line break
$colorbackbody = '255,255,255';
$colortexttitlenotab = '0,113,120'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,113,120, violet: 0,50,120
$colortexttitlenotab = '0,123,140'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,113,120, violet: 0,50,120
$colortexttitlenotab2 = '100,0,100'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,113,120, violet: 0,50,120
$colortexttitle = '0,0,0';
$colortexttitlelink = '10, 20, 100';
$colortext = '0,0,0';

View File

@ -3921,8 +3921,10 @@ div.titre {
/* text-shadow: 1px 1px 2px #FFFFFF; */
<?php print (empty($conf->dol_optimize_smallscreen) ? '' : 'margin-top: 4px;'); ?>
}
div.titre, .secondary {
font-family: <?php print $fontlist ?>;
.secondary, div.titre {
color: var(--colortexttitlenotab);
}
.tertiary {
color: var(--colortexttitlenotab);
}