diff --git a/package-lock.json b/package-lock.json index e7d7f037..c6b15bf8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,13 +17,11 @@ "@angular/platform-browser": "^17.1.0", "@angular/platform-browser-dynamic": "^17.1.0", "@angular/router": "^17.1.0", - "@biesbjerg/ngx-translate-extract-marker": "^1.0.0", "@ngx-formly/core": "^6.3.6", "@ngx-formly/primeng": "^6.3.6", "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", "@types/marked": "^4.0.8", - "bootstrap": "^4.6.2", "crypto-js": "^4.2.0", "easymde": "^2.18.0", "font-awesome": "^4.7.0", @@ -50,6 +48,7 @@ "@angular/cli": "^17.1.0", "@angular/compiler-cli": "^17.1.0", "@angular/language-service": "^17.1.0", + "@biesbjerg/ngx-translate-extract-marker": "^1.0.0", "@ngx-formly/schematics": "^6.3.6", "@types/jasmine": "^5.1.4", "@typescript-eslint/eslint-plugin": "^6.19.1", @@ -2687,6 +2686,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/@biesbjerg/ngx-translate-extract-marker/-/ngx-translate-extract-marker-1.0.0.tgz", "integrity": "sha512-GlCBQKmFE+b+qfIO0aGvuRc4LJVSfK27K2QQFXZLP55/w28iiq/q2CnBS8ya+4l+hapm7U3QPtFoZu9lmbUuew==", + "dev": true, "dependencies": { "tslib": "^1.9.0" } @@ -2694,7 +2694,8 @@ "node_modules/@biesbjerg/ngx-translate-extract-marker/node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true }, "node_modules/@colors/colors": { "version": "1.5.0", @@ -6221,25 +6222,6 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", "dev": true }, - "node_modules/bootstrap": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", - "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/twbs" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/bootstrap" - } - ], - "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" - } - }, "node_modules/boxen": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.1.1.tgz", @@ -10172,12 +10154,6 @@ "jiti": "bin/jiti.js" } }, - "node_modules/jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==", - "peer": true - }, "node_modules/js-generate-password": { "version": "0.1.9", "resolved": "https://registry.npmjs.org/js-generate-password/-/js-generate-password-0.1.9.tgz", @@ -12625,17 +12601,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/postcss": { "version": "8.4.35", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", diff --git a/package.json b/package.json index f005ffa7..f9c9ec59 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", "@types/marked": "^4.0.8", - "bootstrap": "^4.6.2", "crypto-js": "^4.2.0", "easymde": "^2.18.0", "font-awesome": "^4.7.0", diff --git a/projects/ng-core-tester/src/app/app-routing.module.ts b/projects/ng-core-tester/src/app/app-routing.module.ts index f591aa83..6daf00a7 100644 --- a/projects/ng-core-tester/src/app/app-routing.module.ts +++ b/projects/ng-core-tester/src/app/app-routing.module.ts @@ -370,20 +370,24 @@ const routes: Routes = [ { label: 'Relevance', value: 'relevance', - defaultQuery: true + defaultQuery: true, + icon: 'fa-sort-amount-desc' }, { label: 'Date descending', value: 'newest', - defaultNoQuery: true + defaultNoQuery: true, + icon: 'fa-sort-amount-desc' }, { label: 'Date ascending', value: 'oldest', + icon: 'fa-sort-amount-asc' }, { label: 'Title', - value: 'title' + value: 'title', + icon: 'fa-sort-alpha-asc' } ], exportFormats: [ diff --git a/projects/ng-core-tester/src/app/home/home.component.html b/projects/ng-core-tester/src/app/home/home.component.html index 5e661916..16ad30f3 100644 --- a/projects/ng-core-tester/src/app/home/home.component.html +++ b/projects/ng-core-tester/src/app/home/home.component.html @@ -42,3 +42,17 @@
+ + + + + + + + diff --git a/projects/ng-core-tester/src/app/menu/menu.component.html b/projects/ng-core-tester/src/app/menu/menu.component.html index a981f82d..78e8223e 100644 --- a/projects/ng-core-tester/src/app/menu/menu.component.html +++ b/projects/ng-core-tester/src/app/menu/menu.component.html @@ -28,7 +28,7 @@ } {{ item.label }} @if (item.badge) { - + } @if (item.shortcut) { {{ item.shortcut }} @@ -42,7 +42,7 @@ } {{ item.label }} @if (item.badge) { - + } @if (item.shortcut) { {{ item.shortcut }} diff --git a/projects/ng-core-tester/src/app/menu/menu.component.scss b/projects/ng-core-tester/src/app/menu/menu.component.scss deleted file mode 100644 index af9a8ea5..00000000 --- a/projects/ng-core-tester/src/app/menu/menu.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -:host ::ng-deep .p-submenu-list { - z-index: 1000; -} diff --git a/projects/ng-core-tester/src/app/menu/menu.component.ts b/projects/ng-core-tester/src/app/menu/menu.component.ts index 07fc0a6a..5b8fb965 100644 --- a/projects/ng-core-tester/src/app/menu/menu.component.ts +++ b/projects/ng-core-tester/src/app/menu/menu.component.ts @@ -22,8 +22,7 @@ import { MenuItem, MessageService } from 'primeng/api'; @Component({ selector: 'app-menu', - templateUrl: './menu.component.html', - styleUrl: './menu.component.scss' + templateUrl: './menu.component.html' }) export class MenuComponent implements OnInit { diff --git a/projects/ng-core-tester/src/app/record/editor/schema.json b/projects/ng-core-tester/src/app/record/editor/schema.json index dc6b2ef2..b8c9aeae 100644 --- a/projects/ng-core-tester/src/app/record/editor/schema.json +++ b/projects/ng-core-tester/src/app/record/editor/schema.json @@ -105,7 +105,7 @@ "formlyConfig": { "type": "textarea", "props": { - "rows": 3 + "grids": 3 } } } @@ -169,18 +169,18 @@ "title": "Name", "type": "string", "minLength": 3, - "className": "col-lg-6" + "className": "lg:col-6" }, "hidden": { "title": "Hidden name", "type": "string", "minLength": 3, - "className": "col-lg-6", + "className": "lg:col-6", "widget": { "formlyConfig": { "props": { "hide": true, - "itemCssClass": "col-lg-6" + "itemCssClass": "lg:col-6" } } } @@ -203,7 +203,7 @@ "widget": { "formlyConfig": { "props": { - "containerCssClass": "row" + "containerCssClass": "grid" } } } @@ -218,7 +218,7 @@ "widget": { "formlyConfig": { "props": { - "itemCssClass": "col-lg-6" + "itemCssClass": "lg:col-6" } } } @@ -232,7 +232,7 @@ "widget": { "formlyConfig": { "props": { - "itemCssClass": "col-lg-6" + "itemCssClass": "lg:col-6" } } } @@ -244,7 +244,7 @@ "widget": { "formlyConfig": { "props": { - "itemCssClass": "col-lg-6" + "itemCssClass": "lg:col-6" } } } @@ -253,7 +253,7 @@ "widget": { "formlyConfig": { "props": { - "containerCssClass": "row" + "containerCssClass": "grid" } } } @@ -325,7 +325,7 @@ "widget": { "formlyConfig": { "props": { - "cssClass": "w-md-50" + "cssClass": "w-6" } } } @@ -407,7 +407,7 @@ "widget": { "formlyConfig": { "props": { - "itemCssClass": "col-md-6" + "itemCssClass": "md:col-6" } } } @@ -419,7 +419,7 @@ "widget": { "formlyConfig": { "props": { - "itemCssClass": "col-md-6" + "itemCssClass": "md:col-6" } } } @@ -428,7 +428,7 @@ "widget": { "formlyConfig": { "props": { - "containerCssClass": "row", + "containerCssClass": "grid", "hideLabel": true } } @@ -484,7 +484,7 @@ "widget": { "formlyConfig": { "props": { - "itemCssClass": "col-lg-6" + "itemCssClass": "lg:col-6" } } } @@ -492,7 +492,7 @@ "widget": { "formlyConfig": { "props": { - "containerCssClass": "row" + "containerCssClass": "grid" } } } @@ -508,7 +508,7 @@ "widget": { "formlyConfig": { "props": { - "itemCssClass": "col-lg-6" + "itemCssClass": "lg:col-6" } } } @@ -516,7 +516,7 @@ "widget": { "formlyConfig": { "props": { - "containerCssClass": "row" + "containerCssClass": "grid" } } } @@ -570,7 +570,7 @@ "widget": { "formlyConfig": { "props": { - "containerCssClass": "row" + "containerCssClass": "grid" } } } @@ -1204,7 +1204,7 @@ "displayWords": true, "limitChars": 200, "limitWords": 10, - "rows": 5 + "grids": 5 } } } @@ -1541,7 +1541,7 @@ "formlyConfig": { "type": "textarea", "props": { - "rows": 5 + "grids": 5 } } } diff --git a/projects/ng-core-tester/src/styles.scss b/projects/ng-core-tester/src/styles.scss index cb463add..a7eb1463 100644 --- a/projects/ng-core-tester/src/styles.scss +++ b/projects/ng-core-tester/src/styles.scss @@ -16,58 +16,19 @@ */ $fa-font-path: "~font-awesome/fonts"; -// @import "bootstrap/scss/bootstrap.scss"; @import "font-awesome/scss/font-awesome.scss"; @import "../../rero/ng-core/assets/scss/ng-core.scss"; @import "node_modules/primeng/resources/themes/lara-light-blue/theme.css"; @import "node_modules/primeng/resources/primeng.min.css"; -@import "node_modules/primeflex/primeflex.min.css"; +@import "node_modules/primeflex/primeflex"; @import "node_modules/primeicons/primeicons.css"; @import "easymde/dist/easymde.min"; .p-menubar { - background-color: white; - border: none; - margin-bottom: 0; + @extend .mb-0, .border-none, .bg-white; } .container { - padding: 1.5rem; - border: 1px solid #e5e7eb; - border-radius: 6px; + @extend .p-4, .border-1, .surface-border, .border-round-md; } - -// .CodeMirror, .CodeMirror-scroll { -// min-height: 120px; -// } - -// ng-core-formly-field-primeng-input > input, -// formly-field > input { -// width: 100%; -// } - -// input { -// padding: 0.5em; -// } - -// input[type="number"] { -// padding: 0.1em; -// } - - -// // ADJUST BOOTSTRAP / PRIMENG ------------------- -// .col, .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12 { -// padding-top: 0; -// padding-bottom: 0; -// } - -// dt, dl, dd { -// margin-bottom: 0; -// padding-bottom: 0; -// } - -// div.object .row { -// margin-left: 4px !important; -// margin-top: 0.4rem; -// } diff --git a/projects/rero/ng-core/assets/scss/_button.scss b/projects/rero/ng-core/assets/scss/_button.scss index 54f8024b..7e690ffe 100644 --- a/projects/rero/ng-core/assets/scss/_button.scss +++ b/projects/rero/ng-core/assets/scss/_button.scss @@ -14,18 +14,3 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -.button-bar { - height: 3rem; -} - -p-button:disabled, p-button.disabled { - color: $color-white; - pointer-events: none; - border-color: $button-disabled-background-color; - opacity: 0.65; -} - -button:focus { - outline: none; - box-shadow: none; -} diff --git a/projects/rero/ng-core/assets/scss/_style.scss b/projects/rero/ng-core/assets/scss/_style.scss index a7f8cfb7..f1708dce 100644 --- a/projects/rero/ng-core/assets/scss/_style.scss +++ b/projects/rero/ng-core/assets/scss/_style.scss @@ -14,10 +14,29 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ + @import 'primeflex/primeflex'; @layer reset, ng-core, primeng; @layer ng-core { + a { + @extend .text-blue-500; + } + a:hover { + @extend .text-blue-600; + @extend .underline; + } + .p-submenu-list { + z-index: 1000; + } + .p-menuitem { + a { + @extend .text-color; + } + a:hover { + @extend .no-underline; + } + } html, body { line-height: normal; font-size: 14px; @@ -27,10 +46,6 @@ margin-top: 0.5em; } - .invalid-feedback { - color: red; - } - formly-field { .p-button { padding: 0px; @@ -76,12 +91,7 @@ width: 100%; } - .list-result { - padding: 0; - margin: 0 10px; - } - - .list-unstyled { + .list-none { padding-left: 0; list-style: none; } diff --git a/projects/rero/ng-core/assets/scss/_typography.scss b/projects/rero/ng-core/assets/scss/_typography.scss index 79bcfd53..cc7b7f82 100644 --- a/projects/rero/ng-core/assets/scss/_typography.scss +++ b/projects/rero/ng-core/assets/scss/_typography.scss @@ -14,6 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ +@import "primeflex/primeflex"; h1, h2, h3, h4, h5, h6 { margin-top: 0; @@ -71,3 +72,24 @@ legend { .border-bottom { border-bottom: 1px solid #dee2e6 !important; } +.text-alert { + @extend .text-red-500; +} +.text-link-color { + @extend .text-blue-500; +} + +.text-link-color-hover { + @extend .text-blue-600; +} + +.text-link { + @extend .text-link-color; + &:hover { + @extend .text-link-color-hover; + @extend .underline; + } +} +.text-muted { + @extend .text-600; +} diff --git a/projects/rero/ng-core/src/lib/core.module.ts b/projects/rero/ng-core/src/lib/core.module.ts index a41d31b1..85edf193 100644 --- a/projects/rero/ng-core/src/lib/core.module.ts +++ b/projects/rero/ng-core/src/lib/core.module.ts @@ -27,7 +27,6 @@ import { AutofocusDirective } from './directives/autofocus.directive'; import { NgVarDirective } from './directives/ng-var.directive'; import { ErrorComponent } from './error/error.component'; import { ComponentCanDeactivateGuard } from './guard/component-can-deactivate.guard'; -import { MenuWidgetComponent } from './menu/menu-widget/menu-widget.component'; import { CallbackArrayFilterPipe } from './pipe/callback-array-filter.pipe'; import { DefaultPipe } from './pipe/default.pipe'; import { FilesizePipe } from './pipe/filesize.pipe'; @@ -43,7 +42,6 @@ import { DateTranslatePipe } from './translate/date-translate-pipe'; import { TranslateLanguagePipe } from './translate/translate-language.pipe'; import { TranslateLoader } from './translate/translate-loader'; import { MenuComponent } from './widget/menu/menu.component'; -import { SortListComponent } from './widget/sort-list/sort-list.component'; import { NgCoreTranslateService } from './translate/translate-service'; import { Observable, of } from 'rxjs'; @@ -70,8 +68,6 @@ function initializeAppFactory(translateService: NgCoreTranslateService): () => O SortByKeysPipe, ErrorComponent, FilesizePipe, - MenuWidgetComponent, - SortListComponent, NgVarDirective, MarkdownPipe, AutofocusDirective, @@ -108,8 +104,6 @@ function initializeAppFactory(translateService: NgCoreTranslateService): () => O ErrorComponent, SortByKeysPipe, NgxSpinnerModule, - MenuWidgetComponent, - SortListComponent, NgVarDirective, MarkdownPipe, AutofocusDirective, diff --git a/projects/rero/ng-core/src/lib/error/error.component.html b/projects/rero/ng-core/src/lib/error/error.component.html index beeeecf5..221529d6 100644 --- a/projects/rero/ng-core/src/lib/error/error.component.html +++ b/projects/rero/ng-core/src/lib/error/error.component.html @@ -15,7 +15,7 @@ along with this program. If not, see . -->
-

