composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 00:02:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

display improvement

Browse Source
This commit is contained in:
Anne-Cath
2026-05-04 16:25:55 +02:00
parent 46222d750f
commit bff6c958c2
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
datamodels/2.x/itop-portal-base/portal/public/css/pages/bricks/_object-brick.scss
View File

@@ -6,6 +6,7 @@
/* SCSS variables (can be overloaded) */ /* SCSS variables (can be overloaded) */
$ipb-object-brick--url-to-clipboard--opacity: 0.5 !default; $ipb-object-brick--url-to-clipboard--opacity: 0.5 !default;
$ipb-object-brick--url-to-clipboard-tooltip-copied--margin-right: $common-spacing-200!default; $ipb-object-brick--url-to-clipboard-tooltip-copied--margin-right: $common-spacing-200!default;
$ipb-object-brick--padding-small-horizontal: 10px!default;
.url-to-clipboard{ .url-to-clipboard{
@@ -21,4 +22,16 @@ $ipb-object-brick--url-to-clipboard-tooltip-copied--margin-right: $common-spacin
// Used for clipboard's tooltip, which is not part of .url-to-clipboard element // Used for clipboard's tooltip, which is not part of .url-to-clipboard element
.url-to-clipboard-tooltip-copied { .url-to-clipboard-tooltip-copied {
margin-right: $ipb-object-brick--url-to-clipboard-tooltip-copied--margin-right; margin-right: $ipb-object-brick--url-to-clipboard-tooltip-copied--margin-right;
} }
.form_filter_container{
position: relative;
height: 2.5em;
width: 100%;
}
.form_filter_class{
position: absolute;
right: 0;
padding-right: $ipb-object-brick--padding-small-horizontal;
}

1
datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
View File

@@ -1096,6 +1096,7 @@ class ObjectController extends BrickController
foreach ($aEnumChildClasses as $sClassName) { foreach ($aEnumChildClasses as $sClassName) {
$aChildClasses[$sClassName] = MetaModel::GetName($sClassName); $aChildClasses[$sClassName] = MetaModel::GetName($sClassName);
} }
asort($aChildClasses);
$aData = $aData + [ $aData = $aData + [
'bHasSubClasses' => true, 'bHasSubClasses' => true,
'aSubClasses' => $aChildClasses, 'aSubClasses' => $aChildClasses,

18
datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_search_regular.html.twig
View File

@@ -9,14 +9,16 @@
<div id="{{ sFormId }}"> <div id="{{ sFormId }}">
{#<div class="form_alerts"></div>#} {#<div class="form_alerts"></div>#}
{% if bHasSubClasses %} {% if bHasSubClasses %}
<div class="form_field_label"> <div class="form_filter_container">
<label>{{ 'UI:SearchFor_Class'|dict_format('') }}</label> <div class="form_filter_class dataTables_filter">
<select id="finalclass{{ sFormId }}"> <label class="dataTables_filter">{{ 'UI:SearchFor_Class'|dict_format('') }}</label>
<option value="">{{ sParentClassName }}</option> <select id="finalclass{{ sFormId }}">
{% for key, sClassName in aSubClasses %} <option value="">{{ sParentClassName }}</option>
<option value="{{ key }}">{{ sClassName }}</option> {% for key, sClassName in aSubClasses %}
{% endfor %} <option value="{{ key }}">{{ sClassName }}</option>
</select> {% endfor %}
</select>
</div>
</div> </div>
{% endif %} {% endif %}
<div class="form_fields"> <div class="form_fields">