Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

css

Browse Source
This commit is contained in:
Laurent Destailleur 2021-11-25 10:28:37 +01:00
parent b3e9e5c462
commit 0c54723185
6 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/admin/modules.php
View File

@ -303,7 +303,7 @@ llxHeader('', $langs->trans("Setup"), $help_url, '', '', '', $morejs, $morecss,
// Search modules dirs
$modulesdir = dolGetModulesDirs();
$arrayofnatures = array('core'=>$langs->transnoentitiesnoconv("Core"), 'external'=>$langs->transnoentitiesnoconv("External").' - ['.$langs->trans("AllPublishers").']');
$arrayofnatures = array('core'=>$langs->transnoentitiesnoconv("NativeModules"), 'external'=>$langs->transnoentitiesnoconv("External").' - ['.$langs->trans("AllPublishers").']');
$arrayofwarnings = array(); // Array of warning each module want to show when activated
$arrayofwarningsext = array(); // Array of warning each module want to show when we activate an external module
$filename = array();
@ -564,7 +564,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
$moreforfilter .= '<div class="divsearchfield">';
$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
$moreforfilter .= ' ';
$moreforfilter .= '<input type="submit" name="buttonreset" class="butActionDelete noborderbottom" value="'.dol_escape_htmltag($langs->trans("Reset")).'">';
$moreforfilter .= '<input type="submit" name="buttonreset" class="buttonreset butActionDelete noborderbottom" value="'.dol_escape_htmltag($langs->trans("Reset")).'">';
$moreforfilter .= '</div>';
$moreforfilter .= '</div>';
@ -597,6 +597,9 @@ if ($mode == 'common' || $mode == 'commonkanban') {
$oldfamily = '';
$foundoneexternalmodulewithupdate = 0;
$linenum = 0;
$atleastonequalified = 0;
$atleastoneforfamily = 0;
foreach ($orders as $key => $value) {
$linenum++;
$tab = explode('_', $value);
@ -685,7 +688,9 @@ if ($mode == 'common' || $mode == 'commonkanban') {
}
}
// Load all lang files of module
$atleastonequalified++;
// Load all language files of the qualified module
if (isset($objMod->langfiles) && is_array($objMod->langfiles)) {
foreach ($objMod->langfiles as $domain) {
$langs->load($domain);
@ -972,6 +977,10 @@ if ($mode == 'common' || $mode == 'commonkanban') {
}
}
if (!$atleastonequalified) {
print '<br><span class="opacitymedium">'.$langs->trans("NoDeployedModulesFoundWithThisSearchCriteria").'</span><br><br>';
}
print dol_get_fiche_end();
print '<br>';

2
htdocs/langs/en_US/admin.lang
View File

@ -2211,3 +2211,5 @@ IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, yo
IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
PDF_USE_1A=Generate PDF with PDF/A-1b format
MissingTranslationForConfKey = Missing translation for %s
NativeModules=Native modules
NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria

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

@ -505,7 +505,8 @@ div#moretabsList, div#moretabsListaction {
hr { border: 0; border-top: 1px solid #ccc; }
.tabBar hr { margin-top: 20px; margin-bottom: 17px; }
.button:not(.bordertransp):not(.buttonpayment), .buttonDelete:not(.bordertransp):not(.buttonpayment) {
.button:not(.bordertransp):not(.buttonpayment),
.buttonDelete:not(.bordertransp):not(.buttonpayment) {
margin-bottom: 3px;
margin-top: 3px;
margin-left: 5px;
@ -3297,9 +3298,14 @@ input.button[name="upload"] {
padding: 5px !important;
font-size: 0.9em;
}
input.button.smallpaddingimp {
input.button.smallpaddingimp, input.buttonreset.smallpaddingimp {
font-size: 0.8em;
}
input.buttonreset {
margin-top: 3px;
margin-bottom: 3px;
padding: 8px 15px;
}
.nopaddingleft {
padding-<?php print $left; ?>: 0px;
}

5
htdocs/theme/md/btn.inc.php
View File

@ -44,10 +44,6 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
/* ============================================================================== */
/*div.divButAction {
margin-bottom: 1.4em;
}*/
div.tabsAction > a.butAction, div.tabsAction > a.butActionRefused, div.tabsAction > a.butActionDelete,
div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete,
div.tabsAction > div.divButAction > span.butAction,
@ -82,6 +78,7 @@ span.butAction, span.butActionDelete {
text-decoration: none;
text-transform: uppercase;
font-weight: bold;
line-height: 1.8em;
margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.9'); ?>em;
padding: 0.6em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.7'); ?>em;

20
htdocs/theme/md/style.css.php
View File

@ -438,6 +438,24 @@ input, select {
margin-bottom:1px;
margin-top:1px;
}
#mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
background: var(--butactionbg);
color: #FFF !important;
border-radius: 3px;
border-collapse: collapse;
border: none;
text-shadow: none;
text-transform: uppercase;
font-weight: bold;
margin: 0em 0.9em;
padding: 0.6em 0.7em;
line-height: 17px;
}
#mainbody input.button:not(.buttongen):not(.bordertransp):hover, #mainbody a.button:not(.buttongen):not(.bordertransp):hover {
-webkit-box-shadow: 0px 0px 6px 1px rgb(50 50 50 / 40%), 0px 0px 0px rgb(60 60 60 / 10%);
box-shadow: 0px 0px 6px 1px rgb(50 50 50 / 40%), 0px 0px 0px rgb(60 60 60 / 10%);
}
input.button.massactionconfirmed {
margin: 4px;
}
@ -4366,7 +4384,7 @@ div.boximport {
.fieldrequired { font-weight: bold; color: #000055; }
.widthpictotitle { width: 40px; font-size: 1.4em; text-align: <?php echo $left; ?>; }
.widthpictotitle { width: 32px; font-size: 1.4em; text-align: <?php echo $left; ?>; }
table.titlemodulehelp tr td img.widthpictotitle { width: 80px; }
.dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }

8
htdocs/user/card.php
View File

@ -370,8 +370,7 @@ if (empty($reshook)) {
}
if ($result > 0) {
header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
exit;
$action = '';
} else {
setEventMessages($object->error, $object->errors, 'errors');
}
@ -1946,6 +1945,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
print '<input type="hidden" name="token" value="'.newToken().'" />';
print '<input type="hidden" name="action" value="addgroup" />';
print '<input type="hidden" name="page_y" value="" />';
}
print '<table class="noborder centpercent">'."\n";
@ -1955,7 +1955,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
print ' &nbsp; ';
print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
print '<input type="submit" class="button buttongen button-add" value="'.$langs->trans("Add").'" />';
print '<input type="submit" class="button buttongen button-add reposition" value="'.$langs->trans("Add").'" />';
}
print '</th></tr>'."\n";
@ -1972,7 +1972,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print '</td>';
print '<td class="right">';
if ($caneditgroup) {
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=removegroup&token='.newToken().'&group='.((int) $group->id).'">';
print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
print '</a>';
} else {