From 38c9c998c9770ac83cc198863333f34852c5b9e1 Mon Sep 17 00:00:00 2001 From: mohammadsalem Date: Thu, 26 Oct 2023 13:17:49 +0200 Subject: [PATCH] Admin dashboard layout styling --- .../appearance/appearance.component.html | 4 +- .../mapping-values.component.html | 4 +- .../components/setup/setup.component.html | 623 +++++++++--------- .../components/shared/shared.component.html | 4 +- .../components/users/users.component.html | 4 +- .../admin/dashboard/dashboard.component.html | 190 +++--- .../app/admin/design/design.component.html | 8 +- .../indexes-dashboard.component.html | 4 +- .../app/admin/indexes/indexes.component.html | 4 +- .../app/admin/plugins/plugins.component.html | 5 +- .../admin/reporting/reporting.component.html | 4 +- frontend/src/styles.scss | 11 + 12 files changed, 437 insertions(+), 428 deletions(-) diff --git a/frontend/src/app/admin/appearance/appearance.component.html b/frontend/src/app/admin/appearance/appearance.component.html index 00d07072..e868e7f3 100644 --- a/frontend/src/app/admin/appearance/appearance.component.html +++ b/frontend/src/app/admin/appearance/appearance.component.html @@ -1,4 +1,4 @@ -
+
@@ -22,7 +22,7 @@
-
+
diff --git a/frontend/src/app/admin/components/mapping-values/mapping-values.component.html b/frontend/src/app/admin/components/mapping-values/mapping-values.component.html index 77436b90..3f98fce3 100644 --- a/frontend/src/app/admin/components/mapping-values/mapping-values.component.html +++ b/frontend/src/app/admin/components/mapping-values/mapping-values.component.html @@ -1,4 +1,4 @@ -
+
@@ -21,7 +21,7 @@
-
+
Search diff --git a/frontend/src/app/admin/components/setup/setup.component.html b/frontend/src/app/admin/components/setup/setup.component.html index ab03f1be..5b192ac6 100644 --- a/frontend/src/app/admin/components/setup/setup.component.html +++ b/frontend/src/app/admin/components/setup/setup.component.html @@ -1,4 +1,4 @@ -
+
@@ -17,353 +17,346 @@ Add new repository add +
-
-
- - - - - expand_less - - - expand_more - - Repository ({{ repoindex + 1 }}) - - -
-
- - Repository name - - -
-
- - Repository type - - - {{ plugin.name }} - - - -
-
- - - Start from page number ({{activePlugin[repoindex]?.start_page?.placeholder}}, unless you know what you - are doing) - - - -
-
- - - {{ activePlugin[repoindex]?.name }} REST API endpoint - - - -
-
- - API key - - -
-
- - - {{ activePlugin[repoindex]?.name }} DSpace XML sitemap - - - -
+ + expand_less + + + expand_more + + Repository ({{ repoindex + 1 }}) + + +
+
+ + Repository name + + +
+
+ + Repository type + + + {{ plugin.name }} + + + +
+
+ + + Start from page number ({{activePlugin[repoindex]?.start_page?.placeholder}}, unless you know what you + are doing) + + + +
+
+ + + {{ activePlugin[repoindex]?.name }} REST API endpoint + + + +
+
+ + API key + + +
+
+ + + {{ activePlugin[repoindex]?.name }} DSpace XML sitemap + + + +
-
-
- Repository icon: - - -
- - - Metadata structure - - -

Schema

-
- cloud_download + + + +

Schema

+
+ -
-
- - Schema - - -
-
- - Elasticsearch label - - -
-
- - Formatter - - None - Thumbnail - Datetime - - -
-
- + [formGroup]="form" + > +
+
+ + Schema + + +
+
+ + Elasticsearch label + + +
+
+ + Formatter + + None + Thumbnail + Datetime + + +
+
+ +
-
- -
-
- -
-

Metadata fields

-
-
+ +
+

Metadata fields

