diff --git a/src/Squidex.Core/Schemas/NumberFieldEditor.cs b/src/Squidex.Core/Schemas/NumberFieldEditor.cs new file mode 100644 index 000000000..8e54de235 --- /dev/null +++ b/src/Squidex.Core/Schemas/NumberFieldEditor.cs @@ -0,0 +1,17 @@ +// ========================================================================== +// NumberFieldEditor.cs +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex Group +// All rights reserved. +// ========================================================================== + +namespace Squidex.Core.Schemas +{ + public enum NumberFieldEditor + { + Input, + Radio, + Dropdown + } +} diff --git a/src/Squidex.Core/Schemas/NumberFieldProperties.cs b/src/Squidex.Core/Schemas/NumberFieldProperties.cs index f58b8fac1..3a1d7ebc9 100644 --- a/src/Squidex.Core/Schemas/NumberFieldProperties.cs +++ b/src/Squidex.Core/Schemas/NumberFieldProperties.cs @@ -19,6 +19,7 @@ namespace Squidex.Core.Schemas private double? minValue; private double? defaultValue; private ImmutableList allowedValues; + private NumberFieldEditor editor; public double? MaxValue { @@ -64,14 +65,35 @@ namespace Squidex.Core.Schemas } } + public NumberFieldEditor Editor + { + get { return editor; } + set + { + ThrowIfFrozen(); + + editor = value; + } + } + protected override IEnumerable ValidateCore() { + if (!Editor.IsEnumValue()) + { + yield return new ValidationError("Editor ist not a valid value", nameof(Editor)); + } + + if ((Editor == NumberFieldEditor.Radio || Editor == NumberFieldEditor.Dropdown) && (AllowedValues == null || AllowedValues.Count == 0)) + { + yield return new ValidationError("Radio buttons or dropdown list need allowed values", nameof(AllowedValues)); + } + if (MaxValue.HasValue && MinValue.HasValue && MinValue.Value >= MaxValue.Value) { yield return new ValidationError("Max value must be greater than min value", nameof(MinValue), nameof(MaxValue)); } - if (AllowedValues != null && (MinValue.HasValue || MaxValue.HasValue)) + if (AllowedValues != null && AllowedValues.Count > 0 && (MinValue.HasValue || MaxValue.HasValue)) { yield return new ValidationError("Either or allowed values or range can be defined", nameof(AllowedValues), diff --git a/src/Squidex.Core/Schemas/StringFieldEditor.cs b/src/Squidex.Core/Schemas/StringFieldEditor.cs new file mode 100644 index 000000000..eaf901d0a --- /dev/null +++ b/src/Squidex.Core/Schemas/StringFieldEditor.cs @@ -0,0 +1,18 @@ +// ========================================================================== +// StringFieldEditor.cs +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex Group +// All rights reserved. +// ========================================================================== + +namespace Squidex.Core.Schemas +{ + public enum StringFieldEditor + { + Input, + TextArea, + Radio, + Dropdown + } +} diff --git a/src/Squidex.Core/Schemas/StringFieldProperties.cs b/src/Squidex.Core/Schemas/StringFieldProperties.cs index 1bb2b27ef..b6aaad274 100644 --- a/src/Squidex.Core/Schemas/StringFieldProperties.cs +++ b/src/Squidex.Core/Schemas/StringFieldProperties.cs @@ -23,6 +23,7 @@ namespace Squidex.Core.Schemas private string pattern; private string patternMessage; private ImmutableList allowedValues; + private StringFieldEditor editor; public int? MinLength { @@ -79,8 +80,29 @@ namespace Squidex.Core.Schemas } } + public StringFieldEditor Editor + { + get { return editor; } + set + { + ThrowIfFrozen(); + + editor = value; + } + } + protected override IEnumerable ValidateCore() { + if (!Editor.IsEnumValue()) + { + yield return new ValidationError("Editor ist not a valid value", nameof(Editor)); + } + + if ((Editor == StringFieldEditor.Radio || Editor == StringFieldEditor.Dropdown) && (AllowedValues == null || AllowedValues.Count == 0)) + { + yield return new ValidationError("Radio buttons or dropdown list need allowed values", nameof(AllowedValues)); + } + if (MaxLength.HasValue && MinLength.HasValue && MinLength.Value >= MaxLength.Value) { yield return new ValidationError("Max length must be greater than min length", nameof(MinLength), nameof(MaxLength)); diff --git a/src/Squidex/Controllers/Api/Schemas/Models/NumberFieldPropertiesDto.cs b/src/Squidex/Controllers/Api/Schemas/Models/NumberFieldPropertiesDto.cs index 6cd058220..dd76e51f9 100644 --- a/src/Squidex/Controllers/Api/Schemas/Models/NumberFieldPropertiesDto.cs +++ b/src/Squidex/Controllers/Api/Schemas/Models/NumberFieldPropertiesDto.cs @@ -35,6 +35,11 @@ namespace Squidex.Controllers.Api.Schemas.Models /// public double[] AllowedValues { get; set; } + /// + /// The editor that is used to manage this field. + /// + public NumberFieldEditor Editor { get; set; } + public override FieldProperties ToProperties() { return SimpleMapper.Map(this, new NumberFieldProperties()); diff --git a/src/Squidex/Controllers/Api/Schemas/Models/StringFieldPropertiesDto.cs b/src/Squidex/Controllers/Api/Schemas/Models/StringFieldPropertiesDto.cs index 7829f5dd0..2490e11ef 100644 --- a/src/Squidex/Controllers/Api/Schemas/Models/StringFieldPropertiesDto.cs +++ b/src/Squidex/Controllers/Api/Schemas/Models/StringFieldPropertiesDto.cs @@ -45,6 +45,11 @@ namespace Squidex.Controllers.Api.Schemas.Models /// public string[] AllowedValues { get; set; } + /// + /// The editor that is used to manage this field. + /// + public StringFieldEditor Editor { get; set; } + public override FieldProperties ToProperties() { return SimpleMapper.Map(this, new StringFieldProperties()); diff --git a/src/Squidex/app/features/schemas/declarations.ts b/src/Squidex/app/features/schemas/declarations.ts index 926cf40ee..023e83738 100644 --- a/src/Squidex/app/features/schemas/declarations.ts +++ b/src/Squidex/app/features/schemas/declarations.ts @@ -5,6 +5,8 @@ * Copyright (c) Sebastian Stehle. All rights reserved */ +export * from './pages/schema/types/number-ui.component'; +export * from './pages/schema/types/number-validation.component'; export * from './pages/schema/types/string-ui.component'; export * from './pages/schema/types/string-validation.component'; export * from './pages/schema/field.component'; diff --git a/src/Squidex/app/features/schemas/module.ts b/src/Squidex/app/features/schemas/module.ts index 3074a42e8..807fee8f7 100644 --- a/src/Squidex/app/features/schemas/module.ts +++ b/src/Squidex/app/features/schemas/module.ts @@ -12,6 +12,8 @@ import { SqxFrameworkModule, SqxSharedModule } from 'shared'; import { FieldComponent, + NumberUIComponent, + NumberValidationComponent, SchemaFormComponent, SchemaPageComponent, SchemasPageComponent, @@ -42,6 +44,8 @@ const routes: Routes = [ ], declarations: [ FieldComponent, + NumberUIComponent, + NumberValidationComponent, SchemaFormComponent, SchemaPageComponent, SchemasPageComponent, diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.html b/src/Squidex/app/features/schemas/pages/schema/field.component.html index 87c825783..3cae35de4 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.html @@ -2,7 +2,7 @@
- {{field.name}} + {{field.name}}
@@ -28,7 +28,7 @@ Validation
  • - User Interface + Editing
    • @@ -43,9 +43,9 @@
    -
    +
    - + Label can not have more than 100 characters.
    @@ -63,9 +63,9 @@
    -
    +
    - + Hints can not have more than 100 characters.
    @@ -83,10 +83,10 @@
    - asdsad +
    - +
    @@ -94,10 +94,10 @@
    - asdsad +
    - +
    diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.scss b/src/Squidex/app/features/schemas/pages/schema/field.component.scss index 44ce3aa4a..56f5b8fe4 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.scss +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.scss @@ -13,6 +13,14 @@ $field-header: #e7ebef; line-height: 40px; } + &-icon { + color: darken($color-border, 15%); + font-size: 1.2rem; + font-weight: normal; + vertical-align: middle; + margin-right: 1rem; + } + &-edit-button { & { color: $color-theme-blue; diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.ts b/src/Squidex/app/features/schemas/pages/schema/field.component.ts index f6e24b32a..38c2bafb6 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.ts @@ -7,16 +7,13 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { Observable} from 'rxjs'; + import { createProperties, fadeAnimation, - FieldDto, - FieldPropertiesDto + FieldDto } from 'shared'; -const ESCAPE_KEY = 27; - @Component({ selector: 'sqx-field', styleUrls: ['./field.component.scss'], @@ -34,8 +31,8 @@ export class FieldComponent implements OnInit { @Output() public saved = new EventEmitter(); - public isEditing: boolean = false; - public selectedTab = 0; + public isEditing: boolean = true; + public selectedTab = 2; public editForm: FormGroup = this.formBuilder.group({ @@ -102,8 +99,6 @@ export class FieldComponent implements OnInit { } this.oldValue = Object.assign({}, this.editForm.value); - - this.isEditing = false; } } diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html index aaed5b356..d52f2035a 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html @@ -24,15 +24,15 @@
    -
    +
    - + Name is required. - + Name can not have more than 40 characters. - + Name can contain lower case letters (a-z), numbers and dashes (not at the end).
    diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts index 44bceff0d..75db9e310 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts @@ -21,7 +21,6 @@ import { MessageBus, NotificationService, NumberFieldPropertiesDto, - SchemaDetailsDto, SchemasService, StringFieldPropertiesDto, UsersProviderService diff --git a/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.html new file mode 100644 index 000000000..7eed595c4 --- /dev/null +++ b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.html @@ -0,0 +1,55 @@ +
    +
    + + +
    +
    +
    + + Placeholder can not have more than 100 characters. + +
    +
    + + + + + Define the placeholder for the input control. + +
    +
    +
    + + +
    + + + +
    +
    +
    + + +
    + +
    +
    +
    \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.scss b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.scss new file mode 100644 index 000000000..fbb752506 --- /dev/null +++ b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.scss @@ -0,0 +1,2 @@ +@import '_vars'; +@import '_mixins'; \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts new file mode 100644 index 000000000..7f05c49ac --- /dev/null +++ b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts @@ -0,0 +1,47 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Sebastian Stehle. All rights reserved + */ + +import { Component, Input, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { Observable } from 'rxjs'; + +import { fadeAnimation, FloatConverter } from 'shared'; + +@Component({ + selector: 'sqx-number-ui', + styleUrls: ['number-ui.component.scss'], + templateUrl: 'number-ui.component.html', + animations: [ + fadeAnimation + ] +}) +export class NumberUIComponent implements OnInit { + @Input() + public editForm: FormGroup; + + public converter = new FloatConverter(); + + public hideAllowedValues: Observable; + + public ngOnInit() { + this.editForm.addControl('editor', + new FormControl('Input', [ + Validators.required + ])); + this.editForm.addControl('placeholder', + new FormControl('', [ + Validators.maxLength(100) + ])); + this.editForm.addControl('allowedValues', + new FormControl(undefined, [])); + + this.hideAllowedValues = + Observable.of(false) + .merge(this.editForm.get('editor').valueChanges) + .map(x => !x || x === 'Input' || x === 'Textarea'); + } +} \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.html b/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.html new file mode 100644 index 000000000..8fe6c59ec --- /dev/null +++ b/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.html @@ -0,0 +1,30 @@ +
    +
    + + +
    + +
    +
    + +
    + + +
    + + + +
    +
    + +
    +
    + +
    + + +
    + +
    +
    +
    \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.scss b/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.scss new file mode 100644 index 000000000..052895cb8 --- /dev/null +++ b/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.scss @@ -0,0 +1,16 @@ +@import '_vars'; +@import '_mixins'; + +.minlength { + &-col { + position: relative; + } + + &-label { + @include absolute(0, -4px, auto, auto); + } +} + +.form-check-input { + margin: 0; +} \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts new file mode 100644 index 000000000..e4609291c --- /dev/null +++ b/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts @@ -0,0 +1,40 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Sebastian Stehle. All rights reserved + */ + +import { Component, Input, OnInit } from '@angular/core'; +import { FormControl, FormGroup } from '@angular/forms'; +import { Observable } from 'rxjs'; + +@Component({ + selector: 'sqx-number-validation', + styleUrls: ['number-validation.component.scss'], + templateUrl: 'number-validation.component.html' +}) +export class NumberValidationComponent implements OnInit { + @Input() + public editForm: FormGroup; + + public hideDefaultValue: Observable; + + public ngOnInit() { + this.editForm.addControl('maxValue', + new FormControl()); + this.editForm.addControl('minValue', + new FormControl()); + this.editForm.addControl('pattern', + new FormControl()); + this.editForm.addControl('patternMessage', + new FormControl()); + this.editForm.addControl('defaultValue', + new FormControl()); + + this.hideDefaultValue = + Observable.of(false) + .merge(this.editForm.get('isRequired').valueChanges) + .map(x => !!x); + } +} \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html index 3c6d92658..b46b31457 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html @@ -3,9 +3,9 @@
    -
    +
    - + Placeholder can not have more than 100 characters.
    @@ -18,4 +18,45 @@
    +
    + + +
    + + + + +
    +
    +
    + + +
    + +
    +
    \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts index 86bb184a0..88df64f6c 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts @@ -7,8 +7,9 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { Observable } from 'rxjs'; -import { fadeAnimation, StringFieldPropertiesDto } from 'shared'; +import { fadeAnimation } from 'shared'; @Component({ selector: 'sqx-string-ui', @@ -22,13 +23,23 @@ export class StringUIComponent implements OnInit { @Input() public editForm: FormGroup; - @Input() - public properties: StringFieldPropertiesDto; + public hideAllowedValues: Observable; public ngOnInit() { + this.editForm.addControl('editor', + new FormControl('Input', [ + Validators.required + ])); this.editForm.addControl('placeholder', new FormControl('', [ Validators.maxLength(100) ])); + this.editForm.addControl('allowedValues', + new FormControl(10, [])); + + this.hideAllowedValues = + Observable.of(false) + .merge(this.editForm.get('editor').valueChanges) + .map(x => !x || x === 'Input' || x === 'Textarea'); } } \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.html b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.html index a67604728..0e91328fd 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.html @@ -1,6 +1,6 @@
    - +
    diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts index b4cd85a2a..93fa236e5 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts @@ -9,8 +9,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { Observable } from 'rxjs'; -import { StringFieldPropertiesDto } from 'shared'; - @Component({ selector: 'sqx-string-validation', styleUrls: ['string-validation.component.scss'], @@ -20,9 +18,6 @@ export class StringValidationComponent implements OnInit { @Input() public editForm: FormGroup; - @Input() - public properties: StringFieldPropertiesDto; - public hidePatternMessage: Observable; public hideDefaultValue: Observable; diff --git a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html index 348e7dcbb..f4cad156c 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html +++ b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html @@ -8,15 +8,15 @@
    -
    +
    - + Name is required. - + Name can not have more than 40 characters. - + Name can contain lower case letters (a-z), numbers and dashes only (not at the end).
    diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts index f42cd81cc..2fd5de835 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts +++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts @@ -5,8 +5,8 @@ * Copyright (c) Sebastian Stehle. All rights reserved */ -import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; +import { Component } from '@angular/core'; +import { FormBuilder, FormControl } from '@angular/forms'; import { BehaviorSubject, Observable } from 'rxjs'; import { @@ -21,8 +21,6 @@ import { UsersProviderService } from 'shared'; -const FALLBACK_NAME = 'my-schema'; - @Component({ selector: 'sqx-schemas-page', styleUrls: ['./schemas-page.component.scss'], diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.html b/src/Squidex/app/features/settings/pages/clients/client.component.html index b5ef2c38c..fde0877f0 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.html +++ b/src/Squidex/app/features/settings/pages/clients/client.component.html @@ -15,9 +15,9 @@
    -
    +
    - + Name is required.
    diff --git a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html index 723f232f2..284482b7a 100644 --- a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html +++ b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html @@ -22,15 +22,15 @@
    -
    +
    - + Name is required. - + Name can not have more than 40 characters. - + Name can contain lower case letters (a-z), numbers and dashes (not at the end).
    diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts index c87c809a0..77b539137 100644 --- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts +++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts @@ -21,7 +21,6 @@ import { ImmutableArray, MessageBus, NotificationService, - UserDto, UsersProviderService, UsersService } from 'shared'; diff --git a/src/Squidex/app/framework/angular/autocomplete.component.html b/src/Squidex/app/framework/angular/autocomplete.component.html index d7d60adae..774dbb184 100644 --- a/src/Squidex/app/framework/angular/autocomplete.component.html +++ b/src/Squidex/app/framework/angular/autocomplete.component.html @@ -1,5 +1,5 @@ - void = NOOP; private touchedCallback: () => void = NOOP; @@ -53,7 +52,7 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O public source: AutocompleteSource; @Input() - public inputName: string; + public inputName: string = 'autocompletion'; public items: AutocompleteItem[] = []; public itemSelection = -1; @@ -121,7 +120,11 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O this.subscription.unsubscribe(); } - public keyDown(event: KeyboardEvent) { + public onBlur() { + this.touchedCallback(); + } + + public onKeyDown(event: KeyboardEvent) { switch (event.keyCode) { case KEY_UP: this.up(); diff --git a/src/Squidex/app/framework/angular/color-picker.component.html b/src/Squidex/app/framework/angular/color-picker.component.html index b49292d73..4f92a60ed 100644 --- a/src/Squidex/app/framework/angular/color-picker.component.html +++ b/src/Squidex/app/framework/angular/color-picker.component.html @@ -1,7 +1,7 @@
    -
    +
    diff --git a/src/Squidex/app/framework/angular/color-picker.component.scss b/src/Squidex/app/framework/angular/color-picker.component.scss index 84fa7e014..99be94be9 100644 --- a/src/Squidex/app/framework/angular/color-picker.component.scss +++ b/src/Squidex/app/framework/angular/color-picker.component.scss @@ -1,4 +1,5 @@ @import '_mixins'; +@import '_vars'; $color-size: 24px; $color-button: #1875cc; diff --git a/src/Squidex/app/framework/angular/color-picker.component.spec.ts b/src/Squidex/app/framework/angular/color-picker.component.spec.ts index c3236318c..dc316d8d0 100644 --- a/src/Squidex/app/framework/angular/color-picker.component.spec.ts +++ b/src/Squidex/app/framework/angular/color-picker.component.spec.ts @@ -53,7 +53,7 @@ describe('ColorPickerComponent', () => { let lastColor: Color | null = null; - colorPicker.colorChange.subscribe((c: Color) => { + colorPicker.registerOnChange((c: Color) => { lastColor = c; }); @@ -72,7 +72,7 @@ describe('ColorPickerComponent', () => { let lastColor: Color | null = null; - colorPicker.colorChange.subscribe((c: Color) => { + colorPicker.registerOnChange((c: Color) => { lastColor = c; }); @@ -81,13 +81,11 @@ describe('ColorPickerComponent', () => { expect(lastColor).toBeNull(); }); - it('should update selected color when component changes', () => { + it('should update selected color when writing value', () => { const colorPicker = new ColorPickerComponent({ nativeElement: {} }); const selectedColor = Color.RED; - colorPicker.color = selectedColor; - - colorPicker.ngOnChanges(); + colorPicker.writeValue(selectedColor); expect(colorPicker.selectedColor).toBe(selectedColor); }); @@ -95,9 +93,7 @@ describe('ColorPickerComponent', () => { it('should update selected color with palette default if setting invalid color', () => { const colorPicker = new ColorPickerComponent({ nativeElement: {} }); - colorPicker.color = 'invalid'; - - colorPicker.ngOnChanges(); + colorPicker.writeValue('invalid'); expect(colorPicker.selectedColor).toBe(colorPicker.palette.defaultColor); }); @@ -106,9 +102,7 @@ describe('ColorPickerComponent', () => { const colorPicker = new ColorPickerComponent({ nativeElement: {} }); colorPicker.palette = undefined!; - colorPicker.color = 'invalid'; - - colorPicker.ngOnChanges(); + colorPicker.writeValue('invalid'); expect(colorPicker.selectedColor).toBe(Color.BLACK); }); diff --git a/src/Squidex/app/framework/angular/color-picker.component.ts b/src/Squidex/app/framework/angular/color-picker.component.ts index 116ca1411..5575d15e5 100644 --- a/src/Squidex/app/framework/angular/color-picker.component.ts +++ b/src/Squidex/app/framework/angular/color-picker.component.ts @@ -5,39 +5,62 @@ * Copyright (c) Sebastian Stehle. All rights reserved */ -import { Component, ElementRef, EventEmitter, HostListener, Input, OnChanges, Output } from '@angular/core'; +import { Component, ElementRef, forwardRef, HostListener, Input } from '@angular/core'; +import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { Color } from './../utils/color'; import { ColorPalette } from './../utils/color-palette'; +/* tslint:disable:no-empty */ + +const NOOP = () => { }; + +export const SQX_COLOR_PICKER_CONTROL_VALUE_ACCESSOR: any = { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => ColorPickerComponent), + multi: true +}; + @Component({ selector: 'sqx-color-picker', styleUrls: ['./color-picker.component.scss'], - templateUrl: './color-picker.component.html' + templateUrl: './color-picker.component.html', + providers: [SQX_COLOR_PICKER_CONTROL_VALUE_ACCESSOR] }) -export class ColorPickerComponent implements OnChanges { - private selectedColorValue = new Color(0, 0, 0); +export class ColorPickerComponent implements ControlValueAccessor { + private changeCallback: (value: any) => void = NOOP; + private touchedCallback: () => void = NOOP; - @Output() - public colorChange = new EventEmitter(); + public selectedColor: Color = Color.BLACK; @Input() - public color: string | number | Color; + public palette = ColorPalette.colors(); @Input() - public palette = ColorPalette.colors(); + public dropdownSide: 'left'; @Input() public isOpen = false; - public get selectedColor(): Color { - return this.selectedColorValue; - } - constructor(private readonly element: ElementRef) { this.updateColor(); } + public writeValue(value: any) { + this.updateColor(value); + } + + public setDisabledState(isDisabled: boolean): void { + } + + public registerOnChange(fn: any) { + this.changeCallback = fn; + } + + public registerOnTouched(fn: any) { + this.touchedCallback = fn; + } + @HostListener('document:click', ['$event.target']) public onClick(targetElement: any) { const clickedInside = this.element.nativeElement.contains(targetElement); @@ -47,20 +70,22 @@ export class ColorPickerComponent implements OnChanges { } } - public ngOnChanges() { - this.updateColor(); + public toggleOpen() { + if (this.isOpen) { + this.close(); + } else { + this.open(); + } } - public toggleOpen() { - this.isOpen = !this.isOpen; + public open() { + this.isOpen = true; } public close() { this.isOpen = false; - } - public open() { - this.isOpen = true; + this.touchedCallback(); } public selectColor(color: Color) { @@ -70,26 +95,26 @@ export class ColorPickerComponent implements OnChanges { } private updateParent(color: Color) { - if (this.selectedColorValue.ne(color)) { - this.colorChange.emit(color); + if (this.selectedColor.ne(color)) { + this.changeCallback(color); } } private updateColor(color?: Color) { let hasColor = false; try { - this.selectedColorValue = Color.fromValue(color || this.color); + this.selectedColor = Color.fromValue(color); hasColor = true; } catch (e) { hasColor = false; } - if (!hasColor || !this.selectedColorValue) { + if (!hasColor || !this.selectedColor) { if (this.palette) { - this.selectedColorValue = this.palette.defaultColor; + this.selectedColor = this.palette.defaultColor; } else { - this.selectedColorValue = Color.BLACK; + this.selectedColor = Color.BLACK; } } } diff --git a/src/Squidex/app/framework/angular/slider.component.html b/src/Squidex/app/framework/angular/slider.component.html index dd705a7a8..ab37c52ff 100644 --- a/src/Squidex/app/framework/angular/slider.component.html +++ b/src/Squidex/app/framework/angular/slider.component.html @@ -1,3 +1,3 @@ -
    -
    +
    +
    \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/slider.component.scss b/src/Squidex/app/framework/angular/slider.component.scss index fedcd96f0..7eb1e3d8a 100644 --- a/src/Squidex/app/framework/angular/slider.component.scss +++ b/src/Squidex/app/framework/angular/slider.component.scss @@ -1,23 +1,27 @@ @import '_mixins'; +@import '_vars'; $bar-height: 12px; $thumb-size: 20px; $thumb-margin: ($thumb-size - $bar-height) * .5; -$color-border: #ccc; -$color-focus: #66afe9; - .slider { &-bar { - @include border-radius($bar-height * .5); - position: relative; - border: 1px solid $color-border; - margin-bottom: 20px; - margin-top: 5px; - margin-right: $thumb-size * .5; - background: $color-border; - height: $bar-height; + & { + @include border-radius($bar-height * .5); + position: relative; + border: 1px solid $color-control; + margin-bottom: 20px; + margin-top: 5px; + margin-right: $thumb-size * .5; + background: $color-accent-dark; + height: $bar-height; + } + + &.disabled { + background: lighten($color-border, 5%); + } } &-thumb { @@ -26,14 +30,22 @@ $color-focus: #66afe9; position: absolute; width: $thumb-size; height: $thumb-size; - border: 1px solid $color-border; - background: $color-border; + border: 1px solid $color-control; + background: $color-accent-dark; margin-top: -$thumb-margin; margin-left: -$thumb-size * .5; } + &.disabled { + background: lighten($color-border, 5%); + } + &.focused { - border-color: $color-focus; + border-color: $color-theme-blue; } } +} + +.disabled { + pointer-events: none; } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/slider.component.ts b/src/Squidex/app/framework/angular/slider.component.ts index a99185468..9ef09ca5b 100644 --- a/src/Squidex/app/framework/angular/slider.component.ts +++ b/src/Squidex/app/framework/angular/slider.component.ts @@ -5,18 +5,37 @@ * Copyright (c) Sebastian Stehle. All rights reserved */ -import { Component, ElementRef, EventEmitter, Input, OnChanges, Output, Renderer, ViewChild } from '@angular/core'; +import { Component, ElementRef, forwardRef, Input, Renderer, ViewChild } from '@angular/core'; +import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; + +/* tslint:disable:no-empty */ + +const NOOP = () => { }; + +export const SQX_SLIDER_CONTROL_VALUE_ACCESSOR: any = { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => SliderComponent), + multi: true +}; @Component({ selector: 'sqx-slider', styleUrls: ['./slider.component.scss'], - templateUrl: './slider.component.html' + templateUrl: './slider.component.html', + providers: [SQX_SLIDER_CONTROL_VALUE_ACCESSOR] }) -export class SliderComponent implements OnChanges { +export class SliderComponent implements ControlValueAccessor { + private changeCallback: (value: any) => void = NOOP; + private touchedCallback: () => void = NOOP; private mouseMoveSubscription: Function | null; private mouseUpSubscription: Function | null; private centerStartOffset = 0; private startValue: number; + private lastValue: number; + private value: number; + private isDragging = false; + + public isDisabled: boolean = false; @ViewChild('bar') public bar: ElementRef; @@ -31,31 +50,42 @@ export class SliderComponent implements OnChanges { public max = 100; @Input() - public value: number; - - @Output() - public valueChange = new EventEmitter(); + public step = 1; constructor(private readonly renderer: Renderer) { } - public ngOnChanges() { - const relativeValue = (this.value - this.min) / (this.max - this.min); + public writeValue(value: any) { + this.lastValue = this.value = value; - this.setThumbPosition(relativeValue); + this.updateThumbPosition(); } - public onBarMouseClick(event: MouseEvent) { - const relativeValue = this.getRelativeX(event); + public setDisabledState(isDisabled: boolean): void { + this.isDisabled = isDisabled; + } - this.setThumbPosition(relativeValue); + public registerOnChange(fn: any) { + this.changeCallback = fn; + } - const newValue = Math.round(relativeValue * (this.max - this.min) + this.min); + public registerOnTouched(fn: any) { + this.touchedCallback = fn; + } - if (newValue !== this.value) { - this.valueChange.emit(newValue); + public onBarMouseClick(event: MouseEvent) { + if (this.mouseMoveSubscription) { + return; } - this.stopEvent(event); + const relativeValue = this.getRelativeX(event); + + this.value = Math.round((relativeValue * (this.max - this.min) + this.min) / this.step) * this.step; + + this.updateThumbPosition(); + this.updateTouched(); + this.updateValue(); + + return false; } public onThumbMouseDown(event: MouseEvent) { @@ -75,32 +105,39 @@ export class SliderComponent implements OnChanges { this.renderer.setElementClass(this.thumb.nativeElement, 'focused', true); - this.stopEvent(event); + this.isDragging = true; + + return false; } private onMouseMove(event: MouseEvent) { + if (!this.isDragging) { + return; + } + const relativeValue = this.getRelativeX(event); - this.setThumbPosition(relativeValue); + this.value = Math.round((relativeValue * (this.max - this.min) + this.min) / this.step) * this.step; + + this.updateThumbPosition(); + this.updateTouched(); - this.stopEvent(event); + return false; } private onMouseUp(event: MouseEvent) { - const relativeValue = this.getRelativeX(event); - - const newValue = Math.round(relativeValue * (this.max - this.min) + this.min); - - if (newValue !== this.startValue) { - this.valueChange.emit(newValue); - } + this.updateValue(); - this.releaseMouseHandlers(); - this.renderer.setElementClass(this.thumb.nativeElement, 'focused', false); + setTimeout(() => { + this.releaseMouseHandlers(); + this.renderer.setElementClass(this.thumb.nativeElement, 'focused', false); + }, 10); this.centerStartOffset = 0; - this.stopEvent(event); + this.isDragging = false; + + return false; } private getRelativeX(event: MouseEvent): number { @@ -115,20 +152,30 @@ export class SliderComponent implements OnChanges { private getParentX(e: any, container: any): number { const rect = container.getBoundingClientRect(); - const x = !!e.touches ? e.touches[0].pageX : e.pageX; + const x = + !!e.touches ? + e.touches[0].pageX : + e.pageX; return x - rect.left; } - private setThumbPosition(relativeValue: number) { - relativeValue = Math.min(1, Math.max(0, relativeValue)); + private updateTouched() { + this.touchedCallback(); + } + + private updateValue() { + if (this.lastValue !== this.value) { + this.lastValue = this.value; - this.renderer.setElementStyle(this.thumb.nativeElement, 'left', relativeValue * 100 + '%'); + this.changeCallback(this.value); + } } - private stopEvent(event: Event) { - event.preventDefault(); - event.stopPropagation(); + private updateThumbPosition() { + const relativeValue = Math.min(1, Math.max(0, (this.value - this.min) / (this.max - this.min))); + + this.renderer.setElementStyle(this.thumb.nativeElement, 'left', relativeValue * 100 + '%'); } private releaseMouseHandlers() { @@ -141,5 +188,7 @@ export class SliderComponent implements OnChanges { this.mouseUpSubscription(); this.mouseUpSubscription = null; } + + this.isDragging = false; } } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/tag-editor.component.html b/src/Squidex/app/framework/angular/tag-editor.component.html new file mode 100644 index 000000000..a393781ad --- /dev/null +++ b/src/Squidex/app/framework/angular/tag-editor.component.html @@ -0,0 +1,11 @@ + + +
    + + {{item}} + +
    \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/tag-editor.component.scss b/src/Squidex/app/framework/angular/tag-editor.component.scss new file mode 100644 index 000000000..b7518e28a --- /dev/null +++ b/src/Squidex/app/framework/angular/tag-editor.component.scss @@ -0,0 +1,39 @@ +@import '_mixins'; +@import '_vars'; + +.items { + margin-top: .4rem; + min-height: 1.6rem; +} + +.item { + & { + @include border-radius(.8rem); + display: inline-block; + color: $color-accent-dark; + margin-right: .4rem; + margin-bottom: .3rem; + min-height: 1.6rem; + padding: 0 .6rem; + background: $color-theme-blue; + border: 0; + font-size: .8rem; + font-weight: normal; + line-height: 1.6rem; + } + + &.disabled { + & { + pointer-events: none; + } + + &, + &:hover { + background: $color-theme-blue-light; + } + } + + &:hover { + background: $color-theme-blue-dark; + } +} \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/tag-editor.component.ts b/src/Squidex/app/framework/angular/tag-editor.component.ts new file mode 100644 index 000000000..a7ac04e63 --- /dev/null +++ b/src/Squidex/app/framework/angular/tag-editor.component.ts @@ -0,0 +1,138 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Sebastian Stehle. All rights reserved + */ + +import { Component, forwardRef, Input } from '@angular/core'; +import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from '@angular/forms'; + +/* tslint:disable:no-empty */ + +const KEY_ENTER = 13; +const NOOP = () => { }; + +export interface Converter { + convert(input: string): any; + + isValid(input: string): boolean; +} + +export class IntConverter implements Converter { + public isValid(input: string): boolean { + return !!parseInt(input, 10) || input === '0'; + } + + public convert(input: string): any { + return parseInt(input, 10) || 0; + } +} + +export class FloatConverter implements Converter { + public isValid(input: string): boolean { + return !!parseFloat(input) || input === '0'; + } + + public convert(input: string): any { + return parseFloat(input) || 0; + } +} + +export class NoopConverter implements Converter { + public isValid(input: string): boolean { + return input.trim().length > 0; + } + + public convert(input: string): any { + return input.trim(); + } +} + +export const SQX_TAG_EDITOR_CONTROL_VALUE_ACCESSOR: any = { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => TagEditorComponent), + multi: true +}; + +@Component({ + selector: 'sqx-tag-editor', + styleUrls: ['./tag-editor.component.scss'], + templateUrl: './tag-editor.component.html', + providers: [SQX_TAG_EDITOR_CONTROL_VALUE_ACCESSOR] +}) +export class TagEditorComponent implements ControlValueAccessor { + private changeCallback: (value: any) => void = NOOP; + private touchedCallback: () => void = NOOP; + + public addInput = new FormControl(); + + @Input() + public converter: Converter = new NoopConverter(); + + @Input() + public useDefaultValue: boolean = true; + + @Input() + public inputName: string = 'tag-editor'; + + public items: any[] = []; + + public writeValue(value: any) { + this.addInput.setValue(''); + + if (Array.isArray(value)) { + this.items = value; + } else { + this.items = []; + } + } + + public setDisabledState(isDisabled: boolean): void { + if (isDisabled) { + this.addInput.disable(); + } else { + this.addInput.enable(); + } + } + + public registerOnChange(fn: any) { + this.changeCallback = fn; + } + + public registerOnTouched(fn: any) { + this.touchedCallback = fn; + } + + public remove(index: number) { + this.updateItems([...this.items.slice(0, index), ...this.items.splice(index + 1)]); + } + + public onBlur() { + this.touchedCallback(); + } + + public onKeyDown(event: KeyboardEvent) { + if (event.keyCode === KEY_ENTER) { + const value = this.addInput.value; + + if (this.converter.isValid(value)) { + const converted = this.converter.convert(value); + + this.updateItems([...this.items, converted]); + this.addInput.reset(); + return false; + } + } + } + + private updateItems(items: string[]) { + this.items = items; + + if (items.length === 0 && this.useDefaultValue) { + this.changeCallback(undefined); + } else { + this.changeCallback(this.items); + } + } +} \ No newline at end of file diff --git a/src/Squidex/app/framework/declarations.ts b/src/Squidex/app/framework/declarations.ts index af9c39c0e..590bd9a94 100644 --- a/src/Squidex/app/framework/declarations.ts +++ b/src/Squidex/app/framework/declarations.ts @@ -26,6 +26,7 @@ export * from './angular/scroll-active.directive'; export * from './angular/shortcut.component'; export * from './angular/slider.component'; export * from './angular/spinner.component'; +export * from './angular/tag-editor.component'; export * from './angular/title.component'; export * from './angular/user-report.component'; export * from './configurations'; diff --git a/src/Squidex/app/framework/module.ts b/src/Squidex/app/framework/module.ts index 3e9f9c5c3..a204f116c 100644 --- a/src/Squidex/app/framework/module.ts +++ b/src/Squidex/app/framework/module.ts @@ -35,6 +35,7 @@ import { ShortTimePipe, SliderComponent, SpinnerComponent, + TagEditorComponent, TitleComponent, UserReportComponent } from './declarations'; @@ -71,6 +72,7 @@ import { ShortTimePipe, SliderComponent, SpinnerComponent, + TagEditorComponent, TitleComponent, UserReportComponent ], @@ -98,6 +100,7 @@ import { ShortTimePipe, SliderComponent, SpinnerComponent, + TagEditorComponent, TitleComponent, UserReportComponent, HttpModule, diff --git a/src/Squidex/app/shared/components/app-form.component.html b/src/Squidex/app/shared/components/app-form.component.html index f4baa2aa3..014a6fe6b 100644 --- a/src/Squidex/app/shared/components/app-form.component.html +++ b/src/Squidex/app/shared/components/app-form.component.html @@ -8,15 +8,15 @@
    -
    +
    - + Name is required. - + Name can not have more than 40 characters. - + Name can contain lower case letters (a-z), numbers and dashes only (not at the end).
    diff --git a/src/Squidex/app/shared/components/history.component.ts b/src/Squidex/app/shared/components/history.component.ts index 9c2402957..a4bf3d315 100644 --- a/src/Squidex/app/shared/components/history.component.ts +++ b/src/Squidex/app/shared/components/history.component.ts @@ -5,24 +5,18 @@ * Copyright (c) Sebastian Stehle. All rights reserved */ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Observable, Subscription } from 'rxjs'; +import { Observable } from 'rxjs'; -import { - ImmutableArray, - MessageBus, - NotificationService -} from 'framework'; +import { MessageBus, NotificationService } from 'framework'; import { AppComponentBase } from './../app-component-base'; import { AppsStoreService } from './../services/apps-store.service'; import { HistoryChannelUpdated } from './../utils/messages'; -import { HistoryEventDto, HistoryService } from './../services/history.service'; +import { HistoryService } from './../services/history.service'; import { UsersProviderService } from './../services/users-provider.service'; -const FALLBACK_NAME = 'my-app'; -const REPLACEMENT_REGEXP = new RegExp('{([^\s:]*):([^}]*)}'); const REPLACEMENT_TEMP = '$TEMP$'; @Component({ diff --git a/src/Squidex/app/theme/_bootstrap.scss b/src/Squidex/app/theme/_bootstrap.scss index c20d83350..4b78a3178 100644 --- a/src/Squidex/app/theme/_bootstrap.scss +++ b/src/Squidex/app/theme/_bootstrap.scss @@ -144,6 +144,11 @@ } } +.col-form-label, +.col-form-checkbox-label { + text-align: right; +} + .form-hint { & { font-size: .8rem; @@ -239,6 +244,50 @@ font-weight: normal; } + &-radio { + & { + color: darken($color-border, 20%); + cursor: pointer; + border: 1px solid $color-border; + background: transparent; + margin-right: .5rem; + font-size: 1.5rem; + font-weight: normal; + text-align: center; + width: 4.5rem; + } + + .radio-label { + display: block; + font-size: .7rem; + font-weight: bold; + margin-left: -.5rem; + margin-right: -.5rem; + line-height: 1.5rem; + } + + &.active { + & { + @include box-shadow(0, 0, 10px, .5); + background: $color-theme-blue; + border: 0; + color: $color-accent-dark; + } + + &:hover { + color: $color-accent-dark; + } + } + + &:hover { + color: $color-theme-blue; + } + + .radio-input { + display: none; + } + } + &-link { &.btn-danger { @include link-button($color-theme-error); diff --git a/src/Squidex/app/theme/_vars.scss b/src/Squidex/app/theme/_vars.scss index 87ca497ce..469098c8d 100644 --- a/src/Squidex/app/theme/_vars.scss +++ b/src/Squidex/app/theme/_vars.scss @@ -3,6 +3,7 @@ $color-border: #dbe4eb; $color-text: #373a3c; $color-empty: #777; +$color-control: rgba(0, 0, 0, 0.15); $color-theme-blue: #438cef; $color-theme-blue-dark: #3f83df; diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot index 7b8167f5c..a53ae3c8c 100644 Binary files a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot and b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot differ diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg index 8301b68b7..e3d6936fd 100644 --- a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg +++ b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg @@ -15,7 +15,16 @@ + + + + + + + + + diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf index 2d6285f72..3e5eb9082 100644 Binary files a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf and b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf differ diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.woff b/src/Squidex/app/theme/icomoon/fonts/icomoon.woff index b14d6e6ac..cde5f4dcb 100644 Binary files a/src/Squidex/app/theme/icomoon/fonts/icomoon.woff and b/src/Squidex/app/theme/icomoon/fonts/icomoon.woff differ diff --git a/src/Squidex/app/theme/icomoon/selection.json b/src/Squidex/app/theme/icomoon/selection.json index baffbab6a..c073fb12c 100644 --- a/src/Squidex/app/theme/icomoon/selection.json +++ b/src/Squidex/app/theme/icomoon/selection.json @@ -1,6 +1,357 @@ { "IcoMoonType": "selection", "icons": [ + { + "icon": { + "paths": [ + "M170.667 707.048c-80.774 0-146.286 65.512-146.286 146.286s65.512 146.286 146.286 146.286c80.774 0 146.286-65.512 146.286-146.286s-65.512-146.286-146.286-146.286zM170.667 950.857c-53.858 0-97.524-43.666-97.524-97.524s43.666-97.524 97.524-97.524c53.858 0 97.524 43.666 97.524 97.524s-43.666 97.524-97.524 97.524zM390.095 195.048c-13.458 0-24.381-10.898-24.381-24.381s10.923-24.381 24.381-24.381h585.143c13.483 0 24.381 10.898 24.381 24.381s-10.898 24.381-24.381 24.381h-585.143zM975.238 487.619c13.483 0 24.381 10.898 24.381 24.381s-10.898 24.381-24.381 24.381h-585.143c-13.458 0-24.381-10.898-24.381-24.381s10.923-24.381 24.381-24.381h585.143zM170.667 24.381c-80.774 0-146.286 65.512-146.286 146.286s65.512 146.286 146.286 146.286c80.774 0 146.286-65.512 146.286-146.286s-65.512-146.286-146.286-146.286zM170.667 268.19c-53.858 0-97.524-43.666-97.524-97.524s43.666-97.524 97.524-97.524c53.858 0 97.524 43.666 97.524 97.524s-43.666 97.524-97.524 97.524zM170.667 365.714c-80.774 0-146.286 65.512-146.286 146.286s65.512 146.286 146.286 146.286c80.774 0 146.286-65.512 146.286-146.286s-65.512-146.286-146.286-146.286zM170.667 609.524c-53.858 0-97.524-43.666-97.524-97.524s43.666-97.524 97.524-97.524c53.858 0 97.524 43.666 97.524 97.524s-43.666 97.524-97.524 97.524zM170.667 121.905c26.917 0 48.762 21.845 48.762 48.762s-21.845 48.762-48.762 48.762c-26.917 0-48.762-21.845-48.762-48.762s21.845-48.762 48.762-48.762zM975.238 828.952c13.483 0 24.381 10.898 24.381 24.381s-10.898 24.381-24.381 24.381h-585.143c-13.458 0-24.381-10.898-24.381-24.381s10.923-24.381 24.381-24.381h585.143z" + ], + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "Icon_Radio" + ] + }, + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "properties": { + "order": 41, + "id": 10, + "name": "control-radio", + "prevSize": 32, + "code": 59661 + }, + "setIdx": 0, + "setId": 6, + "iconIdx": 0 + }, + { + "icon": { + "paths": [ + "M97.897 122.251c-13.477 0-24.37-10.943-24.37-24.371 0-13.477 10.894-24.371 24.37-24.371h292.443c13.452 0 24.37 10.894 24.37 24.371 0 13.453-10.918 24.371-24.37 24.371h-121.851v316.829c0 13.453-10.918 24.371-24.37 24.371-13.477 0-24.37-10.918-24.37-24.371v-316.829h-121.851zM926.487 707.142c13.452 0 24.37 10.894 24.37 24.371s-10.894 24.371-24.37 24.371h-170.592v170.6c0 13.477-10.894 24.371-24.37 24.371s-24.37-10.894-24.37-24.371v-341.201c0-13.477 10.894-24.371 24.37-24.371h194.962c13.477 0 24.37 10.894 24.37 24.371s-10.894 24.371-24.37 24.371h-170.592v97.486h170.592zM943.351 80.235c9.456 9.481 9.456 24.859 0 34.315l-828.785 828.801c-9.456 9.481-24.809 9.481-34.313 0-9.48-9.481-9.48-24.835 0-34.315l828.785-828.801c9.456-9.456 24.833-9.456 34.313 0z" + ], + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "Icon_Bolean" + ] + }, + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "properties": { + "order": 30, + "id": 8, + "name": "type-boolean", + "prevSize": 32, + "code": 59652 + }, + "setIdx": 0, + "setId": 6, + "iconIdx": 2 + }, + { + "icon": { + "paths": [ + "M768 844.8v-256h51.2v281.6c0 28.262-22.938 51.2-51.2 51.2h-716.8c-28.262 0-51.2-22.938-51.2-51.2v-716.8c0-28.262 22.938-51.2 51.2-51.2h716.8c28.262 0 51.2 22.938 51.2 51.2v128h-51.2v-102.4c0-14.157-11.443-25.6-25.6-25.6h-665.6c-14.131 0-25.6 11.443-25.6 25.6v665.6c0 14.157 11.469 25.6 25.6 25.6h665.6c14.157 0 25.6-11.443 25.6-25.6zM1016.678 212.147c9.933 9.907 9.933 26.010 0 35.942l-408.448 408.474c-0.461 0.512-0.614 1.178-1.126 1.69-5.043 5.018-11.674 7.475-18.278 7.373-6.605 0.102-13.235-2.355-18.278-7.373-0.512-0.486-0.666-1.152-1.126-1.69l-254.874-254.874c-9.933-9.933-9.933-26.035 0-35.942 9.907-9.958 26.010-9.958 35.942 0l238.31 238.285 391.91-391.885c9.933-9.958 26.010-9.958 35.968 0z" + ], + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "Icon_CheckBox" + ] + }, + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "properties": { + "order": 31, + "id": 7, + "name": "control-checkbox", + "prevSize": 32, + "code": 59654 + }, + "setIdx": 0, + "setId": 6, + "iconIdx": 3 + }, + { + "icon": { + "paths": [ + "M146.286 633.905c-40.375 0-73.143 32.744-73.143 73.143s32.768 73.143 73.143 73.143c40.375 0 73.143-32.744 73.143-73.143s-32.768-73.143-73.143-73.143zM146.286 731.429c-13.483 0-24.381-10.898-24.381-24.381s10.898-24.381 24.381-24.381c13.483 0 24.381 10.898 24.381 24.381s-10.898 24.381-24.381 24.381zM146.286 828.952c-40.375 0-73.143 32.744-73.143 73.143s32.768 73.143 73.143 73.143c40.375 0 73.143-32.744 73.143-73.143s-32.768-73.143-73.143-73.143zM146.286 926.476c-13.483 0-24.381-10.898-24.381-24.381s10.898-24.381 24.381-24.381c13.483 0 24.381 10.898 24.381 24.381s-10.898 24.381-24.381 24.381zM950.857 24.381h-877.714c-26.917 0-48.762 21.845-48.762 48.762v268.19c0 26.917 21.845 48.762 48.762 48.762h877.714c26.917 0 48.762-21.845 48.762-48.762v-268.19c0-26.917-21.845-48.762-48.762-48.762zM585.143 341.333h-487.619c-13.483 0-24.381-10.898-24.381-24.381v-219.429c0-13.483 10.898-24.381 24.381-24.381h487.619v268.19zM950.857 316.952c0 13.483-10.898 24.381-24.381 24.381h-292.571v-268.19h292.571c13.483 0 24.381 10.898 24.381 24.381v219.429zM926.476 487.619c13.483 0 24.381 10.898 24.381 24.381s-10.898 24.381-24.381 24.381h-609.524c-13.483 0-24.381-10.898-24.381-24.381s10.898-24.381 24.381-24.381h609.524zM926.476 682.667c13.483 0 24.381 10.898 24.381 24.381s-10.898 24.381-24.381 24.381h-609.524c-13.483 0-24.381-10.898-24.381-24.381s10.898-24.381 24.381-24.381h609.524zM926.476 877.714c13.483 0 24.381 10.898 24.381 24.381s-10.898 24.381-24.381 24.381h-609.524c-13.483 0-24.381-10.898-24.381-24.381s10.898-24.381 24.381-24.381h609.524zM146.286 438.857c-40.375 0-73.143 32.768-73.143 73.143s32.768 73.143 73.143 73.143c40.375 0 73.143-32.768 73.143-73.143s-32.768-73.143-73.143-73.143zM146.286 536.381c-13.483 0-24.381-10.898-24.381-24.381s10.898-24.381 24.381-24.381c13.483 0 24.381 10.898 24.381 24.381s-10.898 24.381-24.381 24.381zM707.048 170.667c6.729 0 170.667 0.366 170.667 0 0 6.705-84.846 97.524-85.333 97.524-0.414 0.512-85.699-97.182-85.333-97.524z" + ], + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "Icon_Dropdown" + ] + }, + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "properties": { + "order": 32, + "id": 6, + "name": "control-dropdown", + "prevSize": 32, + "code": 59655 + }, + "setIdx": 0, + "setId": 6, + "iconIdx": 4 + }, + { + "icon": { + "paths": [ + "M298.374 341.285c-0.585-0.098-1.122-0.098-1.707-0.146-0.561 0.049-1.097 0.049-1.682 0.146-7.851 0.049-15.579 4.267-19.846 12.434l-126.22 291.669c-6.363 12.142-2.755 27.575 8.070 34.45s24.747 2.609 31.086-9.533l26.307-60.806c0.049 0 0.073 0.024 0.098 0.024h162.28c0.488 0 0.853-0.219 1.317-0.244l26.161 61.026c6.315 12.142 20.139 16.408 30.866 9.533s14.287-22.309 7.997-34.45l-125.050-291.669c-4.242-8.168-11.874-12.361-19.675-12.434zM235.496 560.762l61.172-141.385 60.611 141.385zM950.857 243.81c26.917 0 48.762 21.845 48.762 48.762v438.857c0 26.917-21.845 48.762-48.762 48.762h-219.429v-48.762h195.048c13.483 0 24.381-10.898 24.381-24.381v-390.095c0-13.483-10.898-24.381-24.381-24.381h-195.048v-48.762h219.429zM585.143 780.19h-512c-26.917 0-48.762-21.845-48.762-48.762v-438.857c0-26.917 21.845-48.762 48.762-48.762h512v48.762h-487.619c-13.458 0-24.381 10.898-24.381 24.381v390.095c0 13.483 10.923 24.381 24.381 24.381h487.619zM804.571 926.476c13.483 0 24.381 10.898 24.381 24.381s-10.898 24.381-24.381 24.381h-292.571c-13.483 0-24.381-10.898-24.381-24.381s10.898-24.381 24.381-24.381h121.905v-828.952h-121.905c-13.483 0-24.381-10.898-24.381-24.381s10.898-24.381 24.381-24.381h292.571c13.483 0 24.381 10.898 24.381 24.381s-10.898 24.381-24.381 24.381h-121.905v828.952h121.905z" + ], + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "Icon_Input" + ] + }, + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "properties": { + "order": 33, + "id": 5, + "name": "control-input", + "prevSize": 32, + "code": 59656 + }, + "setIdx": 0, + "setId": 6, + "iconIdx": 5 + }, + { + "icon": { + "paths": [ + "M268.19 658.286c13.458 0 24.381 10.923 24.381 24.381s-10.923 24.381-24.381 24.381h-195.048c-13.458 0-24.381-10.923-24.381-24.381s10.923-24.381 24.381-24.381h73.143v-292.571h-48.762c-13.458 0-24.381-10.923-24.381-24.381s10.923-24.381 24.381-24.381h73.143c13.458 0 24.381 10.923 24.381 24.381v316.952h73.143zM609.524 316.952c13.458 0 24.381 10.923 24.381 24.381v170.667c0 13.458-10.923 24.381-24.381 24.381h-170.667v121.905h170.667c13.458 0 24.381 10.923 24.381 24.381s-10.923 24.381-24.381 24.381h-195.048c-13.458 0-24.381-10.923-24.381-24.381v-170.667c0-13.458 10.923-24.381 24.381-24.381h170.667v-121.905h-170.667c-13.458 0-24.381-10.923-24.381-24.381s10.923-24.381 24.381-24.381h195.048zM950.857 316.952c13.458 0 24.381 10.923 24.381 24.381v341.333c0 13.458-10.923 24.381-24.381 24.381h-195.048c-13.458 0-24.381-10.923-24.381-24.381s10.923-24.381 24.381-24.381h170.667v-121.905h-170.667c-13.458 0-24.381-10.923-24.381-24.381s10.923-24.381 24.381-24.381h170.667v-121.905h-170.667c-13.458 0-24.381-10.923-24.381-24.381s10.923-24.381 24.381-24.381h195.048z" + ], + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "Icon_Number" + ] + }, + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "properties": { + "order": 34, + "id": 4, + "name": "type-number", + "prevSize": 32, + "code": 59657 + }, + "setIdx": 0, + "setId": 6, + "iconIdx": 6 + }, + { + "icon": { + "paths": [ + "M97.524 585.143h48.762v97.524h-48.762zM97.524 292.571h48.762v-73.143h73.143v-195.048h-195.048v195.048h73.143zM73.143 170.667v-97.524h97.524v97.524zM146.286 487.619h-48.762v-97.524h48.762zM804.571 24.381v195.048h195.048v-195.048zM950.857 170.667h-97.524v-97.524h97.524zM780.19 146.286h-97.524v-48.762h97.524zM585.143 146.286h-97.524v-48.762h97.524zM390.095 146.286h-97.524v-48.762h97.524zM390.095 877.714h97.524v48.762h-97.524zM585.143 877.714h97.524v48.762h-97.524zM772.974 298.277c9.874 9.923 9.874 25.966 0 35.84-9.923 9.874-25.941 9.874-35.84 0l-65.926-65.926h-134.827v463.238h48.494c6.827-0.293 13.726 1.999 18.944 7.217l22.869 22.869c9.874 9.923 9.874 25.941 0 35.84-9.899 9.874-25.941 9.874-35.84 0l-17.164-17.164h-123.611l-16.433 16.457c-9.801 9.826-25.771 9.826-35.596 0s-9.826-25.771 0-35.596l22.455-22.455c5.169-5.193 12.044-7.461 18.846-7.168h48.274v-463.238h-135.095l-65.195 65.219c-9.801 9.826-25.771 9.826-35.596 0s-9.826-25.795 0-35.596l71.217-71.192c5.169-5.193 12.044-7.485 18.822-7.192h340.626c6.827-0.293 13.726 1.999 18.944 7.217l71.631 71.631zM877.714 682.667h48.762v97.524h-48.762zM219.429 804.571h-73.143v-24.381h-48.762v24.381h-73.143v195.048h195.048v-73.143h73.143v-48.762h-73.143zM170.667 950.857h-97.524v-97.524h97.524zM926.476 390.095h-48.762v-97.524h48.762zM877.714 487.619h48.762v97.524h-48.762zM804.571 877.714h-24.381v48.762h24.381v73.143h195.048v-195.048h-195.048zM853.333 853.333h97.524v97.524h-97.524z" + ], + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "Icon_Text Area" + ] + }, + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "properties": { + "order": 39, + "id": 2, + "name": "control-textarea", + "prevSize": 32, + "code": 59658 + }, + "setIdx": 0, + "setId": 6, + "iconIdx": 8 + }, + { + "icon": { + "paths": [ + "M853.333 902.095h-682.667c-13.458 0-24.381 10.898-24.381 24.381s10.923 24.381 24.381 24.381h682.667c13.483 0 24.381-10.898 24.381-24.381s-10.898-24.381-24.381-24.381zM209.822 802.621c12.386 5.291 26.722-0.439 32.012-12.8l119.052-277.821h302.226l119.052 277.821c3.974 9.216 12.922 14.75 22.406 14.75 3.243 0 6.485-0.61 9.63-1.95 12.386-5.339 18.091-19.675 12.8-32.037l-125.342-292.352c-0.049-0.049-0.049-0.146-0.098-0.195l-167.131-390.095c-3.852-8.997-12.678-14.799-22.43-14.799s-18.578 5.803-22.43 14.775l-167.156 390.095c-0.049 0.049-0.049 0.146-0.098 0.195l-125.318 292.352c-5.266 12.386 0.439 26.722 12.824 32.061zM512 159.403l130.194 303.835h-260.389l130.194-303.835z" + ], + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "Icon_Text Icon" + ] + }, + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + } + ], + "properties": { + "order": 37, + "id": 1, + "name": "type-string", + "prevSize": 32, + "code": 59659 + }, + "setIdx": 0, + "setId": 6, + "iconIdx": 9 + }, + { + "icon": { + "paths": [ + "M682.667 48.762h-341.333c-121.198 0-219.429 98.231-219.429 219.429s98.231 219.429 219.429 219.429h341.333c121.198 0 219.429-98.231 219.429-219.429s-98.231-219.429-219.429-219.429zM682.667 438.857h-341.333c-94.257 0-170.667-76.41-170.667-170.667s76.41-170.667 170.667-170.667h341.333c94.257 0 170.667 76.41 170.667 170.667s-76.41 170.667-170.667 170.667z", + "M341.333 146.286c-67.34 0-121.905 54.565-121.905 121.905s54.565 121.905 121.905 121.905c67.34 0 121.905-54.565 121.905-121.905s-54.565-121.905-121.905-121.905zM341.333 341.333c-40.399 0-73.143-32.744-73.143-73.143s32.744-73.143 73.143-73.143c40.399 0 73.143 32.744 73.143 73.143s-32.744 73.143-73.143 73.143z", + "M121.905 755.81c0 121.198 98.231 219.429 219.429 219.429h341.333c121.198 0 219.429-98.231 219.429-219.429s-98.231-219.429-219.429-219.429h-341.333c-121.198 0-219.429 98.231-219.429 219.429zM170.667 755.81c0-94.257 76.41-170.667 170.667-170.667h341.333c94.257 0 170.667 76.41 170.667 170.667s-76.41 170.667-170.667 170.667h-341.333c-94.257 0-170.667-76.41-170.667-170.667z", + "M560.762 755.81c0 67.34 54.565 121.905 121.905 121.905s121.905-54.565 121.905-121.905c0-67.34-54.565-121.905-121.905-121.905s-121.905 54.565-121.905 121.905zM609.524 755.81c0-40.399 32.744-73.143 73.143-73.143s73.143 32.744 73.143 73.143c0 40.399-32.744 73.143-73.143 73.143s-73.143-32.744-73.143-73.143z" + ], + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + }, + { + "fill": "rgb(67, 140, 239)" + }, + { + "fill": "rgb(67, 140, 239)" + }, + { + "fill": "rgb(67, 140, 239)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "Icon_Toggle" + ] + }, + "attrs": [ + { + "fill": "rgb(67, 140, 239)" + }, + { + "fill": "rgb(67, 140, 239)" + }, + { + "fill": "rgb(67, 140, 239)" + }, + { + "fill": "rgb(67, 140, 239)" + } + ], + "properties": { + "order": 38, + "id": 0, + "name": "control-toggle", + "prevSize": 32, + "code": 59660 + }, + "setIdx": 0, + "setId": 6, + "iconIdx": 10 + }, + { + "icon": { + "paths": [ + "M512.34 20.48c-0.174 0.065-226.41 96.5-283.902 294.74-5.545 19.035 40.453 10.673 38.399 31.6-2.517 25.409-55.264 35.821-48.385 108.78 7.001 74.289 74.617 149.342 84.791 194.72v31.78c-0.615 9.802-5.639 36.405-22.285 49.4-9.13 7.105-21.442 9.661-37.671 7.78-22.528-2.612-31.493-16.604-35.078-27.9-5.881-18.616-0.409-40.331 12.793-50.52 13.271-10.243 15.084-28.513 4.029-40.82-11.055-12.296-30.785-13.965-44.056-3.7-32.168 24.839-45.65 70.615-32.785 111.34 12.146 38.328 44.789 64.147 87.363 69.080 6.067 0.699 11.848 1.040 17.335 1.040 32.945 0 55.27-11.669 68.785-22.32 40.671-32.105 43.867-85.623 44.099-91.62 0.011-0.355 0.022-0.705 0.022-1.060v-24.36h0.129v-1.64c0-14.177 12.394-25.66 27.707-25.66 14.869 0 26.889 10.843 27.578 24.46v232.2c-0.255 3.343-3.155 34.297-22.157 49.28-9.118 7.201-21.512 9.802-37.799 7.9-22.54-2.612-31.526-16.605-35.099-27.88-5.893-18.627-0.387-40.341 12.814-50.52 13.271-10.254 15.062-28.523 4.007-40.84-11.044-12.274-30.764-13.945-44.035-3.68-32.191 24.828-45.65 70.615-32.785 111.34 12.122 38.328 44.789 64.136 87.363 69.080 6.067 0.699 11.848 1.040 17.335 1.040 32.945 0 55.262-11.669 68.742-22.32 40.683-32.105 43.879-85.623 44.099-91.62 0.024-0.376 0.042-0.696 0.042-1.040v-259l0.129-0.060v-1.14c0-14.456 12.65-26.18 28.264-26.18 15.288 0 27.657 11.292 28.135 25.36v261.020c0 0.355-0.002 0.675 0.022 1.040 0.232 5.987 3.438 59.515 44.121 91.62 13.504 10.652 35.819 22.32 68.764 22.32 5.499 0 11.258-0.341 17.314-1.040 42.562-4.944 75.24-30.763 87.363-69.080 12.876-40.725-0.584-86.501-32.764-111.34-13.294-10.265-33.013-8.584-44.056 3.68-11.055 12.328-9.264 30.586 4.007 40.84 13.201 10.179 18.697 31.893 12.793 50.52-3.561 11.275-12.55 25.268-35.078 27.88-16.217 1.892-28.531-0.675-37.649-7.78-16.716-13.038-21.715-39.783-22.307-49.36v-231.8c0.445-13.816 12.612-24.9 27.642-24.9 15.313 0 27.707 11.472 27.707 25.66v1.64h0.085v24.36c0 0.365-0.002 0.716 0.022 1.060 0.22 5.987 3.438 59.515 44.121 91.62 13.503 10.651 35.818 22.32 68.763 22.32 5.487 0 11.259-0.332 17.314-1.020 42.562-4.933 75.24-30.783 87.363-69.1 12.876-40.725-0.606-86.49-32.785-111.34-13.294-10.254-33.003-8.576-44.035 3.72-11.067 12.307-9.285 30.557 3.986 40.8 13.201 10.189 18.719 31.904 12.814 50.52-3.561 11.296-12.571 25.299-35.099 27.9-16.194 1.892-28.51-0.686-37.628-7.78-16.716-13.048-21.727-39.785-22.307-49.34v-24.24c6.634-62.066 78.084-123.637 85.499-202.32 6.844-72.959-45.943-83.371-48.449-108.78-2.065-20.927 43.943-12.565 38.421-31.6-57.503-198.24-283.718-294.675-283.88-294.74z" + ], + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "logo" + ] + }, + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + } + ], + "properties": { + "order": 3, + "id": 0, + "name": "logo", + "prevSize": 32, + "code": 59648 + }, + "setIdx": 5, + "setId": 1, + "iconIdx": 12 + }, { "icon": { "paths": [ @@ -26,7 +377,7 @@ "code": 59651, "name": "dots" }, - "setIdx": 0, + "setIdx": 2, "setId": 4, "iconIdx": 0 }, @@ -57,7 +408,7 @@ "prevSize": 32, "code": 59650 }, - "setIdx": 1, + "setIdx": 3, "setId": 3, "iconIdx": 0 }, @@ -84,7 +435,7 @@ "code": 59573, "name": "time" }, - "setIdx": 2, + "setIdx": 4, "setId": 2, "iconIdx": 4 }, @@ -111,7 +462,7 @@ "code": 58829, "name": "close" }, - "setIdx": 2, + "setIdx": 4, "setId": 2, "iconIdx": 157 }, @@ -138,7 +489,7 @@ "code": 59389, "name": "person" }, - "setIdx": 2, + "setIdx": 4, "setId": 2, "iconIdx": 557 }, @@ -165,7 +516,7 @@ "code": 59574, "name": "search" }, - "setIdx": 2, + "setIdx": 4, "setId": 2, "iconIdx": 655 }, @@ -194,7 +545,7 @@ "code": 59649, "name": "plus" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 11 }, @@ -223,7 +574,7 @@ "prevSize": 32, "code": 59653 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 0 }, @@ -256,7 +607,7 @@ "prevSize": 32, "code": 59662 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 1 }, @@ -288,7 +639,7 @@ "prevSize": 32, "code": 59685 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 2 }, @@ -320,7 +671,7 @@ "prevSize": 32, "code": 59692 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 3 }, @@ -348,7 +699,7 @@ "prevSize": 32, "code": 59694 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 4 }, @@ -377,7 +728,7 @@ "prevSize": 32, "code": 59713 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 5 }, @@ -408,7 +759,7 @@ "prevSize": 32, "code": 59725 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 6 }, @@ -441,7 +792,7 @@ "prevSize": 32, "code": 59796 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 7 }, @@ -472,7 +823,7 @@ "prevSize": 32, "code": 59814 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 8 }, @@ -505,7 +856,7 @@ "prevSize": 32, "code": 59820 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 9 }, @@ -533,42 +884,9 @@ "prevSize": 32, "code": 59995 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 10 - }, - { - "icon": { - "paths": [ - "M512.34 20.48c-0.174 0.065-226.41 96.5-283.902 294.74-5.545 19.035 40.453 10.673 38.399 31.6-2.517 25.409-55.264 35.821-48.385 108.78 7.001 74.289 74.617 149.342 84.791 194.72v31.78c-0.615 9.802-5.639 36.405-22.285 49.4-9.13 7.105-21.442 9.661-37.671 7.78-22.528-2.612-31.493-16.604-35.078-27.9-5.881-18.616-0.409-40.331 12.793-50.52 13.271-10.243 15.084-28.513 4.029-40.82-11.055-12.296-30.785-13.965-44.056-3.7-32.168 24.839-45.65 70.615-32.785 111.34 12.146 38.328 44.789 64.147 87.363 69.080 6.067 0.699 11.848 1.040 17.335 1.040 32.945 0 55.27-11.669 68.785-22.32 40.671-32.105 43.867-85.623 44.099-91.62 0.011-0.355 0.022-0.705 0.022-1.060v-24.36h0.129v-1.64c0-14.177 12.394-25.66 27.707-25.66 14.869 0 26.889 10.843 27.578 24.46v232.2c-0.255 3.343-3.155 34.297-22.157 49.28-9.118 7.201-21.512 9.802-37.799 7.9-22.54-2.612-31.526-16.605-35.099-27.88-5.893-18.627-0.387-40.341 12.814-50.52 13.271-10.254 15.062-28.523 4.007-40.84-11.044-12.274-30.764-13.945-44.035-3.68-32.191 24.828-45.65 70.615-32.785 111.34 12.122 38.328 44.789 64.136 87.363 69.080 6.067 0.699 11.848 1.040 17.335 1.040 32.945 0 55.262-11.669 68.742-22.32 40.683-32.105 43.879-85.623 44.099-91.62 0.024-0.376 0.042-0.696 0.042-1.040v-259l0.129-0.060v-1.14c0-14.456 12.65-26.18 28.264-26.18 15.288 0 27.657 11.292 28.135 25.36v261.020c0 0.355-0.002 0.675 0.022 1.040 0.232 5.987 3.438 59.515 44.121 91.62 13.504 10.652 35.819 22.32 68.764 22.32 5.499 0 11.258-0.341 17.314-1.040 42.562-4.944 75.24-30.763 87.363-69.080 12.876-40.725-0.584-86.501-32.764-111.34-13.294-10.265-33.013-8.584-44.056 3.68-11.055 12.328-9.264 30.586 4.007 40.84 13.201 10.179 18.697 31.893 12.793 50.52-3.561 11.275-12.55 25.268-35.078 27.88-16.217 1.892-28.531-0.675-37.649-7.78-16.716-13.038-21.715-39.783-22.307-49.36v-231.8c0.445-13.816 12.612-24.9 27.642-24.9 15.313 0 27.707 11.472 27.707 25.66v1.64h0.085v24.36c0 0.365-0.002 0.716 0.022 1.060 0.22 5.987 3.438 59.515 44.121 91.62 13.503 10.651 35.818 22.32 68.763 22.32 5.487 0 11.259-0.332 17.314-1.020 42.562-4.933 75.24-30.783 87.363-69.1 12.876-40.725-0.606-86.49-32.785-111.34-13.294-10.254-33.003-8.576-44.035 3.72-11.067 12.307-9.285 30.557 3.986 40.8 13.201 10.189 18.719 31.904 12.814 50.52-3.561 11.296-12.571 25.299-35.099 27.9-16.194 1.892-28.51-0.686-37.628-7.78-16.716-13.048-21.727-39.785-22.307-49.34v-24.24c6.634-62.066 78.084-123.637 85.499-202.32 6.844-72.959-45.943-83.371-48.449-108.78-2.065-20.927 43.943-12.565 38.421-31.6-57.503-198.24-283.718-294.675-283.88-294.74z" - ], - "attrs": [ - { - "fill": "rgb(0, 0, 0)" - } - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "logo" - ] - }, - "attrs": [ - { - "fill": "rgb(0, 0, 0)" - } - ], - "properties": { - "order": 3, - "id": 0, - "name": "logo", - "prevSize": 32, - "code": 59648 - }, - "setIdx": 3, - "setId": 1, - "iconIdx": 12 } ], "height": 1024, diff --git a/src/Squidex/app/theme/icomoon/style.css b/src/Squidex/app/theme/icomoon/style.css index 2abe51bc8..a6f74f2eb 100644 --- a/src/Squidex/app/theme/icomoon/style.css +++ b/src/Squidex/app/theme/icomoon/style.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src: url('fonts/icomoon.eot?sp5644'); - src: url('fonts/icomoon.eot?sp5644#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?sp5644') format('truetype'), - url('fonts/icomoon.woff?sp5644') format('woff'), - url('fonts/icomoon.svg?sp5644#icomoon') format('svg'); + src: url('fonts/icomoon.eot?pmbjza'); + src: url('fonts/icomoon.eot?pmbjza#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?pmbjza') format('truetype'), + url('fonts/icomoon.woff?pmbjza') format('woff'), + url('fonts/icomoon.svg?pmbjza#icomoon') format('svg'); font-weight: normal; font-style: normal; } @@ -24,6 +24,36 @@ -moz-osx-font-smoothing: grayscale; } +.icon-control-radio:before { + content: "\e90d"; +} +.icon-type-boolean:before { + content: "\e904"; +} +.icon-control-checkbox:before { + content: "\e906"; +} +.icon-control-dropdown:before { + content: "\e907"; +} +.icon-control-input:before { + content: "\e908"; +} +.icon-type-number:before { + content: "\e909"; +} +.icon-control-textarea:before { + content: "\e90a"; +} +.icon-type-string:before { + content: "\e90b"; +} +.icon-control-toggle:before { + content: "\e90c"; +} +.icon-logo:before { + content: "\e900"; +} .icon-dots:before { content: "\e903"; } @@ -78,7 +108,4 @@ .icon-filter:before { content: "\ea5b"; } -.icon-logo:before { - content: "\e900"; -} diff --git a/src/Squidex/tslint.json b/src/Squidex/tslint.json index f62988398..169eb3d0f 100644 --- a/src/Squidex/tslint.json +++ b/src/Squidex/tslint.json @@ -50,6 +50,7 @@ "no-trailing-whitespace": true, "no-unused-expression": true, + "no-unused-variable": true, "no-use-before-declare": true, "no-var-keyword": true, "object-literal-sort-keys": false, diff --git a/tests/Squidex.Core.Tests/Schemas/NumberFieldPropertiesTests.cs b/tests/Squidex.Core.Tests/Schemas/NumberFieldPropertiesTests.cs index 22e88fd94..563d60af9 100644 --- a/tests/Squidex.Core.Tests/Schemas/NumberFieldPropertiesTests.cs +++ b/tests/Squidex.Core.Tests/Schemas/NumberFieldPropertiesTests.cs @@ -106,6 +106,34 @@ namespace Squidex.Core.Schemas }); } + [Fact] + public void Should_add_error_if_radio_button_has_no_allowed_values() + { + var sut = new NumberFieldProperties { Editor = NumberFieldEditor.Radio }; + + sut.Validate(errors); + + errors.ShouldBeEquivalentTo( + new List + { + new ValidationError("Radio buttons or dropdown list need allowed values", "AllowedValues") + }); + } + + [Fact] + public void Should_add_error_if_editor_is_not_valid() + { + var sut = new NumberFieldProperties { Editor = (NumberFieldEditor)123 }; + + sut.Validate(errors); + + errors.ShouldBeEquivalentTo( + new List + { + new ValidationError("Editor ist not a valid value", "Editor") + }); + } + [Fact] public void Should_set_or_freeze_sut() { diff --git a/tests/Squidex.Core.Tests/Schemas/StringFieldPropertiesTests.cs b/tests/Squidex.Core.Tests/Schemas/StringFieldPropertiesTests.cs index 0894b76f6..65b0b99ec 100644 --- a/tests/Squidex.Core.Tests/Schemas/StringFieldPropertiesTests.cs +++ b/tests/Squidex.Core.Tests/Schemas/StringFieldPropertiesTests.cs @@ -34,6 +34,34 @@ namespace Squidex.Core.Schemas }); } + [Fact] + public void Should_add_error_if_radio_button_has_no_allowed_values() + { + var sut = new StringFieldProperties { Editor = StringFieldEditor.Radio }; + + sut.Validate(errors); + + errors.ShouldBeEquivalentTo( + new List + { + new ValidationError("Radio buttons or dropdown list need allowed values", "AllowedValues") + }); + } + + [Fact] + public void Should_add_error_if_editor_is_not_valid() + { + var sut = new StringFieldProperties { Editor = (StringFieldEditor)123 }; + + sut.Validate(errors); + + errors.ShouldBeEquivalentTo( + new List + { + new ValidationError("Editor ist not a valid value", "Editor") + }); + } + [Fact] public void Should_add_error_if_pattern_is_not_valid_regex() { diff --git a/tests/Squidex.Core.Tests/project.json b/tests/Squidex.Core.Tests/project.json index fd700b753..0f8324962 100644 --- a/tests/Squidex.Core.Tests/project.json +++ b/tests/Squidex.Core.Tests/project.json @@ -28,6 +28,7 @@ "defaultNamespace": "Squidex.Core" }, "tools": { + "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final" }, "version": "1.0.0-*" } \ No newline at end of file