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

N°3930 Bring back error icons on dashlet property

Browse Source
This commit is contained in:
Stephen Abello
2021-07-23 11:28:17 +02:00
parent 778be8abce
commit 8a9ad78e9c
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
css/backoffice/components/_prop.scss
View File

@@ -4,20 +4,40 @@ $ibo-prop--cancel--padding-left: 7px !default;
$ibo-prop--apply-cancel--span--height: 28px !default;
$ibo-prop--apply-cancel--span--width: 32px !default;
$ibo-prop--apply-cancel--height: $ibo-prop--apply-cancel--span--height !default;
$ibo-prop--apply--width: calc(#{$ibo-prop--apply-cancel--span--width} + #{$ibo-prop--apply--padding-left}) !default;
$ibo-prop--cancel--width: calc(#{$ibo-prop--apply-cancel--span--width} + #{$ibo-prop--cancel--padding-left}) !default;
$ibo-prop--apply--error--color: $ibo-color-grey-800 !default;
.ibo-prop--apply{
width: $ibo-prop--apply--width;
padding-left: $ibo-prop--apply--padding-left;
> span{
@extend .ibo-is-green;
}
&.ui-state-error{
&:after {
color: $ibo-prop--apply--error--color;
content: '\f071';
vertical-align: bottom;
@extend %fa-solid-base;
}
> span{
display: none !important;
}
}
}
.ibo-prop--cancel{
padding-left: $ibo-prop--cancel--padding-left;
width: $ibo-prop--cancel--width;
padding-left: $ibo-prop--cancel--padding-left;
> span{
@extend .ibo-is-red;
}
}
.ibo-prop--apply, .ibo-prop--cancel{
> span{
height: $ibo-prop--apply-cancel--height;
> span{
display: block;
height: $ibo-prop--apply-cancel--span--height;
width: $ibo-prop--apply-cancel--span--width;

18
js/property_field.js
View File

@@ -51,19 +51,19 @@ $(function()
{
this.element.addClass("itop-property-field-modified");
if (this.options.can_apply) {
this.element.find(".prop_icon.ibo-prop--apply").css({visibility: ''});
this.element.find(".prop_icon.ibo-prop--apply > span").show();
CombodoTooltip.InitTooltipFromMarkup(this.element.find(".prop_icon.ibo-prop--apply [data-tooltip-content]"), true);
} else {
this.element.find(".prop_icon.ibo-prop--apply").css({visibility: 'hidden'});
this.element.find(".prop_icon.ibo-prop--apply > span").hide();
}
this.element.find(".prop_icon.ibo-prop--cancel").css({visibility: ''});
this.element.find(".prop_icon.ibo-prop--cancel > span").show();
CombodoTooltip.InitTooltipFromMarkup(this.element.find(".prop_icon.ibo-prop--cancel [data-tooltip-content]"), true);
}
else
{
this.element.removeClass("itop-property-field-modified");
this.element.find(".prop_icon.ibo-prop--apply").css({visibility: 'hidden'});
this.element.find(".prop_icon.ibo-prop--cancel").css({visibility: 'hidden'});
this.element.find(".prop_icon.ibo-prop--apply > span").hide();
this.element.find(".prop_icon.ibo-prop--cancel > span").hide();
}
},
@@ -539,7 +539,7 @@ function ValidateWithPattern(sFieldId, bMandatory, sPattern, sFormId, aForbidden
if (oFormValidation[sFormId] == undefined) oFormValidation[sFormId] = [];
if (!bValid)
{
$('#v_'+sFieldId).addClass('ui-state-error');
$('#v_'+sFieldId).parent('.ibo-prop--apply').addClass('ui-state-error');
iFieldIdPos = jQuery.inArray(sFieldId, oFormValidation[sFormId]);
if (iFieldIdPos == -1)
{
@@ -556,7 +556,7 @@ function ValidateWithPattern(sFieldId, bMandatory, sPattern, sFormId, aForbidden
}
else
{
$('#v_'+sFieldId).removeClass('ui-state-error');
$('#v_'+sFieldId).parent('.ibo-prop--apply').removeClass('ui-state-error');
if ($('#'+sFieldId).data('uiTooltip'))
{
$('#'+sFieldId).tooltip('close');
@@ -611,7 +611,7 @@ function ValidateInteger(sFieldId, bMandatory, sFormId, iMin, iMax, sExplainForm
if (oFormValidation[sFormId] == undefined) oFormValidation[sFormId] = [];
if (!bValid)
{
$('#v_'+sFieldId).addClass('ui-state-error');
$('#v_'+sFieldId).parent('.ibo-prop--apply').addClass('ui-state-error');
iFieldIdPos = jQuery.inArray(sFieldId, oFormValidation[sFormId]);
if (iFieldIdPos == -1)
{
@@ -628,7 +628,7 @@ function ValidateInteger(sFieldId, bMandatory, sFormId, iMin, iMax, sExplainForm
}
else
{
$('#v_'+sFieldId).removeClass('ui-state-error');
$('#v_'+sFieldId).parent('.ibo-prop--apply').removeClass('ui-state-error');
if ($('#'+sFieldId).data('uiTooltip'))
{
$('#'+sFieldId).tooltip('close');