+
+ -
-
- - Schema - - -
-
- - Elasticsearch label - - -
-
-
-
- - Formatter - +
+
+ + Schema + + +
+
+ + Elasticsearch label + + +
+
+
+
+ + Formatter + - None - Language - Country - Date - Datetime - LowercaseNone + Language + Country + Date + Datetime + Lowercase + + +
+
+ + - - -
-
- - - - Extract years as years_{{ - form.controls.disply_name.value - }} - - - + > + Extract years as years_{{ + form.controls.disply_name.value + }} + + + +
+
+ +
-
- -
-
- -
-
- -
- + +
+
+ +
+ +
-
- - -
-
- -
+ +
diff --git a/frontend/src/app/admin/components/shared/shared.component.html b/frontend/src/app/admin/components/shared/shared.component.html index 98ba3e8f..1d89060a 100644 --- a/frontend/src/app/admin/components/shared/shared.component.html +++ b/frontend/src/app/admin/components/shared/shared.component.html @@ -1,4 +1,4 @@ -
+
@@ -8,7 +8,7 @@
-
+
diff --git a/frontend/src/app/admin/components/users/users.component.html b/frontend/src/app/admin/components/users/users.component.html index 2a4592d2..55ca4ea8 100644 --- a/frontend/src/app/admin/components/users/users.component.html +++ b/frontend/src/app/admin/components/users/users.component.html @@ -1,4 +1,4 @@ -
+
@@ -12,7 +12,7 @@
-
+
diff --git a/frontend/src/app/admin/dashboard/dashboard.component.html b/frontend/src/app/admin/dashboard/dashboard.component.html index 303e5a9f..8b28b5ba 100644 --- a/frontend/src/app/admin/dashboard/dashboard.component.html +++ b/frontend/src/app/admin/dashboard/dashboard.component.html @@ -1,4 +1,4 @@ -
+
@@ -20,101 +20,105 @@
-
-
-

{{availableSection.display_name}}

-
-
- - - - - - - - -
-
-
- - - - {{ tablesData?.[availableSection.name].active_count }} - - Active ({{ tablesData?.[availableSection.name].stuck_count }}) - - - - - - {{ tablesData?.[availableSection.name].waiting_count }} - - Waiting - - - - - - {{ tablesData?.[availableSection.name].completed_count }} - - Completed - - - - - - {{ tablesData?.[availableSection.name].failed_count }} - - Failed +
+
+
+

{{availableSection.display_name}}

+
+
+ + + + + + + + +
+
+
+ + + + {{ tablesData?.[availableSection.name].active_count }} + + Active ({{ tablesData?.[availableSection.name].stuck_count }}) + + + + + + {{ tablesData?.[availableSection.name].waiting_count }} + + Waiting + + + + + + {{ tablesData?.[availableSection.name].completed_count }} + + Completed + + + + + + {{ tablesData?.[availableSection.name].failed_count }} + + Failed + + +
+
+

+
+ Estimated time {{progress?.[availableSection.name].estimation}} +
+ +

+
+ +

{{progress?.[availableSection.name].percentage.toFixed(2)}}%

+
+
+ + + {{ activeTables?.[availableSection.name]?.table }} + + + +
-
-

-
- Estimated time {{progress?.[availableSection.name].estimation}} -
- -

-
- -

{{progress?.[availableSection.name].percentage.toFixed(2)}}%

-
-
- - - {{ activeTables?.[availableSection.name]?.table }} - - - - -
-
diff --git a/frontend/src/app/admin/design/design.component.html b/frontend/src/app/admin/design/design.component.html index 516c0162..81bd85c8 100644 --- a/frontend/src/app/admin/design/design.component.html +++ b/frontend/src/app/admin/design/design.component.html @@ -1,5 +1,5 @@ -
-
+
+
Explorer Layout - {{dashboard_name}} @@ -21,8 +21,8 @@
-
-
+
+
diff --git a/frontend/src/app/admin/indexes/indexes.component.html b/frontend/src/app/admin/indexes/indexes.component.html index 26859943..b2d4a4ec 100644 --- a/frontend/src/app/admin/indexes/indexes.component.html +++ b/frontend/src/app/admin/indexes/indexes.component.html @@ -1,4 +1,4 @@ -
+
@@ -22,7 +22,7 @@
-
+
diff --git a/frontend/src/app/admin/plugins/plugins.component.html b/frontend/src/app/admin/plugins/plugins.component.html index 7fc84da0..1aaad9cc 100644 --- a/frontend/src/app/admin/plugins/plugins.component.html +++ b/frontend/src/app/admin/plugins/plugins.component.html @@ -1,4 +1,4 @@ -
+
@@ -23,7 +23,8 @@
- +
+
diff --git a/frontend/src/app/admin/reporting/reporting.component.html b/frontend/src/app/admin/reporting/reporting.component.html index d263459c..9ee77730 100644 --- a/frontend/src/app/admin/reporting/reporting.component.html +++ b/frontend/src/app/admin/reporting/reporting.component.html @@ -1,4 +1,4 @@ -
+
@@ -34,7 +34,7 @@
-
+
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index d8adad88..778c135e 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -309,3 +309,14 @@ mat-paginator .mat-mdc-select-trigger { background-color: #fef7f8; border-color: #f0868e; } + +.admin-dashboard-header { + z-index: 999; + position: fixed; + top: 0; + width: calc(100% - 260px); +} + +.admin-dashboard-content { + padding-top: 80px; +}