From 85a4849064e251f6c9d97ca0a6b35e9426e4704f Mon Sep 17 00:00:00 2001 From: Linda <2294690300@qq.com> Date: Fri, 9 Sep 2016 16:55:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/hawtio-kubernetes.js | 6 ++--- new/sj_style.css | 11 +++++--- plugins/configs/html/kubeClusterSetting.html | 25 +++++++++++-------- plugins/configs/html/kubeForm.html | 2 +- plugins/kubernetes/html/layoutKubernetes.html | 2 +- 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dist/hawtio-kubernetes.js b/dist/hawtio-kubernetes.js index bda5ba35..5b58669e 100644 --- a/dist/hawtio-kubernetes.js +++ b/dist/hawtio-kubernetes.js @@ -18753,7 +18753,7 @@ $templateCache.put("plugins/kubernetes/html/hosts.html","
\r\n \r\n
\r\n
\r\n \r\n \r\n \r\n \r\n  \r\n Create\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
\r\n

There are no image repositories available.

\r\n Create Image Repository\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"); $templateCache.put("plugins/kubernetes/html/importProject.html","
\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
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n\r\n

\r\n Create a project by entering or copy/pasting the Git URL for a repository, and give the project a name. By default the name will be based on the repository name.\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

\r\n Project name must be a lower case DNS name with letters, numbers and dots or dashes such as `example.com`\r\n

\r\n

Name of this project

\r\n
\r\n
\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"); $templateCache.put("plugins/kubernetes/html/kubernetesJsonDirective.html","
\r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n  \r\n
\r\n
\r\n
\r\n

 {{displayName || appTitle}}

\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\r\n"); -$templateCache.put("plugins/kubernetes/html/layoutKubernetes.html","\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
\n
\n
\n
\n
\n"); +$templateCache.put("plugins/kubernetes/html/layoutKubernetes.html","\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
\n
\n
\n
\n
\n"); $templateCache.put("plugins/kubernetes/html/logShell.html","
\r\n
\r\n
\r\n \r\n
\r\n
\r\n
{{containerName}}的汇总日志
\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n
\r\n"); $templateCache.put("plugins/kubernetes/html/overview.html","
\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
\r\n\r\n \r\n
\r\n"); $templateCache.put("plugins/kubernetes/html/pendingPipelines.html","
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n

No Pipeline Available

\r\n

Pipeline is a kind of build which uses Jenkins Workflow internally which has multiple Stages. You will see the active pipelines here after you add a build to this project

\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n"); @@ -18779,6 +18779,6 @@ $templateCache.put("plugins/kubernetes/html/templates.html","
\r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n
\r\n
\r\n"); $templateCache.put("plugins/configs/html/configMenuItem.html","\n"); $templateCache.put("plugins/configs/html/glusterfsSetting.html","
\n
\n
\n
\n
\n
\n
\n
\n"); -$templateCache.put("plugins/configs/html/kubeClusterSetting.html","
\n
\n
\n
\n
\n
\n
\n
\n
\n \n
\n
\n \n \n
\n
\n \n
\n
\n
\n
=0 && (edit || add)\">\n

编辑汇总库连接信息:

\n

添加汇总库信息:

\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n\n"); -$templateCache.put("plugins/configs/html/kubeForm.html","\n
\n \n
\n \n \n
\n
\n
\n \n
\n \n \n
\n
\n
\n \n
\n\n"); +$templateCache.put("plugins/configs/html/kubeClusterSetting.html","
\n
\n
\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
=0 && (edit || add)\" >\n

编辑汇总库连接信息:

\n

添加汇总库信息:

\n
\n
\n
\n \n
\n \n
\n
\n
\n \n \n
\n \n
\n
\n
\n \n\n"); +$templateCache.put("plugins/configs/html/kubeForm.html","\n
\n \n
\n \n \n
\n
\n
\n \n
\n \n \n
\n
\n
\n \n
\n\n"); $templateCache.put("plugins/configs/html/shareLayout.html","\n\n
\n
\n
\n
\n
\n");}]); hawtioPluginLoader.addModule("hawtio-kubernetes-templates"); \ No newline at end of file diff --git a/new/sj_style.css b/new/sj_style.css index c29ad4c8..0139b230 100644 --- a/new/sj_style.css +++ b/new/sj_style.css @@ -16,7 +16,7 @@ a:hover,a:active{color:#333;} .cl{ clear:both; overflow:hidden;} /* public*/ .mt2{margin-top: 3px;} -.ml5{ margin-top: 5px;}.ml10{ margin-top: 10px;} +.mt5{ margin-top: 5px;}.mt10{ margin-top: 10px;} .ml5{ margin-left:5px;}.ml10{ margin-left:10px;} .mr5{ margin-right:5px;}.mr10{ margin-right:10px;} .mb10{ margin-bottom: 10px;} @@ -25,7 +25,9 @@ a:hover.sj_btn_grey{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3 .sj_btn_grey{ display:inline-block; padding:0px 15px; height:30px; line-height:30px; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; background-image:-webkit-linear-gradient(top, #fdfdfd,#e8e8e8);background-image:linear-gradient(top,#fdfdfd,#e8e8e8); border:1px solid #cecece; color:#505050;} .sj_btn_grey:hover{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3d3);background-image:linear-gradient(top,#eeeeee,#d3d3d3);border:1px solid #cecece; color:#505050;} .sj_btn_blue{ display:inline-block; padding:0px 15px; height:30px; line-height:30px; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; background-image:-webkit-linear-gradient(top, #2a84e9,#0d62c1);background-image:linear-gradient(top,#2a84e9,#0d62c1);border:1px solid #1362b4; color:#fff;} -.sj_btn_blue:hover{ background-image:-webkit-linear-gradient(top, #4894ea,#3a83d6);background-image:linear-gradient(top,#4894ea,#3a83d6);} +.sj_btn_blue:hover{ background-image:-webkit-linear-gradient(top, #4894ea,#3a83d6);background-image:linear-gradient(top,#4894ea,#3a83d6) color#fff;} +.sj_btn_green{ display:inline-block; padding:0px 15px; height:30px; line-height:30px; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; background-image:-webkit-linear-gradient(top, #5cb85c,#398439);background-image:linear-gradient(top,#5cb85c,#398439);border:1px solid #398439; color:#fff;} +.sj_btn_green:hover{ background-image:-webkit-linear-gradient(top, #65c965,#398439);background-image:linear-gradient(top,#65c965,#398439); color#fff;} /* sj_header */ .sj_header{ height:70px; width:100%; background:#1d1d1d;} .sj_header a.sj_logo{ display:block; height:41px; width:146px; padding:14px 20px 0 12px;} @@ -113,9 +115,10 @@ treecontrol li:hover{} .sj_drop_menu{min-width: 120px; border: 1px solid #ccc; margin-right: 30px;} .nav-pills > li + li{ margin-left: 0px;} .sj_server{ } -.sj_txt_box{-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3; background:#f5f5f5; padding-left:5px; color:#888; height:32px; width:310px;box-shadow: inset 0px 0px 5px #dcdcdc; } +.sj_txt_box{-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3; background:#fff; padding-left:5px; color:#888; height:32px; width:310px;box-shadow: inset 0px 0px 3px #dcdcdc; } .search-query{ margin-top:0; margin-bottom: 0;} .filter-header .btn, .filter-header form { margin-bottom: 0; margin-top:0;} .kubernetes-view .filter-header{ margin-bottom: 0;} .sj_btn{box-shadow:none;-webkit-box-shadow:none; font-weight: normal; background:none; color: #0088cc;} -.sj_btn:hover{ color: #005580;} \ No newline at end of file +.sj_btn:hover{ color: #005580;} +.sj_form_input input{-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3; background:#fff; padding-left:5px; color:#888; height:32px; width:310px;box-shadow: inset 0px 0px 3px #dcdcdc;} \ No newline at end of file diff --git a/plugins/configs/html/kubeClusterSetting.html b/plugins/configs/html/kubeClusterSetting.html index 729a61ae..1bbbd1ba 100644 --- a/plugins/configs/html/kubeClusterSetting.html +++ b/plugins/configs/html/kubeClusterSetting.html @@ -18,28 +18,31 @@
-
-
-

-
-

编辑汇总库连接信息:

-

添加汇总库信息:

+
+

编辑汇总库连接信息:

+

添加汇总库信息:

-
- +
+
-
- +
diff --git a/plugins/configs/html/kubeForm.html b/plugins/configs/html/kubeForm.html index 5305d1d5..bda01a67 100644 --- a/plugins/configs/html/kubeForm.html +++ b/plugins/configs/html/kubeForm.html @@ -2,7 +2,7 @@
- +
diff --git a/plugins/kubernetes/html/layoutKubernetes.html b/plugins/kubernetes/html/layoutKubernetes.html index 5dbdfdb1..65fc32e5 100644 --- a/plugins/kubernetes/html/layoutKubernetes.html +++ b/plugins/kubernetes/html/layoutKubernetes.html @@ -9,7 +9,7 @@