css
This commit is contained in:
Laurent Destailleur
parent
51963f4c2a
commit
7bcf2c9089
@ -3150,8 +3150,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
|
||||
|
||||
// Define $color
|
||||
$arrayconvpictotocolor = array(
|
||||
'address'=>'#37a', 'building'=>'#37a', 'bom'=>'#a69944',
|
||||
'companies'=>'#37a', 'company'=>'#37a', 'contact'=>'#37a', 'dynamicprice'=>'#a69944',
|
||||
'address'=>'#aaa', 'building'=>'#aaa', 'bom'=>'#a69944',
|
||||
'companies'=>'#aaa', 'company'=>'#aaa', 'contact'=>'#37a', 'dynamicprice'=>'#a69944',
|
||||
'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'help'=>'#bbb', 'listlight'=>'#999',
|
||||
'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944',
|
||||
'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',
|
||||
@ -8473,8 +8473,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
|
||||
|
||||
$tag = (empty($attr['href']) ? 'span' : 'a');
|
||||
|
||||
$button = '';
|
||||
$button .= '<'.$tag.' '.$compiledAttributes.'>';
|
||||
$button = '<'.$tag.' '.$compiledAttributes.'>';
|
||||
$button .= '<span class="'.$iconClass.' valignmiddle btnTitle-icon"></span>';
|
||||
if (!empty($params['forcenohideoftext'])) {
|
||||
$button .= '<span class="valignmiddle text-plus-circle btnTitle-label'.(empty($params['forcenohideoftext']) ? ' hideonsmartphone' : '').'">'.$label.'</span>';
|
||||
|
||||
@ -180,8 +180,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
|
||||
// And now we search all its sons of lower level
|
||||
tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
|
||||
print '</li>';
|
||||
} elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
|
||||
{
|
||||
} elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu']) {
|
||||
//print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
|
||||
if (empty($ulprinted) && !empty($pere['rowid']))
|
||||
{
|
||||
|
||||
@ -813,7 +813,7 @@ class MyObject extends CommonObject
|
||||
}
|
||||
|
||||
/**
|
||||
* Return label of the status
|
||||
* Return the label of the status
|
||||
*
|
||||
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
|
||||
* @return string Label of status
|
||||
|
||||
@ -1665,7 +1665,7 @@ div.fiche>table:first-child {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
div.fiche>table.table-fiche-title {
|
||||
margin-bottom: 7px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
div.fichecenter {
|
||||
width: 100%;
|
||||
@ -3345,10 +3345,10 @@ table.hidepaginationnext .paginationnext {
|
||||
.tabBar .arearef .pagination.paginationref {
|
||||
max-width: calc(30%);
|
||||
}
|
||||
.paginationafterarrows a.btnTitlePlus {
|
||||
.paginationafterarrows a.btnTitlePlus, .titre_right a.btnTitlePlus {
|
||||
border: 1px solid var(--btncolorborder);
|
||||
}
|
||||
.paginationafterarrows a.btnTitlePlus:hover span:before {
|
||||
.paginationafterarrows a.btnTitlePlus:hover span:before, .titre_right a.btnTitlePlus:hover span:before {
|
||||
/* text-shadow: 0px 0px 5px #ccc; */
|
||||
/* filter: invert(0.3); */
|
||||
font-size: 1.07em;
|
||||
@ -4108,7 +4108,7 @@ table.table-fiche-title .col-title div.titre{
|
||||
line-height: 40px;
|
||||
}
|
||||
table.table-fiche-title {
|
||||
margin-bottom: 5px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -284,7 +284,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
|
||||
<?php echo $prefix; ?>color: #599caf !important;
|
||||
}
|
||||
.bg-infobox-contrat, .bg-infobox-ticket{
|
||||
<?php echo $prefix; ?>color: #46a676 !important;
|
||||
<?php echo $prefix; ?>color: #3bbfa8 !important;
|
||||
}
|
||||
.bg-infobox-bank_account{
|
||||
<?php echo $prefix; ?>color: #b0bb39 !important;
|
||||
@ -319,7 +319,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
|
||||
color: #599caf !important;
|
||||
}
|
||||
.infobox-contrat, .infobox-ticket{
|
||||
color: #46a676 !important;
|
||||
color: #3bbfa8 !important;
|
||||
}
|
||||
.infobox-bank_account{
|
||||
color: #b0bb39 !important;
|
||||
|
||||
@ -2392,9 +2392,9 @@ class User extends CommonObject
|
||||
}
|
||||
|
||||
/**
|
||||
* Return label of status of user (active, inactive)
|
||||
* Return the label of the status of user (active, inactive)
|
||||
*
|
||||
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
|
||||
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
|
||||
* @return string Label of status
|
||||
*/
|
||||
public function getLibStatut($mode = 0)
|
||||
@ -2404,7 +2404,7 @@ class User extends CommonObject
|
||||
|
||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
/**
|
||||
* Return label of a status of user (active, inactive)
|
||||
* Return the label of a status of user (active, inactive)
|
||||
*
|
||||
* @param int $status Id status
|
||||
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
|
||||
|
||||
@ -126,11 +126,13 @@ if (!is_array($user_arbo) && $user_arbo < 0)
|
||||
}
|
||||
$li .= ' ('.$val['login'].($entitystring ? ' - '.$entitystring : '').')';
|
||||
|
||||
$entry = '<table class="nobordernopadding centpercent"><tr><td class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$li.'</td><td align="right" class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$userstatic->getLibStatut(2).'</td></tr></table>';
|
||||
|
||||
$data[] = array(
|
||||
'rowid'=>$val['rowid'],
|
||||
'fk_menu'=>$val['fk_user'],
|
||||
'statut'=>$val['statut'],
|
||||
'entry'=>'<table class="nobordernopadding centpercent"><tr><td class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$li.'</td><td align="right" class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$userstatic->getLibStatut(3).'</td></tr></table>'
|
||||
'entry'=>$entry
|
||||
);
|
||||
}
|
||||
|
||||
@ -146,7 +148,9 @@ if (!is_array($user_arbo) && $user_arbo < 0)
|
||||
$newcardbutton .= dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1' : '').'&leftmenu=');
|
||||
}
|
||||
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list paddingleft', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
|
||||
$param = array('morecss'=>'marginleftonly btnTitleSelected');
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $param);
|
||||
|
||||
print load_fiche_titre($title, $morehtmlright.' '.$newcardbutton, 'user');
|
||||
|
||||
@ -186,13 +190,13 @@ if (!is_array($user_arbo) && $user_arbo < 0)
|
||||
|
||||
if ($nbofentries > 0)
|
||||
{
|
||||
print '<tr '.$bc[false].'><td colspan="3">';
|
||||
print '<tr><td colspan="3">';
|
||||
tree_recur($data, $data[0], 0);
|
||||
print '</td>';
|
||||
print '<td></td>';
|
||||
print '</tr>';
|
||||
} else {
|
||||
print '<tr '.$bc[true].'>';
|
||||
print '<tr class="oddeven">';
|
||||
print '<td colspan="3">';
|
||||
print '<table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
|
||||
print '<td valign="middle">';
|
||||
|
||||
@ -195,8 +195,6 @@ $htmlother = new FormOther($db);
|
||||
|
||||
$user2 = new User($db);
|
||||
|
||||
$buttonviewhierarchy = '<form action="'.DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : '').'" method="POST"><input type="submit" class="button" style="width:120px" name="viewcal" value="'.dol_escape_htmltag($langs->trans("HierarchicView")).'"></form>';
|
||||
|
||||
$sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.api_key, u.accountancy_code, u.gender, u.employee, u.photo,";
|
||||
$sql .= " u.datelastlogin, u.datepreviouslogin,";
|
||||
$sql .= " u.ldap_sid, u.statut, u.entity,";
|
||||
@ -318,7 +316,10 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
||||
print '<input type="hidden" name="mode" value="'.$mode.'">';
|
||||
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
|
||||
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-sitemap paddingleft', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
|
||||
$param = array('morecss'=>'btnTitleSelected');
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $param);
|
||||
$param = array('morecss'=>'marginleftonly');
|
||||
$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $param);
|
||||
|
||||
print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'user', 0, $morehtmlright.' '.$newcardbutton, '', $limit, 0, 0, 1);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user