合并---9.20

Web_Manager_Develope
wu ming 8 years ago
commit 8b01a83b0d

File diff suppressed because one or more lines are too long

@ -118,8 +118,8 @@ treecontrol li:hover{}
.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; }
.sj_txt_box02{-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:370px;box-shadow: inset 0px 0px 3px #dcdcdc;}
.sj_txt_box03{-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:367px;box-shadow: inset 0px 0px 3px #dcdcdc; }
.sj_txt_box04{-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:175px;box-shadow: inset 0px 0px 3px #dcdcdc; }
.sj_txt_box05{-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:33px;box-shadow: inset 0px 0px 3px #dcdcdc; }
.sj_txt_box04{-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:185px;box-shadow: inset 0px 0px 3px #dcdcdc; }
.sj_txt_box05{-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:40px;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;}
@ -142,14 +142,14 @@ treecontrol li:hover{}
.sj_content_table .table-header{background-image:-webkit-linear-gradient(top, #f7f7f7,#dfdfdf);background-image:linear-gradient(top, #f7f7f7,#dfdfdf); border-bottom:1px solid #a6a6a6;}
.sj_c_green{ color: #58b358;}
.sj_new_box{ width:1002px; margin:0 auto; padding:20px; }
.sj_new_box{ }
.sj_icon_ok{ padding:2px 10px; background: url(../new/images/sj_icons02.png) 0 0px no-repeat;}
.sj_icon_warning{ padding:2px 10px; background: url(../new/images/sj_icons02.png) 0 -30px no-repeat;}
.sj_icon_del{display:block; width:20px; height:25px; background: url(../new/images/sj_icons02.png) -36px -53px no-repeat;}
.sj_icon_del:hover{ background: url(../new/images/sj_icons02.png) -3px -53px no-repeat;}
.sj_icon_add{display:block; width:20px; height:25px; background: url(../new/images/sj_icons02.png) -36px -85px no-repeat;}
.sj_icon_add:hover{ background: url(../new/images/sj_icons02.png) -3px -85px no-repeat;}
.sj_new_table{ background:#f4f4f4; margin-bottom:10; padding:10px;}
.sj_new_table{ background:#f4f4f4; margin-top:20px; margin-left: 10px; padding:10px;}
.sj_new_table tr{ line-height:40px;}
.sj_new_table tr th.new_left{ width:50px;}
.sj_c_green{ color:#58b358;}

@ -40,7 +40,7 @@
<tr ng-repeat = "row in ngDialogData.brick">
<th class="new_left"><span ng-show ="row.status" class="sj_icon_ok"></span><span ng-hide = "row.status" class="sj_icon_warning"></th>
<th colspan="3">
<Label class="mr5">服务器 {{$index + 1}}</Label>
<input type="text" class="sj_txt_box04 mr5" value="服务器 {{$index + 1}} "/>
</th>
<th>
<input type="text" class="sj_txt_box05" ng-model="row.ip[0]" />
@ -62,7 +62,7 @@
<input type="text" class="sj_txt_box02 mr5" ng-model="row.path" />
</th>
<th>
<button class="sj_btn_grey fl">连接</button><span class="sj_icon_del ml5 fl"><span ng-hide ="$index < ngDialogData.brick.length-1" class="sj_icon_add ml5 fl"></span></span>
<button class="sj_btn_grey fl">连接</button><a href="#" class="sj_icon_del ml5 fl"></a><a href="#"ng-hide ="$index < ngDialogData.brick.length-1" class="sj_icon_add ml5 fl"></a>
</th>
</tr>
<tr>
@ -70,6 +70,9 @@
<th>
<button class="sj_btn_blue mr5" ng-click="save()">保存</button>
</th>
<th>
<button class="sj_btn_grey mr5" ng-click="cancel()">删除</button>
</th>
<th>
<button class="sj_btn_grey mr5" ng-click="cancel()">取消</button>
</th>

Loading…
Cancel
Save