composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-09-19 07:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3592 - Migrate module to new UIBlock system : Customized request forms - remove space in edit screen

Browse Source
This commit is contained in:
acognet
2021-07-27 14:38:44 +02:00
parent a7ac9126a2
commit 146a95baec
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/cmdbabstract.class.inc.php
View File

@@ -2402,6 +2402,7 @@ HTML;
case 'CustomFields': case 'CustomFields':
$sHTMLValue .= '<div id="'.$iId.'_console_form">'; $sHTMLValue .= '<div id="'.$iId.'_console_form">';
$sHTMLValue .= '<div id="'.$iId.'_field_set">'; $sHTMLValue .= '<div id="'.$iId.'_field_set">';
$sHTMLValue .= '</div></div>';
$sHTMLValue .= '<div>'.$sReloadSpan.'</div>'; // No validation span for this one: it does handle its own validation! $sHTMLValue .= '<div>'.$sReloadSpan.'</div>'; // No validation span for this one: it does handle its own validation!
$sHTMLValue .= "<input name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" type=\"hidden\" id=\"$iId\" value=\"\"/>\n"; $sHTMLValue .= "<input name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" type=\"hidden\" id=\"$iId\" value=\"\"/>\n";

4
css/backoffice/components/_field.scss
View File

@@ -205,3 +205,7 @@ $ibo-field--value-decoration--spacing-x: 0.5rem !default;
.multi_values { .multi_values {
background-color: #c33; background-color: #c33;
} }
.form_field ~ .form_field {
margin-top: $ibo-field--sibling-spacing;
}

5
js/form_field.js
View File

@@ -21,9 +21,8 @@ $(function()
{ {
var me = this; var me = this;
this.element this.element.addClass('form_field');
.addClass('form_field');
this.element this.element
.bind('set_validators', function(oEvent, oData){ .bind('set_validators', function(oEvent, oData){
oEvent.stopPropagation(); oEvent.stopPropagation();

4
templates/base/components/field/layout.html.twig
View File

@@ -25,9 +25,7 @@
> >
<div class="ibo-field--label">{{ oUIBlock.GetLabel()|raw }}</div> <div class="ibo-field--label">{{ oUIBlock.GetLabel()|raw }}</div>
<div class="ibo-field--value" {% if oUIBlock.GetValueId() %}id="{{ oUIBlock.GetValueId() }}"{% endif %}> <div class="ibo-field--value" {% if oUIBlock.GetValueId() %}id="{{ oUIBlock.GetValueId() }}"{% endif %}>
{% for oSubBlock in oUIBlock.GetSubBlocks() %} {% for oSubBlock in oUIBlock.GetSubBlocks() %}{{ render_block(oSubBlock, {aPage: aPage}) }} {% endfor %}
{{ render_block(oSubBlock, {aPage: aPage}) }}
{% endfor %}
</div> </div>
{% if oUIBlock.GetComments() %} {% if oUIBlock.GetComments() %}
<div class="ibo-field--comments">{{ oUIBlock.GetComments()|raw }}</div> <div class="ibo-field--comments">{{ oUIBlock.GetComments()|raw }}</div>

3
templates/base/components/input/layout.html.twig
View File

@@ -12,5 +12,4 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if oUIBlock.GetPlaceHolder() %} placeholder="{{ oUIBlock.GetPlaceHolder() }}" {% endif %} {% if oUIBlock.GetPlaceHolder() %} placeholder="{{ oUIBlock.GetPlaceHolder() }}" {% endif %}
> >{% endblock %}
{% endblock %}