From 8c66a25b9027bd5749671e6e649b72c214e05cea Mon Sep 17 00:00:00 2001 From: kaixinqiqi Date: Fri, 21 Apr 2017 16:44:40 +0800 Subject: [PATCH] Refactor for cloud page style --- .../src/main/resources/console/css/common.css | 33 +++ .../resources/console/html/app/add_app.html | 2 +- .../console/html/app/apps_overview.html | 72 +++--- .../console/html/app/modify_app.html | 2 +- .../console/html/history/job_dashboard.html | 4 + .../html/history/job_exec_details.html | 128 +++++----- .../console/html/history/job_exec_status.html | 144 ++++++----- .../resources/console/html/job/add_job.html | 2 +- .../console/html/job/job_status.html | 180 +++++++------- .../console/html/job/jobs_overview.html | 74 +++--- .../console/html/job/modify_job.html | 2 +- .../src/main/resources/console/index.html | 231 +++++++++++++++--- .../main/resources/console/js/app/add_app.js | 2 +- .../resources/console/js/app/app_common.js | 8 +- .../resources/console/js/app/apps_overview.js | 35 ++- .../resources/console/js/app/modify_app.js | 2 +- .../resources/console/js/common/common.js | 80 ++++++ .../console/js/history/job_exec_details.js | 3 +- .../src/main/resources/console/js/index.js | 17 +- .../main/resources/console/js/job/add_job.js | 2 +- .../resources/console/js/job/job_common.js | 18 +- .../resources/console/js/job/jobs_overview.js | 40 +-- .../resources/console/js/job/modify_job.js | 2 +- 23 files changed, 685 insertions(+), 398 deletions(-) diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/css/common.css b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/css/common.css index dfefdd38c6..bbcbab69ff 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/css/common.css +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/css/common.css @@ -99,3 +99,36 @@ .app-width-size{ width:97%; } +/* index css */ +#control-sidebar-theme-demo-options-tab li { + float:left; + width: 33.33333%; + padding: 5px; +} +#control-sidebar-theme-demo-options-tab li a { + display: block; + box-shadow: 0 0 3px rgba(0,0,0,0.4); +} +.top-span { + display:block; + width: 100%; + float: left; + height: 7px; +} +#span-black{ + background: #fefefe; +} +.down-span-left { + display:block; + width: 20%; + float: left; + height: 20px; + background: #222d32; +} +.down-span-right { + display:block; + width: 80%; + float: left; + height: 20px; + background: #f4f5f7; +} diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/add_app.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/add_app.html index 84cf364468..9d5a2f3885 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/add_app.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/add_app.html @@ -69,7 +69,7 @@
- +
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/apps_overview.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/apps_overview.html index f1144c2c5c..439deb3636 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/apps_overview.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/apps_overview.html @@ -2,44 +2,44 @@

应用定义

+
-
-
-
-
-
- 增加 -
+
+
+
+    
- - - - - - - - - -
名称所在路径启动脚本操作
-
+ + + + + + + + + +
名称所在路径启动脚本操作
@@ -51,7 +51,7 @@

应用定义

- @@ -92,8 +92,8 @@

确认要删除该应用吗?

diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/modify_app.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/modify_app.html index 9b71b60560..1c4d3a6bde 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/modify_app.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/modify_app.html @@ -69,7 +69,7 @@
- +
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_dashboard.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_dashboard.html index e265652574..d5c5653254 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_dashboard.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_dashboard.html @@ -1,6 +1,10 @@

Dashboard

+

diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_details.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_details.html index 1a34611f3a..b58224681b 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_details.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_details.html @@ -1,76 +1,74 @@
-

作业执行轨迹

+

作业运行轨迹

+
-
-
-
-
-
-
- - -
-
- - -
-
-
- - -
-
- - -
-
- - -
-
- - 是 - 否 - 全部 -
-
+
+
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + 是 + 否 + 全部
- - - - - - - - - - - - - - -
作业名称任务ID宿主机IP分片执行依据是否成功失败原因执行开始时间执行结束时间
-
+ + + + + + + + + + + + + + +
作业名称任务ID宿主机IP分片执行依据是否成功失败原因执行开始时间执行结束时间
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_status.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_status.html index 971bbec9b0..a63fffd1a6 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_status.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_status.html @@ -1,83 +1,81 @@
-

作业执行状态轨迹

+

作业运行状态

+
-
-
-
-
-
-
- - -
-
- - -
-
-
- - -
-
- - -
-
- - -
-
-
- - -
-
- - -
-
- - -
-
+
+
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+ +
- - - - - - - - - - - - - - -
作业名称任务ID宿主机ID执行来源分片任务来源状态创建时间备注
-
+ + + + + + + + + + + + + + +
作业名称任务ID宿主机ID执行来源分片任务来源状态创建时间备注
@@ -89,4 +87,4 @@

作业执行状态轨迹

- \ No newline at end of file + diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/add_job.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/add_job.html index 60571ca58f..6bc1fce52e 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/add_job.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/add_job.html @@ -154,7 +154,7 @@
- +
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/job_status.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/job_status.html index 0a2700c1d0..90d1d5bdde 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/job_status.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/job_status.html @@ -1,103 +1,99 @@
-

作业状态信息

+

作业状态

+
-
-
-
- + +
+
+ + + + + + + + + + +
任务ID任务名称宿主机ID执行类型分片项
-
-
-
- - - - - - - - - - -
任务ID任务名称宿主机ID执行类型分片项
-
-
- - - - - - - -
作业名称剩余执行次数
-
-
- - - - - - - - -
作业名称原任务ID分片项
-
-
+
+ + + + + + + +
作业名称剩余执行次数
+
+
+ + + + + + + + +
作业名称原任务ID分片项
-
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/jobs_overview.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/jobs_overview.html index 4cf17bbe12..0e29469224 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/jobs_overview.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/jobs_overview.html @@ -19,46 +19,46 @@

作业定义

+
-
-
-
-
-
- 增加 -
+
+
+
+    
- - - - - - - - - - - -
名称应用名称实现类分片总数cron表达式操作
-
+ + + + + + + + + + + +
名称应用名称实现类分片总数cron表达式操作
@@ -83,8 +83,8 @@

确认要删除该作业吗?

diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/modify_job.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/modify_job.html index 056312a934..0792fb85d6 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/modify_job.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/modify_job.html @@ -154,7 +154,7 @@
- +
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/index.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/index.html index 2abd8c1872..ead6e1a7fc 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/index.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/index.html @@ -19,62 +19,237 @@ - +
-
-
+
Copyright © 2004-2017 当当网. All rights reserved.
-
-
-