From cd739b4cbcfd89494474e7219e77ded5e835e04e Mon Sep 17 00:00:00 2001 From: chenshihai Date: Mon, 1 Aug 2022 14:24:10 +0800 Subject: [PATCH 01/43] Modify admin management menu --- options/locale/locale_en-US.ini | 7 ++ options/locale/locale_zh-CN.ini | 7 ++ templates/admin/cloudbrain/images.tmpl | 7 +- templates/admin/cloudbrain/list.tmpl | 29 +++-- templates/admin/navbar.tmpl | 106 +++++++++++-------- web_src/js/components/images/adminImages.vue | 11 +- web_src/less/_admin.less | 56 +++++++++- 7 files changed, 154 insertions(+), 69 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index cb0ef205f7..5e183e7ee9 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2962,6 +2962,13 @@ notices.desc = Description notices.op = Op. notices.delete_success = The system notices have been deleted. +user_management = User Management +resource_management = Resource Management +resource_pool = Resource Pool(queue) +resource_price = Resource Price +application_scenario = Application Scenario +system_configuration = System Configuration + [action] create_repo = created repository %s rename_repo = renamed repository from %[1]s to %[3]s diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 652371690c..7e67559989 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2976,6 +2976,13 @@ notices.desc=提示描述 notices.op=操作 notices.delete_success=系统通知已被删除。 +user_management = 用户管理 +resource_management = 资源管理 +resource_pool = 资源池(队列) +resource_price = 资源规格单价 +application_scenario = 应用场景 +system_configuration = 系统配置 + [action] create_repo=创建了项目 %s rename_repo=重命名项目 %[1]s 为 %[3]s diff --git a/templates/admin/cloudbrain/images.tmpl b/templates/admin/cloudbrain/images.tmpl index 7d800eb648..d79bd54378 100644 --- a/templates/admin/cloudbrain/images.tmpl +++ b/templates/admin/cloudbrain/images.tmpl @@ -13,10 +13,9 @@
{{template "admin/navbar" .}} -
- -
- +
+
+
diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index cd5913c407..5b98e1d063 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -18,19 +18,19 @@ data-all-compute="{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}" data-all-status="{{.i18n.Tr "admin.cloudbrain.all_status"}}">
{{template "admin/navbar" .}} -
+
{{template "base/alert" .}} -
-
+
+
{{template "admin/cloudbrain/search" .}}
{{.i18n.Tr "admin.cloudbrain.download_report"}}
-
+
-
+
@@ -408,17 +408,16 @@
{{end}} - {{end}} -
-
- - -
-
+ {{end}} +
+
+
+
+ +
-
diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index d04915df1b..14189620ff 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -1,44 +1,64 @@ -
- - {{.i18n.Tr "admin.dashboard"}} - - - {{.i18n.Tr "admin.users"}} - - - {{.i18n.Tr "admin.organizations"}} - - - {{.i18n.Tr "admin.repositories"}} - - - {{.i18n.Tr "admin.datasets"}} - - - {{.i18n.Tr "repo.cloudbrain.task"}} - - - {{.i18n.Tr "explore.images"}} - - - {{.i18n.Tr "admin.hooks"}} - - - {{.i18n.Tr "admin.systemhooks"}} - - - {{.i18n.Tr "admin.authentication"}} - - - {{.i18n.Tr "admin.emails"}} - - - {{.i18n.Tr "admin.config"}} - - - {{.i18n.Tr "admin.notices"}} - - - {{.i18n.Tr "admin.monitor"}} - +
+
+ + {{.i18n.Tr "admin.dashboard"}} + + + {{.i18n.Tr "admin.user_management"}} + + + {{.i18n.Tr "admin.users"}} + + + {{.i18n.Tr "admin.emails"}} + + + {{.i18n.Tr "admin.organizations"}} + + + {{.i18n.Tr "admin.repositories"}} + + + {{.i18n.Tr "admin.datasets"}} + + + {{.i18n.Tr "repo.cloudbrain.task"}} + + + {{.i18n.Tr "explore.images"}} + + + {{.i18n.Tr "admin.resource_management"}} + + + {{.i18n.Tr "admin.resource_pool"}} + + + {{.i18n.Tr "admin.resource_price"}} + + + {{.i18n.Tr "admin.application_scenario"}} + + + {{.i18n.Tr "admin.system_configuration"}} + + + {{.i18n.Tr "admin.monitor"}} + + + {{.i18n.Tr "admin.hooks"}} + + + {{.i18n.Tr "admin.systemhooks"}} + + + {{.i18n.Tr "admin.authentication"}} + + + {{.i18n.Tr "admin.config"}} + + + {{.i18n.Tr "admin.notices"}} + +
diff --git a/web_src/js/components/images/adminImages.vue b/web_src/js/components/images/adminImages.vue index 1c60a912d9..c3a943bdac 100644 --- a/web_src/js/components/images/adminImages.vue +++ b/web_src/js/components/images/adminImages.vue @@ -1,9 +1,8 @@