Merge branch 'DM-399' into 'master'

DM-399: Added header and warning to rules editor screen.

See merge request redactmanager/red-ui!46
This commit is contained in:
Dan Percic 2023-09-01 15:42:33 +02:00
commit 23954d57af
6 changed files with 28 additions and 0 deletions

View File

@ -1,3 +1,8 @@
<div class="header-container">
<div [translate]="'rules-screen.title'" class="heading-l"></div>
<div [translate]="'rules-screen.warning-text'" class="error"></div>
</div>
<ngx-monaco-editor (init)="onCodeEditorInit($event)" [(ngModel)]="codeEditorText" [options]="editorOptions"></ngx-monaco-editor>
<div *ngIf="changed && permissionsService.canEditRules() && !isLeaving" class="changes-box">

View File

@ -8,3 +8,18 @@ ngx-monaco-editor {
height: 100%;
width: 100%;
}
.header-container {
display: flex;
align-items: center;
padding-bottom: 15px;
margin-left: 30px;
.error {
color: red;
font-size: 8px;
font-weight: 500;
margin-left: 20px;
font-style: italic;
}
}

View File

@ -2209,6 +2209,8 @@
"title": ""
},
"rules-screen": {
"title": "",
"warning-text": "",
"error": {
"generic": "Es ist ein Fehler aufgetreten ... Die Regeln konnten nicht aktualisiert werden!"
},

View File

@ -2209,6 +2209,8 @@
"title": "Structured Component Management"
},
"rules-screen": {
"title": "Rule Editor",
"warning-text": "Warning: experimental feature!",
"error": {
"generic": "Something went wrong... Rules update failed!"
},

View File

@ -2209,6 +2209,8 @@
"title": ""
},
"rules-screen": {
"title": "",
"warning-text": "",
"error": {
"generic": "Es ist ein Fehler aufgetreten ... Die Regeln konnten nicht aktualisiert werden!"
},

View File

@ -2209,6 +2209,8 @@
"title": "Component View"
},
"rules-screen": {
"title": "Rule Editor",
"warning-text": "Warning: experimental feature!",
"error": {
"generic": "Something went wrong... Rules update failed!"
},