From 8a85b1b07deaccc8dd27ed6e4aa4714390ede22f Mon Sep 17 00:00:00 2001 From: Timo Date: Wed, 2 Dec 2020 11:01:36 +0200 Subject: [PATCH] Dictionary Edit Progress --- apps/red-ui/src/app/icons/icons.module.ts | 1 + .../dictionary-listing-screen.component.html | 4 ++ .../dictionary-overview-screen.component.html | 28 +++++++++++++- .../dictionary-overview-screen.component.scss | 37 ++++++++++++++++--- apps/red-ui/src/assets/i18n/en.json | 1 + .../assets/icons/general/case-sensitive.svg | 10 +++++ .../src/assets/styles/red-text-styles.scss | 6 +++ 7 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 apps/red-ui/src/assets/icons/general/case-sensitive.svg diff --git a/apps/red-ui/src/app/icons/icons.module.ts b/apps/red-ui/src/app/icons/icons.module.ts index 27927f944..f8ef97199 100644 --- a/apps/red-ui/src/app/icons/icons.module.ts +++ b/apps/red-ui/src/app/icons/icons.module.ts @@ -24,6 +24,7 @@ export class IconsModule { 'collapse', 'color-picker', 'comment', + 'case-sensitive', 'comment-fill', 'document', 'double-chevron-right', diff --git a/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html b/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html index 5db4452ed..84730b610 100644 --- a/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html +++ b/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html @@ -86,6 +86,10 @@ {{ dict.entries?.length }} +
+ + {{ 'dictionary-listing.case-sensitive' | translate }} +
diff --git a/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.html b/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.html index dd59da5ac..62c22a0b4 100644 --- a/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.html +++ b/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.html @@ -69,6 +69,32 @@ -
+
+
+
+
+ {{ dictionary.type }} +
+
+
+
+ + {{ initialDictionaryEntries?.length }} +
+
+
+
+ + {{ 'dictionary-listing.case-sensitive' | translate }} +
+
+ +
+ +
+ {{ (dictionary.hint ? 'hint' : 'redaction') | translate }} +
+
+
diff --git a/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.scss b/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.scss index 03d314122..666e26879 100644 --- a/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.scss +++ b/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.scss @@ -19,11 +19,9 @@ } .right-container { - display: flex; width: 353px; min-width: 353px; - justify-content: center; - padding: 50px 0; + padding: 24px; } .changes-box { @@ -33,10 +31,39 @@ align-items: center; justify-content: space-between; bottom: 40px; - right: 40px; + right: 403px; border-radius: 8px; padding: 16px; - background-color: #ffffff; + background-color: $white; box-shadow: 0 2px 6px 0 rgba(40, 50, 65, 0.3); z-index: 5000; } + +ace-editor { + box-sizing: border-box; + border: 1px solid $grey-5; + border-radius: 8px; + background-color: $white; +} + +.dictionary-header { + display: flex; + align-items: center; + margin-bottom: 16px; + + .color-box { + width: 16px; + height: 16px; + margin-right: 16px; + } +} + +.indicator { + margin-top: 16px; + display: flex; + align-items: center; + + redaction-dictionary-annotation-icon { + margin-right: 8px; + } +} diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 61e87f510..df74e2b63 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -507,6 +507,7 @@ "delete": "Delete Dictionary", "edit": "Edit Dictionary" }, + "case-sensitive": "Case Sensitive", "add-new": "New Dictionary", "stats": { "charts": { diff --git a/apps/red-ui/src/assets/icons/general/case-sensitive.svg b/apps/red-ui/src/assets/icons/general/case-sensitive.svg new file mode 100644 index 000000000..641e34f8c --- /dev/null +++ b/apps/red-ui/src/assets/icons/general/case-sensitive.svg @@ -0,0 +1,10 @@ + + + Case Sensitive + + + + + + + diff --git a/apps/red-ui/src/assets/styles/red-text-styles.scss b/apps/red-ui/src/assets/styles/red-text-styles.scss index deaae2a09..d9f318bec 100644 --- a/apps/red-ui/src/assets/styles/red-text-styles.scss +++ b/apps/red-ui/src/assets/styles/red-text-styles.scss @@ -58,6 +58,12 @@ a { line-height: 14px; } +.large-label { + color: $grey-1; + font-size: 13px; + line-height: 16px; +} + .clamp-1 { @include line-clamp(1); }