Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope

Conflicts:
	dist/hawtio-kubernetes.js

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;}
+.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;}

plugins/configs/html/kubeClusterSetting.html

@@ -21,28 +21,31 @@
         <div class="row" ng-show="model.oracleParam.length">
             <table class="table table-bordered table-striped sj_content_table" hawtio-simple-table="tableConfig" />
         </div>
-        <div class="row">
-            <div class="col-md-1">
-                <button class="btn pull-right sj_btn_blue" ng-click="create()">
+        <div class="row" >
+            <div >
+                <button class="btn sj_btn_green" style="color:#fff;" ng-click="create()">
                     <span class="glyphicon glyphicon-plus"></span> 添加
                 </button>
             </div>
         </div>
         <hr>
-        <div class="row" ng-show="tableForm.length>=0 && (edit || add)">
-            <h3 ng-show="edit">编辑汇总库连接信息:</h3>
-            <h3 ng-show="add">添加汇总库信息:</h3>
+        <div class="row" ng-show="tableForm.length>=0 && (edit || add)" >
+            <h3 ng-show="edit" >编辑汇总库连接信息:</h3>
+            <h3 ng-show="add mt10 mb10">添加汇总库信息:</h3>
             <div class="col-md-6 col-md-offset-1">
                 <form class="form-horizontal" ng-submit="onSubmit(validForm.$valid)" novalidate="novalidate" name="validForm">
                     <div class="form-group" ng-repeat="item in tableForm">
                         <label class="col-sm-2 control-label">{{item.name}}</label>
-                        <div class="col-sm-10">
-                            <input type="text" ng-model="item.value">
+                        <div class="col-sm-10 sj_form_input">
+                            <input type="text " ng-model="item.value">
                         </div>
                     </div>
-                    <div class="form-group">
-                        <button class="btn" type='submit'>
-                            <span class="glyphicon glyphicon-save"></span> 保存
+                    <div class="form-group" style="margin-left:140px;">
+                        <button class="btn sj_btn_blue" type='submit' style="color:#fff;">
+                            <span class="glyphicon glyphicon-save "></span> 保存
+                        </button>
+                        <button class="btn sj_btn_grey" type='submit'>
+                            <span class="glyphicon glyphicon-remove "></span> 取消
                         </button>
                     </div>
                 </form>

plugins/configs/html/kubeForm.html

@@ -2,7 +2,7 @@
     <div class="form-group">
         <label class="col-sm-2 control-label">名称</label>
         <div class="col-sm-10">
-            <input class="form-control" type="text" ng-model="mode.name" id="orcName" ng-minlength="4" ng-maxlength="20">
+            <input class="form-control " type="text" ng-model="mode.name" id="orcName" ng-minlength="4" ng-maxlength="20">
             <span class="glyphicon glyphicon-ok form-control-feedback" ng-show="validForm.orcName.$valid" />
         </div>
     </div>

plugins/kubernetes/html/layoutKubernetes.html

@@ -9,7 +9,7 @@
 <script type="text/ng-template" id="idTemplate.html">
   <div class="ngCellText nowrap">
     <a href=""
-       style="color:Blue"
+       
        title="View details for {{row.entity.metadata.name || row.entity.name}}">
       <!--<img class="app-icon-small" ng-src="{{row.entity.$iconUrl}}" ng-show="row.entity.$iconUrl">-->
       <strong>{{row.entity.$oracleName || row.entity.name}}</strong></a>