diff --git a/projects/rero/ng-core/assets/scss/_theme.scss b/projects/rero/ng-core/assets/scss/_theme.scss index 17554999..6abb96cc 100644 --- a/projects/rero/ng-core/assets/scss/_theme.scss +++ b/projects/rero/ng-core/assets/scss/_theme.scss @@ -42,7 +42,7 @@ a:hover:not(.p-button):not(.p-element):not([role=button]):not([role=tab]) { } dl.metadata { - @extend .grid, .my-0, .w-full; + @extend .grid, .my-0, .w-full, .p-2; dt { @extend .font-bold, .col-12, .py-0; @include styleclass('md:col-4'); @@ -59,7 +59,7 @@ dl.metadata { // bootstrap patches label { - @extend .m-0; + display: block; } legend { diff --git a/projects/rero/ng-core/assets/scss/_typography.scss b/projects/rero/ng-core/assets/scss/_typography.scss index fb945a9b..ab18f74b 100644 --- a/projects/rero/ng-core/assets/scss/_typography.scss +++ b/projects/rero/ng-core/assets/scss/_typography.scss @@ -118,8 +118,7 @@ h6, } .alternate-color > * { - @extend .block; - + display: block; &:nth-child(even) { @extend .surface-100; } diff --git a/projects/rero/ng-core/src/lib/dialog/dialog.component.ts b/projects/rero/ng-core/src/lib/dialog/dialog.component.ts index 57c64023..aab23c24 100644 --- a/projects/rero/ng-core/src/lib/dialog/dialog.component.ts +++ b/projects/rero/ng-core/src/lib/dialog/dialog.component.ts @@ -20,6 +20,7 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; @Component({ selector: 'ng-core-dialog', template: ` +
@@ -27,6 +28,7 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; }
+
` }) export class DialogComponent { diff --git a/projects/rero/ng-core/src/lib/record/detail/detail-button/detail-button.component.html b/projects/rero/ng-core/src/lib/record/detail/detail-button/detail-button.component.html index d3189309..1c859856 100644 --- a/projects/rero/ng-core/src/lib/record/detail/detail-button/detail-button.component.html +++ b/projects/rero/ng-core/src/lib/record/detail/detail-button/detail-button.component.html @@ -21,15 +21,14 @@ [label]="'Back'|translate" severity="secondary" [text]="true" - (onClick)="$event.preventDefault(); goBack()" + (onClick)="goBack()" /> -
+
@if (record() && adminMode().can) { @if (useStatus && useStatus.can && useStatus.url) {
} -
+
-
+
@if (data.link) { - + } @@ -85,9 +85,9 @@ export interface IRemoteAutoCompleteProps extends FormlyFieldProps {
} @else { -
+
- +
}
diff --git a/projects/rero/ng-core/src/lib/record/editor/type/array-type/array-type.component.html b/projects/rero/ng-core/src/lib/record/editor/type/array-type/array-type.component.html index 48afed67..21f90854 100644 --- a/projects/rero/ng-core/src/lib/record/editor/type/array-type/array-type.component.html +++ b/projects/rero/ng-core/src/lib/record/editor/type/array-type/array-type.component.html @@ -20,7 +20,7 @@ } -
+
@if (showError && formControl.errors) {
diff --git a/projects/rero/ng-core/src/lib/record/editor/type/object-type/object-type.component.html b/projects/rero/ng-core/src/lib/record/editor/type/object-type/object-type.component.html index a62bf7d9..2c2ffdee 100644 --- a/projects/rero/ng-core/src/lib/record/editor/type/object-type/object-type.component.html +++ b/projects/rero/ng-core/src/lib/record/editor/type/object-type/object-type.component.html @@ -14,10 +14,10 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> -@if (props.hideLabel !== true) { - -} -
+
+ @if (props.hideLabel !== true) { + + } @if (showError && formControl.errors) {
@@ -25,7 +25,7 @@ }
@for (f of field.fieldGroup; track f) { -
+
} diff --git a/projects/rero/ng-core/src/lib/record/editor/type/switch/switch.component.ts b/projects/rero/ng-core/src/lib/record/editor/type/switch/switch.component.ts index 94bfea32..1df7cdfd 100644 --- a/projects/rero/ng-core/src/lib/record/editor/type/switch/switch.component.ts +++ b/projects/rero/ng-core/src/lib/record/editor/type/switch/switch.component.ts @@ -19,7 +19,6 @@ import { FieldType, FormlyFieldConfig } from '@ngx-formly/core'; import { FormlyFieldProps } from '@ngx-formly/primeng/form-field'; interface SwitchProps extends FormlyFieldProps { - indeterminate: boolean; hideLabel: boolean; } @@ -29,13 +28,13 @@ interface SwitchProps extends FormlyFieldProps { @Component({ selector: 'ng-core-editor-formly-field-switch', template: ` -
- + - + [formlyAttributes]="field" + /> +
`, }) @@ -43,7 +42,6 @@ export class SwitchComponent extends FieldType> { /** Default properties */ defaultOptions: Partial> = { props: { - indeterminate: true, hideLabel: true, }, }; diff --git a/projects/rero/ng-core/src/lib/record/editor/widgets/add-field-editor/add-field-editor.component.ts b/projects/rero/ng-core/src/lib/record/editor/widgets/add-field-editor/add-field-editor.component.ts index 945c4514..b5b9c077 100644 --- a/projects/rero/ng-core/src/lib/record/editor/widgets/add-field-editor/add-field-editor.component.ts +++ b/projects/rero/ng-core/src/lib/record/editor/widgets/add-field-editor/add-field-editor.component.ts @@ -89,7 +89,6 @@ export class AddFieldEditorComponent implements OnInit, OnDestroy { onSelect(event: AutoCompleteSelectEvent): void { this.editorComponentInstance.setHide(event.value, false); - console.log('clear'); this.autocomplete.clear(); } diff --git a/projects/rero/ng-core/src/lib/record/editor/wrappers/form-field-wrapper/form-field-wrapper.component.ts b/projects/rero/ng-core/src/lib/record/editor/wrappers/form-field-wrapper/form-field-wrapper.component.ts index d1439677..74eaa120 100644 --- a/projects/rero/ng-core/src/lib/record/editor/wrappers/form-field-wrapper/form-field-wrapper.component.ts +++ b/projects/rero/ng-core/src/lib/record/editor/wrappers/form-field-wrapper/form-field-wrapper.component.ts @@ -20,7 +20,7 @@ import { FieldWrapper } from '@ngx-formly/core'; @Component({ selector: 'ng-core-form-field-wrapper', template: ` -
+
@if (props.label && props.hideLabel !== true) {