p01469285
/
aggregation-platform
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

服务集群界面修改

This commit is contained in:
Linda 2016-09-09 15:19:56 +08:00
parent 6141ec9723
commit 9af6a1b5b5
6 changed files with 44 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defs.d.ts vendored
View File

@ -1,10 +1,7 @@
/// <reference path="d.ts/includes.d.ts"/>
/// <reference path="d.ts/configs/ts/configPlugin.d.ts"/>
/// <reference path="d.ts/developer/ts/developerNavigation.d.ts"/>
/// <reference path="d.ts/configs/ts/configsHelper.d.ts"/>
/// <reference path="d.ts/configs/ts/configsUtils.d.ts"/>
/// <reference path="d.ts/configs/ts/kubeClusterSetting.d.ts"/>
/// <reference path="d.ts/configs/ts/shareController.d.ts"/>
/// <reference path="d.ts/configs/ts/ConfigsHelper.d.ts"/>
/// <reference path="d.ts/developer/ts/dataManagerHelper.d.ts"/>
/// <reference path="d.ts/developer/ts/developerHelpers.d.ts"/>
/// <reference path="d.ts/kubernetes/ts/kubernetesInterfaces.d.ts"/>

162
dist/hawtio-kubernetes.js vendored
View File

File diff suppressed because one or more lines are too long

2
gulpfile.js
View File

@ -249,7 +249,7 @@ gulp.task('connect', ['watch'], function() {
}, {
proto: "http",
port: "8080",
hostname: "192.168.0.102",
hostname: "192.168.0.101",
path: '/java/console/api',
targetPath: "/"
}];

6
index.html
View File

@ -132,13 +132,13 @@
<body>
<nav class="navbar navbar-fixed-top navbar-pf sj_header " role="navigation">
<a href="/" class="log fl sj_logo"><img src="new/images/logo.png" class="log-img"></a>
<ul class="nav navbar-nav navbar-primary sj_topnav" hawtio-main-nav></ul>
<ul class="nav navbar-nav navbar-utility">
<ul class="nav navbar-nav navbar-primary sj_topnav " hawtio-main-nav></ul>
<ul class="nav navbar-nav navbar-utility sj_setting">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<span class="glyphicon glyphicon-cog"></span> 配置<b class="caret"></b>
</a>
<div class="dropdown-menu" hawtio-extension name="config-setting">
<div class="dropdown-menu sj_drop_menu" hawtio-extension name="config-setting">
</div>
</li>
</ul>

17
new/sj_style.css
View File

@ -34,7 +34,7 @@ a:hover.sj_btn_grey{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3
.sj_topnav li a:hover,.sj_topnav li a.sj_topnav_active{ background-image:-webkit-linear-gradient(top, #424242,#323232);background-image:linear-gradient(top,#424242,#323232); }
/* sj_content */
.sj_content{ margin-top: 56px;}
.sj_leftnav{ width:170px; min-height:800px; max-height:985px; background:#1d1d1d; position:absolute; left:0; top:0px;}
.sj_leftnav{ width:170px; min-height:800px; max-height:985px; background:#1d1d1d; }
.sj_leftnav_i{ background:#717171; padding:0 5px;;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; margin-left:80px; }
.sj_menu {margin-top:12px;background:#1d1d1d; }
.sj_menu_nav { background-image:-webkit-linear-gradient(top, #404040,#353535);background-image:linear-gradient(top,#404040,#353535); color: #fff; height:40px; line-height:38px; padding-left:15px; border: none; border-top: 2px solid #4d4d4d; border-bottom: 2px solid #1d1d1d;}
@ -103,4 +103,17 @@ treecontrol li:hover{}
.sj_modal_select{ width: 350px; height: 30px; line-height: 30px; border: 1px solid #ccc; }
.sj_contro_label{ height: 30px; line-height: 30px;}
.sj_contro_label{ padding-right:10px; }
.sj_fluid{ padding-right: 0px; padding-left: 0px;}
.sj_fluid{ padding-right: 0px; padding-left: 0px; margin-top:0px;}
.sj_setting {height:70px; }
.sj_setting li a { background-image:none; border: none;}
.navbar-pf .sj_setting > li > a{ height:70px; line-height:70px; font-size:14px; color:#fff; padding:0px 20px;}
.navbar-pf .navbar-utility > li > a{ border: none;}
.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; }
.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;}

26
plugins/kubernetes/html/replicationControllers.html
View File

@ -24,15 +24,23 @@
</div>
<div class="row filter-header">
<div class="col-md-12" >
<div class="sj_content_position clear" style="margin-top:25px;">
<ul >
<li class="sj_icons_home"></li>
<li>当前位置：</li>
<li><a href="#">服务集群</a> <span>&gt;</span></li>
<li><a href="#">服务管理</a> </li>
</ul>
</div>
<div class="col-md-12 sj_fluid" >
<span ng-show="!id">
<hawtio-filter ng-model="tableConfig.filterOptions.filterText"
css-class="input-xxlarge"
css-class="input-xxlarge sj_txt_box"
placeholder="通过数据标签筛选相应的oracle服务..."
save-as="kubernetes-replication-controllers-text-filter"></hawtio-filter>
</span>
<button ng-show="model.fetched"
class="btn btn-danger pull-right"
class="btn btn-danger pull-right sj_btn_grey"
ng-disabled="!id && tableConfig.selectedItems.length == 0"
ng-click="deletePrompt(id || tableConfig.selectedItems)">
<i class="fa fa-remove"></i> 删除
@ -40,7 +48,7 @@
<span class="pull-right">&nbsp;</span>
<button ng-show="model.fetched"
class="btn btn-danger pull-right"
class="btn btn-danger pull-right sj_btn_grey"
ng-disabled="!id && tableConfig.selectedItems.length == 0"
ng-click="stopPrompt(id || tableConfig.selectedItems)">
<i class="fa fa-remove"></i> 停止
@ -48,7 +56,7 @@
<span class="pull-right">&nbsp;</span>
<button ng-show="model.fetched"
class="btn btn-primary pull-right"
class="btn btn-primary pull-right sj_btn_grey"
ng-disabled="!id && tableConfig.selectedItems.length == 0"
ng-click="reStartPrompt(id || tableConfig.selectedItems)">
<i class="fa fa-plus"></i> 启动
@ -65,7 +73,7 @@
<span class="pull-right">&nbsp;</span>-->
<button ng-show="model.fetched"
ng-disabled="!id && tableConfig.selectedItems.length == 0"
class="btn btn-success pull-right"
class="btn btn-success pull-right sj_btn_grey"
ng-click="extractData.open(id || tableConfig.selectedItems)">
<i class="fa fa-play-circle"></i> 汇总
</button>
@ -73,7 +81,7 @@
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="col-md-12 sj_fluid">
<div ng-hide="model.fetched">
<div class="align-center">
<i class="fa fa-spinner fa-spin"></i>
@ -84,8 +92,8 @@
<p class="alert alert-info">当前没有正在运行的oracle服务.</p>
</div>
<div ng-show="model.replicationControllers.length">
<table class="table table-bordered table-striped"
hawtio-simple-table="tableConfig"></table>
<table class="table table-bordered table-striped sj_content_table"
hawtio-simple-table="tableConfig" ></table>
</div>
</div>
</div>