lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look and feel v16

Browse Source
This commit is contained in:
Laurent Destailleur 2022-05-06 14:13:04 +02:00
parent bb6f73136a
commit a57312d09c
5 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/barcode/codeinit.php
View File

@ -286,7 +286,7 @@ if ($conf->product->enabled || $conf->product->service) {
print '<input type="submit" class="button" name="submitformbarcodeproductgen" id="submitformbarcodeproductgen" value="'.$langs->trans("InitEmptyBarCode", min($maxperinit, $nbno)).'"'.$moretags1.'>'; print '<input type="submit" class="button" name="submitformbarcodeproductgen" id="submitformbarcodeproductgen" value="'.$langs->trans("InitEmptyBarCode", min($maxperinit, $nbno)).'"'.$moretags1.'>';
$moretags2 = (($nbno == $nbtotal) ? ' disabled' : ''); $moretags2 = (($nbno == $nbtotal) ? ' disabled' : '');
print ' &nbsp; '; print ' &nbsp; ';
print '<input type="submit" class="button" name="eraseallbarcode" id="eraseallbarcode" value="'.$langs->trans("EraseAllCurrentBarCode").'"'.$moretags2.' onClick="return confirm_erase();">'; print '<input type="submit" class="button butActionDelete" name="eraseallbarcode" id="eraseallbarcode" value="'.$langs->trans("EraseAllCurrentBarCode").'"'.$moretags2.' onClick="return confirm_erase();">';
print '<br><br><br><br>'; print '<br><br><br><br>';
} }

29
htdocs/core/boxes/box_members_by_type.php
View File

@ -173,27 +173,34 @@ class box_members_by_type extends ModeleBoxes
$line = 0; $line = 0;
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class=""', 'td' => 'class=""',
'text' => $langs->trans("MembersTypes"), 'text' => '',
); );
$labelstatus = $staticmember->LibStatut($staticmember::STATUS_DRAFT, 0, 0, 1);
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="right"', 'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
'text' => $langs->trans("MembersStatusToValid"), // Draft 'text' => $labelstatus
); );
$labelstatus = $langs->trans("UpToDate");
$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, dol_now() + 86400, 1);
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="right"', 'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
'text' => $langs->trans("UpToDate"), 'text' => $labelstatus,
); );
$labelstatus = $langs->trans("OutOfDate");
$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, dol_now() - 86400, 1);
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="right"', 'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
'text' => $langs->trans("OutOfDate"), 'text' => $labelstatus
); );
$labelstatus = $staticmember->LibStatut($staticmember::STATUS_EXCLUDED, 0, 0, 1);
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="right"', 'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
'text' => $langs->trans("MembersStatusExcluded"), 'text' => $labelstatus
); );
$labelstatus = $staticmember->LibStatut($staticmember::STATUS_RESILIATED, 0, 0, 1);
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="right"', 'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
'text' => $langs->trans("MembersStatusResiliated"), 'text' => $labelstatus
); );
$line++; $line++;
foreach ($AdherentType as $key => $adhtype) { foreach ($AdherentType as $key => $adhtype) {

4
htdocs/core/boxes/modules_boxes.php
View File

@ -222,7 +222,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
// Show box title // Show box title
if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto'])) { if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto'])) {
$out .= '<tr class="liste_titre box_titre">'; $out .= '<tr class="liste_titre box_titre">';
$out .= '<td'; $out .= '<th';
if ($nbcol > 0) { if ($nbcol > 0) {
$out .= ' colspan="'.$nbcol.'"'; $out .= ' colspan="'.$nbcol.'"';
} }
@ -268,7 +268,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
$out .= '</div>'; $out .= '</div>';
} }
$out .= "</td>"; $out .= "</th>";
$out .= "</tr>\n"; $out .= "</tr>\n";
} }

4
htdocs/theme/eldy/btn.inc.php
View File

@ -147,9 +147,9 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
} }
.butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete { .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete {
background: var(--butactiondeletebg); background: var(--butactiondeletebg) !important;
/* border: 1px solid #633; */ /* border: 1px solid #633; */
color: #633; color: #633 !important;
} }
.butActionDelete:hover { .butActionDelete:hover {

8
htdocs/theme/eldy/global.inc.php
View File

@ -240,7 +240,7 @@ input, select {
} }
#mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) { #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
background: var(--butactionbg); background: var(--butactionbg);
color: var(--textbutaction)!important; color: var(--textbutaction);
border-radius: 3px; border-radius: 3px;
border-collapse: collapse; border-collapse: collapse;
border: none; border: none;
@ -3811,12 +3811,6 @@ div.pagination {
div.pagination a { div.pagination a {
font-weight: normal; font-weight: normal;
} }
/*div.pagination a.butAction, div.fichehalfright a.butAction {
margin-right: 0px !important;
}
div.tabsAction a.butActionDelete:last-child, div.tabsAction a.butAction:last-child {
margin-right: 0px !important;
}*/
div.pagination ul div.pagination ul
{ {
list-style: none; list-style: none;