FIX etrafield with visibilty=5 were not in read only
FIX CSS FIX option for topbar search and bookmarks
This commit is contained in:
parent
b8171cacb1
commit
a3fce650d9
@ -73,7 +73,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
|
|||||||
//print $key.'-'.$enabled.'-'.$perms.'-'.$label.$_POST["options_" . $key].'<br>'."\n";
|
//print $key.'-'.$enabled.'-'.$perms.'-'.$label.$_POST["options_" . $key].'<br>'."\n";
|
||||||
|
|
||||||
if (empty($enabled)) continue; // 0 = Never visible field
|
if (empty($enabled)) continue; // 0 = Never visible field
|
||||||
if (abs($enabled) != 1 && abs($enabled) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
|
if (abs($enabled) != 1 && abs($enabled) != 3 && abs($enabled) != 5) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
|
||||||
if (empty($perms)) continue; // 0 = Not visible
|
if (empty($perms)) continue; // 0 = Not visible
|
||||||
|
|
||||||
// Load language if required
|
// Load language if required
|
||||||
@ -135,7 +135,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
|
|||||||
if ($object->element == 'productlot') $permok = $user->rights->stock->creer;
|
if ($object->element == 'productlot') $permok = $user->rights->stock->creer;
|
||||||
if ($object->element == 'facturerec') $permok = $user->rights->facture->creer;
|
if ($object->element == 'facturerec') $permok = $user->rights->facture->creer;
|
||||||
if (($object->statut == 0 || !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key]))
|
if (($object->statut == 0 || !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key]))
|
||||||
&& $permok && ($action != 'edit_extras' || GETPOST('attribute') != $key)
|
&& $permok && $enabled != 5 && ($action != 'edit_extras' || GETPOST('attribute') != $key)
|
||||||
&& empty($extrafields->attributes[$object->table_element]['computed'][$key]))
|
&& empty($extrafields->attributes[$object->table_element]['computed'][$key]))
|
||||||
{
|
{
|
||||||
$fieldid = 'id';
|
$fieldid = 'id';
|
||||||
|
|||||||
@ -2046,7 +2046,7 @@ function top_menu_search()
|
|||||||
<a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Search').' ('.$langs->trans('SearchMenuShortCut').')">
|
<a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Search').' ('.$langs->trans('SearchMenuShortCut').')">
|
||||||
<i class="fa fa-search" ></i>
|
<i class="fa fa-search" ></i>
|
||||||
</a>
|
</a>
|
||||||
<div class="dropdown-menu">
|
<div class="dropdown-search">
|
||||||
'.$dropDownHtml.'
|
'.$dropDownHtml.'
|
||||||
</div>
|
</div>
|
||||||
</div>';
|
</div>';
|
||||||
@ -2078,6 +2078,7 @@ function top_menu_search()
|
|||||||
// close drop down
|
// close drop down
|
||||||
$(document).on("click", function(event) {
|
$(document).on("click", function(event) {
|
||||||
if (!$(event.target).closest("#topmenu-global-search-dropdown").length) {
|
if (!$(event.target).closest("#topmenu-global-search-dropdown").length) {
|
||||||
|
console.log("click close");
|
||||||
// Hide the menus.
|
// Hide the menus.
|
||||||
$("#topmenu-global-search-dropdown").removeClass("open");
|
$("#topmenu-global-search-dropdown").removeClass("open");
|
||||||
}
|
}
|
||||||
@ -2085,6 +2086,7 @@ function top_menu_search()
|
|||||||
|
|
||||||
// Open drop down
|
// Open drop down
|
||||||
$("#topmenu-global-search-dropdown .dropdown-toggle").on("click", function(event) {
|
$("#topmenu-global-search-dropdown .dropdown-toggle").on("click", function(event) {
|
||||||
|
console.log("click open");
|
||||||
openGlobalSearchDropDown();
|
openGlobalSearchDropDown();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -5,10 +5,60 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
|
|||||||
* Dropdown of user popup
|
* Dropdown of user popup
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.open>.dropdown-menu{
|
button.dropdown-item.global-search-item {
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.open>.dropdown-search, .open>.dropdown-bookmark, .open>.dropdown-menu{
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dropdown-search {
|
||||||
|
border-color: #eee;
|
||||||
|
|
||||||
|
position: absolute;
|
||||||
|
top: 100%;
|
||||||
|
left: 0;
|
||||||
|
z-index: 1000;
|
||||||
|
display: none;
|
||||||
|
float: left;
|
||||||
|
min-width: 160px;
|
||||||
|
margin: 2px 0 0;
|
||||||
|
font-size: 14px;
|
||||||
|
text-align: left;
|
||||||
|
list-style: none;
|
||||||
|
background-color: #fff;
|
||||||
|
-webkit-background-clip: padding-box;
|
||||||
|
background-clip: padding-box;
|
||||||
|
border: 1px solid #ccc;
|
||||||
|
border: 1px solid rgba(0,0,0,.15);
|
||||||
|
border-radius: 4px;
|
||||||
|
-webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
|
||||||
|
box-shadow: 0 6px 12px rgba(0,0,0,.175);
|
||||||
|
}
|
||||||
|
.dropdown-bookmark {
|
||||||
|
border-color: #eee;
|
||||||
|
|
||||||
|
position: absolute;
|
||||||
|
top: 100%;
|
||||||
|
left: 0;
|
||||||
|
z-index: 1000;
|
||||||
|
display: none;
|
||||||
|
float: left;
|
||||||
|
min-width: 160px;
|
||||||
|
margin: 2px 0 0;
|
||||||
|
font-size: 14px;
|
||||||
|
text-align: left;
|
||||||
|
list-style: none;
|
||||||
|
background-color: #fff;
|
||||||
|
-webkit-background-clip: padding-box;
|
||||||
|
background-clip: padding-box;
|
||||||
|
border: 1px solid #ccc;
|
||||||
|
border: 1px solid rgba(0,0,0,.15);
|
||||||
|
border-radius: 4px;
|
||||||
|
-webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
|
||||||
|
box-shadow: 0 6px 12px rgba(0,0,0,.175);
|
||||||
|
}
|
||||||
.dropdown-menu {
|
.dropdown-menu {
|
||||||
border-color: #eee;
|
border-color: #eee;
|
||||||
|
|
||||||
@ -34,7 +84,6 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.dropdown-toggle{
|
.dropdown-toggle{
|
||||||
text-decoration: none !important;
|
text-decoration: none !important;
|
||||||
}
|
}
|
||||||
@ -177,7 +226,8 @@ a.top-menu-dropdown-link {
|
|||||||
.dropdown-body::-webkit-scrollbar-thumb {
|
.dropdown-body::-webkit-scrollbar-thumb {
|
||||||
-webkit-border-radius: 0;
|
-webkit-border-radius: 0;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
background: rgb(<?php echo $colorbackhmenu1 ?>);
|
/* background: rgb(<?php echo $colorbackhmenu1 ?>); */
|
||||||
|
background: #aaa;
|
||||||
}
|
}
|
||||||
.dropdown-body::-webkit-scrollbar-track {
|
.dropdown-body::-webkit-scrollbar-track {
|
||||||
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
|
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
|
||||||
|
|||||||
@ -1592,6 +1592,7 @@ div#id-top {
|
|||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
background: rgb(<?php echo $colorbackhmenu1 ?>);
|
background: rgb(<?php echo $colorbackhmenu1 ?>);
|
||||||
background-image: linear-gradient(-45deg, <?php echo colorAdjustBrightness(colorArrayToHex(colorStringToArray($colorbackhmenu1)), '5'); ?>, rgb(<?php echo $colorbackhmenu1 ?>));
|
background-image: linear-gradient(-45deg, <?php echo colorAdjustBrightness(colorArrayToHex(colorStringToArray($colorbackhmenu1)), '5'); ?>, rgb(<?php echo $colorbackhmenu1 ?>));
|
||||||
|
/* box-shadow: 0px 0px 5px #eee; */
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4853,6 +4854,11 @@ div.dataTables_length select {
|
|||||||
/* Select2 */
|
/* Select2 */
|
||||||
/* ============================================================================== */
|
/* ============================================================================== */
|
||||||
|
|
||||||
|
.select2-container--default .select2-results__option--highlighted[aria-selected] {
|
||||||
|
background-color: rgb(<?php echo $colorbackhmenu1 ?>);
|
||||||
|
color: #<?php echo $colortextbackhmenu; ?>;
|
||||||
|
}
|
||||||
|
|
||||||
span.select2.select2-container.select2-container--default {
|
span.select2.select2-container.select2-container--default {
|
||||||
border-left: none;
|
border-left: none;
|
||||||
border-top: none;
|
border-top: none;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user