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

----样式合并并修复gfs配置bug

This commit is contained in:
wu ming 2016-12-19 17:15:57 +08:00
parent df11e7d5d0 34d7a2fe57
commit e2c49ca6c0
12 changed files with 1079 additions and 1063 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
defs.d.ts vendored
View File

@ -37,14 +37,6 @@
/// <reference path="d.ts/developer/ts/projects.d.ts"/>
/// <reference path="d.ts/developer/ts/workspace.d.ts"/>
/// <reference path="d.ts/developer/ts/workspaces.d.ts"/>
/// <reference path="d.ts/system/ts/systemHelpers.d.ts"/>
/// <reference path="d.ts/system/ts/systemPlugin.d.ts"/>
/// <reference path="d.ts/system/ts/regionalismCodeSearch.d.ts"/>
/// <reference path="d.ts/system/ts/systemServices.d.ts"/>
/// <reference path="d.ts/system/ts/sqlManagement.d.ts"/>
/// <reference path="d.ts/system/ts/systemCodeSearch.d.ts"/>
/// <reference path="d.ts/system/ts/systemList.d.ts"/>
/// <reference path="d.ts/system/ts/systemVerification.d.ts"/>
/// <reference path="d.ts/kubernetes/ts/apps.d.ts"/>
/// <reference path="d.ts/kubernetes/ts/breadcrumbs.d.ts"/>
/// <reference path="d.ts/kubernetes/ts/build.d.ts"/>
@ -86,3 +78,11 @@
/// <reference path="d.ts/kubernetes/ts/tabs.d.ts"/>
/// <reference path="d.ts/kubernetes/ts/templates.d.ts"/>
/// <reference path="d.ts/navigation/ts/navigationPlugin.d.ts"/>
/// <reference path="d.ts/system/ts/systemHelpers.d.ts"/>
/// <reference path="d.ts/system/ts/systemPlugin.d.ts"/>
/// <reference path="d.ts/system/ts/regionalismCodeSearch.d.ts"/>
/// <reference path="d.ts/system/ts/systemServices.d.ts"/>
/// <reference path="d.ts/system/ts/sqlManagement.d.ts"/>
/// <reference path="d.ts/system/ts/systemCodeSearch.d.ts"/>
/// <reference path="d.ts/system/ts/systemList.d.ts"/>
/// <reference path="d.ts/system/ts/systemVerification.d.ts"/>

2040
dist/hawtio-kubernetes.js vendored
View File

File diff suppressed because one or more lines are too long

6
index.html
View File

@ -155,7 +155,7 @@
</li>
</ul>
</nav>
<div class="sj_content_position clear" style="margin-top:50px;">
<div class="sj_content_position clear" style="margin-top:35px;">
<!--<ul>
<li class="sj_icons_home"></li>
<li>当前位置：</li>
@ -179,12 +179,12 @@
var screenHeight = $(window).height();
var screenWidth = $(window).width();
$("#body").css("height", screenHeight);
$("#body").css("width", screenWidth);
$("#body").css("width-15", screenWidth);
$(window).resize(function(){
var screenWidth = $(window).width();
var newHeight = $(window).height();
$("#body").css("height", newHeight);
$("#body").css("width", screenWidth);
$("#body").css("width-15", screenWidth);
});
</script>
</body>

8
new/sj_style.css
View File

