Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix position of GPAO must be after Product.

Browse Source 
CSS
This commit is contained in:
Laurent Destailleur
2020-09-15 02:41:08 +02:00
parent bd577e253a
commit b7b1de4580
5 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/lib/functions.lib.php
View File

@@ -8406,16 +8406,20 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
$class = 'btnTitle'; $class = 'btnTitle';
if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus'; if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus';
$useclassfortooltip = 1;
if (!empty($params['morecss'])) $class .= ' '.$params['morecss']; if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];
$attr = array( $attr = array(
'class' => $class 'class' => $class,
,'href' => empty($url) ? '' : $url 'href' => empty($url) ? '' : $url
); );
if (!empty($helpText)) { if (!empty($helpText)) {
$attr['title'] = dol_escape_htmltag($helpText); $attr['title'] = dol_escape_htmltag($helpText);
} elseif (empty($attr['title']) && $label) {
$attr['title'] = $label;
$useclassfortooltip = 0;
} }
if ($status <= 0) { if ($status <= 0) {
@@ -8430,7 +8434,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
} }
} }
if (!empty($attr['title'])) { if (!empty($attr['title']) && $useclassfortooltip) {
$attr['class'] .= ' classfortooltip'; $attr['class'] .= ' classfortooltip';
} }
@@ -8472,7 +8476,9 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
$button = ''; $button = '';
$button .= '<'.$tag.' '.$compiledAttributes.'>'; $button .= '<'.$tag.' '.$compiledAttributes.'>';
$button .= '<span class="'.$iconClass.' valignmiddle btnTitle-icon"></span>'; $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>'; $button .= '<span class="valignmiddle text-plus-circle btnTitle-label'.(empty($params['forcenohideoftext']) ? ' hideonsmartphone' : '').'">'.$label.'</span>';
}
$button .= '</'.$tag.'>'; $button .= '</'.$tag.'>';
return $button; return $button;

6
htdocs/core/menus/standard/eldy.lib.php
View File

@@ -171,7 +171,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
'submenus' => array(), 'submenus' => array(),
); );
// MRP // MRP - GPAO
$tmpentry = array( $tmpentry = array(
'enabled'=>(!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)), 'enabled'=>(!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)),
'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)), 'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)),
@@ -186,7 +186,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
'target' => $atarget, 'target' => $atarget,
'mainmenu' => "mrp", 'mainmenu' => "mrp",
'leftmenu' => '', 'leftmenu' => '',
'position' => 30, 'position' => 31,
'id' => $id, 'id' => $id,
'idsel' => 'mrp', 'idsel' => 'mrp',
'classname' => $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"', 'classname' => $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"',
@@ -1659,7 +1659,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
} }
/* /*
* Menu PRODUCTS-SERVICES MRP * Menu PRODUCTS-SERVICES MRP - GPAO
*/ */
if ($mainmenu == 'mrp') if ($mainmenu == 'mrp')
{ {

2
htdocs/product/list.php
View File

@@ -593,7 +593,7 @@ if ($resql)
$categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 1); $categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 1);
$categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -'; $categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -';
$moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300'); $moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300');
$moreforfilter .= ' <input type="checkbox" class="valignmiddle" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/> '.$langs->trans('UseOrOperatorForCategories'); $moreforfilter .= ' <input type="checkbox" class="valignmiddle" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/> <span class="opacitymedium">'.$langs->trans('UseOrOperatorForCategories').'</span>';
$moreforfilter .= '</div>'; $moreforfilter .= '</div>';
} }

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

@@ -3338,6 +3338,14 @@ table.hidepaginationnext .paginationnext {
.tabBar .arearef .pagination.paginationref { .tabBar .arearef .pagination.paginationref {
max-width: calc(30%); max-width: calc(30%);
} }
.paginationafterarrows a.btnTitlePlus {
border: 1px solid var(--btncolorborder);
}
.paginationafterarrows a.btnTitlePlus:hover span:before {
/* text-shadow: 0px 0px 5px #ccc; */
/* filter: invert(0.3); */
font-size: 1.07em;
}
/* Set the color for hover lines */ /* Set the color for hover lines */

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

@@ -3271,6 +3271,14 @@ table.hidepaginationprevious .paginationprevious {
table.hidepaginationnext .paginationnext { table.hidepaginationnext .paginationnext {
display: none; display: none;
} }
.paginationafterarrows a.btnTitlePlus {
border: 1px solid var(--btncolorborder);
}
.paginationafterarrows a.btnTitlePlus:hover span:before {
/* text-shadow: 0px 0px 5px #ccc; */
/* filter: invert(0.3); */
font-size: 1.03em;
}
/* Prepare to remove class pair - impair /* Prepare to remove class pair - impair