From 0df0f24a8dab6a0582f8e7c98efb3be3c1315ddc Mon Sep 17 00:00:00 2001
From: wu ming <569287825@qq.com>
Date: Tue, 13 Sep 2016 08:27:36 +0800
Subject: [PATCH 1/2] for merge
---
d.ts/developer/ts/fileMigrationTask.d.ts | 5 +
d.ts/kubernetes/ts/fileMigrationTask.d.ts | 4 +
d.ts/kubernetes/ts/kubernetesHelpers.d.ts | 1 +
defs.d.ts | 15 +-
dist/hawtio-kubernetes.js | 974 +++++++++---------
plugins/configs/html/glusterfsSetting.html | 13 +-
plugins/configs/html/kubeClusterSetting.html | 2 +-
plugins/configs/ts/configsDataService.ts | 5 +-
.../ts/fileMigrationTask.html} | 0
plugins/configs/ts/kubeClusterSetting.ts | 8 +-
plugins/developer/html/fileMigrationTask.html | 16 +
plugins/developer/html/overview.html | 0
plugins/developer/html/workspaces.html | 10 +-
plugins/developer/ts/fileMigrationTask.ts | 7 +
plugins/developer/ts/workspaces.ts | 27 +-
.../kubernetes/html/fileMigrationTask.html | 16 +
plugins/kubernetes/ts/kubernetesHelpers.ts | 9 +-
17 files changed, 617 insertions(+), 495 deletions(-)
create mode 100644 d.ts/developer/ts/fileMigrationTask.d.ts
create mode 100644 d.ts/kubernetes/ts/fileMigrationTask.d.ts
rename plugins/{developer/html/overview => configs/ts/fileMigrationTask.html} (100%)
create mode 100644 plugins/developer/html/fileMigrationTask.html
create mode 100644 plugins/developer/html/overview.html
create mode 100644 plugins/developer/ts/fileMigrationTask.ts
create mode 100644 plugins/kubernetes/html/fileMigrationTask.html
diff --git a/d.ts/developer/ts/fileMigrationTask.d.ts b/d.ts/developer/ts/fileMigrationTask.d.ts
new file mode 100644
index 00000000..2cf32703
--- /dev/null
+++ b/d.ts/developer/ts/fileMigrationTask.d.ts
@@ -0,0 +1,5 @@
+///
\n \t{{column.title}}\n | \n
---|
\n \t\t{{col.title}}\n \t | \n
\n \t{{column.title}}\n | \n
---|
\n \t\t{{col.title}}\n \t | \n
\r\n {{volume.name}}\r\n | \r\n\r\n 云路径:{{volume.path}}\r\n | \r\n\r\n 状态\r\n | \r\n\r\n 已用{{volume.usedSize}}/共{{allSize}}\r\n | \r\n\r\n \r\n | \r\n
---|---|---|---|---|
\r\n {{col.title}}\r\n | \r\n
当前没有配置汇总库信息,请配置,否则汇总操作将不可用!
\r\n\r\n {{volume.name}}\r\n | \r\n\r\n 云路径:{{volume.path}}\r\n | \r\n\r\n 状态\r\n | \r\n\r\n 已用{{volume.usedSize}}/共{{allSize}}\r\n | \r\n\r\n \r\n | \r\n
---|---|---|---|---|
\r\n 服务器{{$index+1}}\r\n | \r\n\r\n {{row.ip}}\r\n | \r\n\r\n 存储路径:{{row.path}}\r\n | \r\n\r\n 已用{{row.usedSize}}/共{{row.availableSize}}\r\n | \r\n
当前没有配置汇总库信息,请配置,否则汇总操作将不可用!
\r\nThere are no tools currently available.
\r\nThere are no tools currently available.
\r\nEnvironment is a logical place where deployments happen which maps to a kubernetes / openshift namespace. You will see environments here after you add a build.
\r\n New Build\r\n当前没有可以查看的任务列表!
\r\n\r\n Please choose the perspective you would like to use:\r\n
\r\n\r\n \r\n \r\n  Develop »\r\n \r\n
\r\n\r\n\r\n Work on projects and source code\r\n
\r\n\r\n \r\n \r\n Operate »\r\n \r\n
\r\n\r\n\r\n Manage and run Pods and Services\r\n
\r\nThere are no builds in this job.
\r\nThere are no completed builds in this job.
\r\nThere are no pipeline stages in this build.
\r\nThere are no pipelines for this job.
\r\nThere are no projects in this workspace.
\r\nThere are no tools currently available.
\r\nThere are no tools currently available.
\r\n当前没有可以查看的数据.
\r\n当前没有可以查看的数据.
\r\n\r\n \r\n | \r\n\r\n \r\n \r\n \r\n | \r\n\r\n \r\n Pod {{pod.idAbbrev}}\r\n \r\n \r\n IP:\r\n {{pod.status.podIP}}\r\n \r\n | \r\n \r\n \r\n | \r\n
There are no deployment configurations available.
\r\n Create Deployment Configuration\r\n当前没有可以查看的任务列表!
\r\nThere are no hosts currently running.
\r\nThere are no image repositories available.
\r\n Create Image Repository\r\n当前没有可以查看的任务列表!
+当前没有可以查看的任务列表!
+\n \t{{column.title}}\n | \n
---|
\n \t\t{{col.title}}\n \t | \n
\n \t{{column.title}}\n | \n
---|
\n \t\t{{col.title}}\n \t | \n
\r\n {{volume.name}}\r\n | \r\n\r\n 云路径:{{volume.path}}\r\n | \r\n\r\n 状态\r\n | \r\n\r\n 已用{{volume.usedSize}}/共{{allSize}}\r\n | \r\n\r\n | \r\n
---|---|---|---|---|
\r\n 服务器{{$index+1}}\r\n | \r\n\r\n {{row.ip}}\r\n | \r\n\r\n 存储路径:{{row.path}}\r\n | \r\n\r\n 已用{{row.usedSize}}/共{{row.availableSize}}\r\n | \r\n