@ -125,8 +125,8 @@ treecontrol li:hover{}
.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_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;}
.sj_alert-warning{ background-color: #fff6d0; border-color:#f6e7aa; color: #fd5f00; }
.sj_form_input input,.sj_form_input select{-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_alert-warning{ background-color: #fff6d0; border-color:#f6e7aa; color: #fd5f00; margin-top: 15px; }
.help-block{ color: #fd5f00;}
.alert{ padding:10px 15px; margin-bottom:0;}
.sj_control-label{ padding:0; line-height:30px; }
@ -200,3 +200,7 @@ table tr.sj_popup_toptxt th{ font-weight: bold; text-align: center; color: #333
.table_sj_td_center tr td{ text-align: center;}
.sj_popup_txtbold { width: 105px; text-align: center;padding:0 5px; font-weight: bold; }
.sj_popup_p{ width:540px; text-align:center; color: #666;}
.container-fluid{ padding-left: 0; padding-right: 0;}
.sj_fluid{ margin-left:20px; margin-right: 20px;}

6
plugins/configs/html/glusterfsSetting.html
View File

@ -6,7 +6,7 @@
<div hawtio-tabs></div>
</div>
<div class="container-content sj_content" ng-model="volumes">
<div class="container-content sj_content sj_fluid" ng-model="volumes">
<div class="row">
<div class="mb10">
<button class="btn sj_btn_green" style="color:#fff;
@ -61,8 +61,8 @@
<span class="sj_table_td02">存储路径:{{row.path}}</span>
</td>
<td>
<span class="">已用&nbsp;{{row.formatUsedSize}}&nbsp;&nbsp;/&nbsp;&nbsp;可用&nbsp;{{row.formatAllSize}}</span>
</td>
<!-- <span class="">已用&nbsp;{{row.formatUsedSize}}&nbsp;&nbsp;/&nbsp;&nbsp;可用&nbsp;{{row.formatAllSize}}</span>
--> </td>
<td></td>
</tr>
</tbody>

11
plugins/configs/html/kubeClusterSetting.html
View File

@ -5,8 +5,8 @@
<div class="row">
<div hawtio-tabs></div>
</div>
<div class="container-content">
<div class="container-content ">
<div class="container-fluid sj_fluid">
<div class="row align-center mb10" ng-hide="model.oracleParam.length">
<p class="alert alert-info">当前没有配置汇总库信息,请配置,否则汇总操作将不可用！</p>
</div>
@ -107,14 +107,14 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">标准表汇总库</label>
<div class="col-sm-10 sj_form_input">
<select class="form-control" ng-model="tableForm.type">
<div class="col-sm-10 sj_form_input ">
<select class="form-control " ng-model="tableForm.type">
<option value=0 ng-selected="tableForm.type==0" selected>否</option>
<option value=1 ng-selected="tableForm.type==1">是</option>
</select>
</div>
</div>
<div class="form-group" style="margin-left:140px;">
<div class="form-group" style="margin-left:145px;">
<button class="btn sj_btn_blue" type='submit' style="color:#fff;" >
<span class="glyphicon glyphicon-save "></span> 保存
</button>
@ -127,4 +127,5 @@
</div>
<hr>
</div>
</div>
</div>

25
plugins/configs/html/shareLayout.html
View File

@ -85,7 +85,7 @@
<!--<th>
<button class="sj_btn_grey mr5" ng-click="cancel()">取消</button>
</th> -->
<th colspan="5" ng-show="!ngDialogData.name">
<th colspan="5" ng-show="ngDialogData.editable">
<span>是否为热区</span>
<input type="checkbox" checked="checked" name="hot" ng-model="ngDialogData.hot"/>
</th>
@ -414,12 +414,23 @@
</script>
<script type="text/ng-template" id="uploadErrorInfo.html">
<div class="container-fluid">
<div class="row">
<span class="col-md-5"">错误信息：</span>
</div>
<div class="row" ng-repeat="info in ngDialogData">
<span>{{info}}</span>
<div class="container-fluid ">
<h2 class="sj_popup_h2 mb10 fb ml15">错误信息：</h2>
<div class=" mb10" style="height:400px;overflow-y:auto;">
<table class="sj_new_table02 mb10 ml15" cellpadding="0" cellspacing="0">
<thead >
<tr class="sj_popup_toptxt ">
<th >文件名</th>
<th >错误描述</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="info in ngDialogData">
<td class="sj_popup_midtxt">{{info.name}}</td>
<td class="sj_popup_midtxt">{{info.value}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</script>

4
plugins/developer/html/fileMigrationTask.html
View File

@ -5,11 +5,11 @@
<div class="row">
<div hawtio-tabs></div>
</div>
<div class="container-content ">
<div class="container-content sj_fluid">
<div class="row align-center mb10" ng-hide="model.transferTasks.length">
<p class="alert alert-info">当前没有可以查看的任务列表！</p>
</div>
<div class="row mb10" ng-show="model.transferTasks.length">
<div class="row mb10" ng-show="model.transferTasks.length" >
<table class="table table-bordered table-striped sj_content_table" hawtio-simple-table="tableConfig" />
</div>
</div>

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

@ -23,8 +23,8 @@
<div hawtio-tabs></div>
</div>
<div class="row filter-header">
<div class="col-md-12 sj_fluid" >
<div class="row filter-header sj_fluid " >
<div class="col-md-12 mb10 " >
<span ng-show="!id">
<hawtio-filter ng-model="tableConfig.filterOptions.filterText"
css-class="input-xxlarge sj_txt_box"
@ -71,8 +71,8 @@
</button>
</div>
</div>
<div class="row">
<div class="col-md-12 sj_fluid">
<div class="row sj_fluid">
<div class="col-md-12 ">
<div ng-hide="model.fetched">
<div class="align-center">
<i class="fa fa-spinner fa-spin"></i>
@ -116,7 +116,7 @@
<hr/>
<div class="form-group">
<div class="col-sm-12 alert alert-warning sj_alert-warning">
<div class="col-sm-12 alert alert-warning sj_alert-warning ">
<span class="help-block " ng-show="configs.oracleParam.length >0 && extractClick.selectedItem">
<br>
您所选择的数据库数据将会被抽取到汇总数据库:

4
plugins/system/html/systemList.html
View File

@ -2,7 +2,7 @@
<div hawtio-tabs></div>
<div class="container-content ">
<div class="container-fluid sj_fluid">
<div class="row clear fl mb10">
<div class="row clear fl mb10" >
<!--<input type="checkbox" class="fl mr5 " style="margin-top: 8px;" />
<label class="fl mr5 " style="margin-top: 5px; font-style:nomal;">全选</label>-->
<button class="btn pull-right sj_btn_grey " ng-click="downloadFilePackage()">
@ -18,7 +18,7 @@
</button>
</div>
<div ng-show="true">
<div class="col-md-12" style="padding-left:0px; padding-right:0px;">
<div class="col-md-12" >
<div ng-show="model.length == 0" class="alert alert-warning sj_alert-warning">
<span class="help-block">
当前没有可以查看的数据，请点击Excel导入按钮导入Excel数据</span></div>

2
plugins/system/ts/systemList.ts
View File

@ -110,7 +110,7 @@ module System{
if(XMLHttpRequest["responseJSON"].err && XMLHttpRequest["responseJSON"].err instanceof Array)
ngDialog.open({
template: 'uploadErrorInfo.html',
width: 790,
width: 755,
closeByDocument: false,
data: XMLHttpRequest["responseJSON"].err,
className: 'ngdialog-theme-default'