diff --git a/dashboard/divId/divIds.component.html b/dashboard/divId/divIds.component.html index 85f9565a..451df012 100644 --- a/dashboard/divId/divIds.component.html +++ b/dashboard/divId/divIds.component.html @@ -95,14 +95,9 @@
-
-
-
-
-
+
+
+
diff --git a/dashboard/divhelpcontent/class-help-content-form.component.html b/dashboard/divhelpcontent/class-help-content-form.component.html index f636529d..93b6babf 100644 --- a/dashboard/divhelpcontent/class-help-content-form.component.html +++ b/dashboard/divhelpcontent/class-help-content-form.component.html @@ -44,15 +44,8 @@
-
-
- +
-
Select Status (Enable/ disable) diff --git a/dashboard/entity/entities.component.html b/dashboard/entity/entities.component.html index 65c0b4cf..fe367dbe 100644 --- a/dashboard/entity/entities.component.html +++ b/dashboard/entity/entities.component.html @@ -113,14 +113,8 @@ -
-
-
-
+
+
diff --git a/dashboard/helpTexts/page-help-content-form.component.html b/dashboard/helpTexts/page-help-content-form.component.html index e5c3b93a..84cfc9a9 100644 --- a/dashboard/helpTexts/page-help-content-form.component.html +++ b/dashboard/helpTexts/page-help-content-form.component.html @@ -40,18 +40,10 @@
-
-
-
-
+
+
-
Select Status (Enable/ disable)
- -
-
-
-
-
-
-
-
-
- +
+
+
+
+
diff --git a/notifications/notify-form/notify-form.component.css b/notifications/notify-form/notify-form.component.css new file mode 100644 index 00000000..854d898f --- /dev/null +++ b/notifications/notify-form/notify-form.component.css @@ -0,0 +1,14 @@ +[notify-form] .notification-user { + position: absolute; + top: 0; + left: 0; + transform: translate(-50%, -50%); + z-index: 1; +} + +[notify-form] .input-wrapper.recipients { + --input-padding-horizontal: 0; + --input-font-size: 14px; + --input-placeholder-weight: 700; + --input-placeholder-color: var(--grey-color); +} diff --git a/notifications/notify-form/notify-form.component.ts b/notifications/notify-form/notify-form.component.ts index aa84fb74..2a3929c6 100644 --- a/notifications/notify-form/notify-form.component.ts +++ b/notifications/notify-form/notify-form.component.ts @@ -1,12 +1,11 @@ -import {ChangeDetectorRef, Component, Input, OnDestroy, OnInit, ViewChild} from "@angular/core"; -import {FormArray, FormBuilder, FormGroup, Validators} from "@angular/forms"; +import {ChangeDetectorRef, Component, Input, OnDestroy, OnInit, ViewChild, ViewEncapsulation} from "@angular/core"; +import {FormArray, FormBuilder, FormGroup} from "@angular/forms"; import {User} from "../../login/utils/helper.class"; import {UserManagementService} from "../../services/user-management.service"; -import {of, Subscription} from "rxjs"; +import {Subscription} from "rxjs"; import {NotificationService} from "../notification.service"; import {Notification} from "../notifications"; import {InputComponent, Option} from "../../sharedComponents/input/input.component"; -import {properties} from "../../../../environments/environment"; declare var UIkit; @@ -15,14 +14,12 @@ declare var UIkit; template: `
- {{label}} -
-
+ +
+
-
+
@@ -36,30 +33,27 @@ declare var UIkit;
--> -
-
+
+
+
+
-
-
-
-
-
- - -
+
+
+
- ` + `, + styleUrls: ['notify-form.component.css'], + encapsulation: ViewEncapsulation.None }) export class NotifyFormComponent implements OnInit, OnDestroy { @Input() diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts index 4ccd2917..1c7fd6d9 100644 --- a/role-verification/role-verification.component.ts +++ b/role-verification/role-verification.component.ts @@ -21,7 +21,7 @@ import {Composer} from "../utils/email/composer"; email, to accept the invitation request.
-
+
{{error}}
@@ -32,7 +32,7 @@ import {Composer} from "../utils/email/composer"; -
@@ -46,7 +46,7 @@ import {Composer} from "../utils/email/composer"; email, to accept the invitation request.
-
+
{{error}}
@@ -57,7 +57,7 @@ import {Composer} from "../utils/email/composer"; -
diff --git a/sharedComponents/input/input.component.ts b/sharedComponents/input/input.component.ts index 4fe59f49..95855e09 100644 --- a/sharedComponents/input/input.component.ts +++ b/sharedComponents/input/input.component.ts @@ -18,7 +18,7 @@ import {Subscription} from "rxjs"; import {EnvProperties} from "../../utils/properties/env-properties"; import {properties} from "../../../../environments/environment"; -export type InputType = 'text' | 'URL' | 'logoURL' | 'autocomplete' | 'textarea' | 'select' | 'chips'; +export type InputType = 'text' | 'URL' | 'logoURL' | 'autocomplete' | 'autocomplete_soft' | 'textarea' | 'select' | 'chips'; export interface Option { icon?: string, @@ -37,6 +37,9 @@ declare var UIkit; /** * WARNING! dashboard-input selector is @deprecated, use input instead * + * Autocomplete soft allows values that are not listed in options list. In order to work as expected + * avoid providing options with different label and value. + * * */ @Component({ selector: '[dashboard-input], [input]', @@ -47,42 +50,49 @@ declare var UIkit; [class.active]="(formAsControl?.value || formAsArray?.length > 0 || getLabel(formAsControl?.value)) && !focused" [class.danger]="(formControl.invalid && (formControl.touched || searchControl?.touched)) || (searchControl?.invalid && searchControl?.touched)">
-
+ [class.static]="placeholderInfo?.static"> +
- - -
{{getLabel(formControl.value)}}
-
{{placeholderInfo.label}}
+
{{getLabel(formControl.value)}}
+
{{placeholderInfo.label}}
 -
{{getLabel(formAsControl.value)}}
 + + +
-
+
{{getLabel(chip.value)}}
-
+
+
+ + {{(formAsArray.length - 1)}} more +