+

{{ error.status }} {{ error.title }} diff --git a/projects/rero/ng-core/src/lib/menu/menu-widget/menu-widget.component.html b/projects/rero/ng-core/src/lib/menu/menu-widget/menu-widget.component.html deleted file mode 100644 index d58f77f4..00000000 --- a/projects/rero/ng-core/src/lib/menu/menu-widget/menu-widget.component.html +++ /dev/null @@ -1,117 +0,0 @@ - -@if (menu) { -

-} - - - @if (item.hasExtra('iconClass')) { - - } - @if (!item.hasLabelAttribute('hideLabel')) { - @if (item.getPrefix(); as prefix) { - {{ prefix.name }} - } - {{ item.getName() }} - @if (item.getSuffix(); as suffix) { - {{ suffix.name }} - } - } - diff --git a/projects/rero/ng-core/src/lib/menu/menu-widget/menu-widget.component.spec.ts b/projects/rero/ng-core/src/lib/menu/menu-widget/menu-widget.component.spec.ts deleted file mode 100644 index 97593557..00000000 --- a/projects/rero/ng-core/src/lib/menu/menu-widget/menu-widget.component.spec.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* - * RERO angular core - * Copyright (C) 2020 RERO - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; - -import { MenuWidgetComponent } from './menu-widget.component'; -import { TranslateModule } from '@ngx-translate/core'; -import { RouterModule } from '@angular/router'; - -describe('MenuWidgetComponent', () => { - let component: MenuWidgetComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - RouterModule.forRoot([]), - TranslateModule.forRoot() - ], - declarations: [ - MenuWidgetComponent - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(MenuWidgetComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/projects/rero/ng-core/src/lib/menu/menu-widget/menu-widget.component.ts b/projects/rero/ng-core/src/lib/menu/menu-widget/menu-widget.component.ts deleted file mode 100644 index a98c20e0..00000000 --- a/projects/rero/ng-core/src/lib/menu/menu-widget/menu-widget.component.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* - * RERO angular core - * Copyright (C) 2020 RERO - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { MenuItemInterface } from '../menu-item-interface'; -import { MenuItem } from '../menu-item'; - -@Component({ - selector: 'ng-core-menu-widget', - templateUrl: './menu-widget.component.html' -}) -export class MenuWidgetComponent { - - /** Menu items */ - @Input() menu: MenuItemInterface; - - /** Event */ - @Output() clickItem = new EventEmitter(); - - /** - * Emit a event on click item menu - * @param item - MenuItem - */ - doClick(item: MenuItem | MenuItemInterface) { - this.clickItem.emit(item); - } -} 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 ff4a8a83..d3189309 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 @@ -14,7 +14,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> -
+
} - @if (deleteStatus().can) { + @if (deleteStatus()) { - } @else { - @if (deleteStatus().message) { - - } } } - +
diff --git a/projects/rero/ng-core/src/lib/record/detail/detail-button/detail-button.component.ts b/projects/rero/ng-core/src/lib/record/detail/detail-button/detail-button.component.ts index 69339ca5..5ca302c3 100644 --- a/projects/rero/ng-core/src/lib/record/detail/detail-button/detail-button.component.ts +++ b/projects/rero/ng-core/src/lib/record/detail/detail-button/detail-button.component.ts @@ -87,15 +87,11 @@ export class DetailButtonComponent { * @param record - the current record */ deleteRecord(record: any): void { - this.recordEvent.emit({ action: 'delete', record }); - } - - /** - * Show a modal containing message given in parameter. - * @param message - message to display into modal - */ - showDeleteMessage(message: string) { - this.deleteMessageEvent.emit(message.replace(new RegExp('\n', 'g'), '
')); + if (this.deleteStatus().can) { + this.recordEvent.emit({ action: 'delete', record }); + } else { + this.deleteMessageEvent.emit(this.deleteStatus().message.replace(new RegExp('\n', 'g'), '
')); + } } /** Go back to previous page */ diff --git a/projects/rero/ng-core/src/lib/record/detail/detail.component.html b/projects/rero/ng-core/src/lib/record/detail/detail.component.html index 666121f9..7f33e0c3 100644 --- a/projects/rero/ng-core/src/lib/record/detail/detail.component.html +++ b/projects/rero/ng-core/src/lib/record/detail/detail.component.html @@ -14,7 +14,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> -
+
@if (record) { + /> } @if (error) { - + } - +
diff --git a/projects/rero/ng-core/src/lib/record/editor/editor.component.html b/projects/rero/ng-core/src/lib/record/editor/editor.component.html index b423e86d..de9fcca9 100644 --- a/projects/rero/ng-core/src/lib/record/editor/editor.component.html +++ b/projects/rero/ng-core/src/lib/record/editor/editor.component.html @@ -16,7 +16,7 @@ -->
-
+
@if (rootField) { @@ -31,7 +31,6 @@
-