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

横向滚动条、停止删除提醒界面、配置添加界面、ＥＸＣＥＬ导入界面样式修改

This commit is contained in:
Linda 2016-12-19 15:13:09 +08:00
parent db6799ce4f
commit 189bf672e1
10 changed files with 107 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dist/hawtio-kubernetes.js vendored
View File

File diff suppressed because one or more lines are too long

10
index.html
View File

@ -155,7 +155,7 @@
</li> </li>
</ul> </ul>
</nav> </nav>
<div class="sj_content_position clear" style="margin-top:50px;"> <div class="sj_content_position clear" style="margin-top:35px;">
<!--<ul> <!--<ul>
<li class="sj_icons_home"></li> <li class="sj_icons_home"></li>
<li>当前位置：</li> <li>当前位置：</li>
@ -165,11 +165,11 @@
</ul>--> </ul>-->
</div> </div>
<platform-sub-tabs-outlet></platform-sub-tabs-outlet> <platform-sub-tabs-outlet></platform-sub-tabs-outlet>
<div id="main" class="container-fluid container-pf-nav-pf-vertical container-pf-nav-pf-vertical-with-secondary content-margin" ng-controller="HawtioNav.ViewController" hawtio-main-outlet> <div id="main" class="container-fluid container-pf-nav-pf-vertical container-pf-nav-pf-vertical-with-secondary content-margin" ng-controller="HawtioNav.ViewController" hawtio-main-outlet>
<div class="row" ng-class="getClass()"> <div class="row" ng-class="getClass()">
<hawtio-breadcrumbs-outlet></hawtio-breadcrumbs-outlet> <hawtio-breadcrumbs-outlet></hawtio-breadcrumbs-outlet>
</div> </div>
<div class="row" ng-class="getClass()"> <div class="row" ng-class="getClass()">
<div ng-include src="viewPartial"> <div ng-include src="viewPartial">
</div> </div>
</div> </div>
@ -179,12 +179,12 @@
var screenHeight = $(window).height(); var screenHeight = $(window).height();
var screenWidth = $(window).width(); var screenWidth = $(window).width();
$("#body").css("height", screenHeight); $("#body").css("height", screenHeight);
$("#body").css("width", screenWidth); $("#body").css("width-15", screenWidth);
$(window).resize(function(){ $(window).resize(function(){
var screenWidth = $(window).width(); var screenWidth = $(window).width();
var newHeight = $(window).height(); var newHeight = $(window).height();
$("#body").css("height", newHeight); $("#body").css("height", newHeight);
$("#body").css("width", screenWidth); $("#body").css("width-15", screenWidth);
}); });
</script> </script>
</body> </body>

8
new/sj_style.css
View File

@ -125,8 +125,8 @@ treecontrol li:hover{}
.kubernetes-view .filter-header{ margin-bottom: 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{ 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;} .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; } .sj_alert-warning{ background-color: #fff6d0; border-color:#f6e7aa; color: #fd5f00; margin-top: 15px; }
.help-block{ color: #fd5f00;} .help-block{ color: #fd5f00;}
.alert{ padding:10px 15px; margin-bottom:0;} .alert{ padding:10px 15px; margin-bottom:0;}
.sj_control-label{ padding:0; line-height:30px; } .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;} .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_txtbold { width: 105px; text-align: center;padding:0 5px; font-weight: bold; }
.sj_popup_p{ width:540px; text-align:center; color: #666;} .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;}

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

@ -6,7 +6,7 @@
<div hawtio-tabs></div> <div hawtio-tabs></div>
</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="row">
<div class="mb10"> <div class="mb10">
<button class="btn sj_btn_green" style="color:#fff; <button class="btn sj_btn_green" style="color:#fff;

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

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

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

@ -414,13 +414,75 @@
</script> </script>
<script type="text/ng-template" id="uploadErrorInfo.html"> <script type="text/ng-template" id="uploadErrorInfo.html">
<div class="container-fluid"> <div class="container-fluid ">
<div class="row"> <div class="row">
<span class="col-md-5"">错误信息：</span> <span class="col-md-5">错误信息：</span>
</div> </div>
<div class="row" ng-repeat="info in ngDialogData"> <div class="row" ng-repeat="info in ngDialogData">
<span>{{info}}</span> <span>{{info}}</span>
</div> </div>
<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 >
<td class="sj_popup_midtxt">[新建 Microsoft Excel 97-2003 工作表.xls] </td>
<td class="sj_popup_midtxt">读取失败,请使用标准的excel模板，编辑后再导入</td>
</tr>
<tr>
<td class="sj_popup_midtxt">[新建工作表.xls]</td>
<td class="sj_popup_midtxt">读取失败,请使用标准的excel模板，编辑后再导入</td>
</tr>
<tr >
<td class="sj_popup_midtxt">[新建 Microsoft Excel 97-2003 工作表.xls] </td>
<td class="sj_popup_midtxt">读取失败,请使用标准的excel模板，编辑后再导入</td>
</tr>
<tr>
<td class="sj_popup_midtxt">[新建工作表.xls]</td>
<td class="sj_popup_midtxt">读取失败,请使用标准的excel模板，编辑后再导入</td>
</tr>
<tr >
<td class="sj_popup_midtxt">[新建 Microsoft Excel 97-2003 工作表.xls] </td>
<td class="sj_popup_midtxt">读取失败,请使用标准的excel模板，编辑后再导入</td>
</tr>
<tr>
<td class="sj_popup_midtxt">[新建工作表.xls]</td>
<td class="sj_popup_midtxt">读取失败,请使用标准的excel模板，编辑后再导入</td>
</tr>
<tr >
<td class="sj_popup_midtxt">[新建 Microsoft Excel 97-2003 工作表.xls] </td>
<td class="sj_popup_midtxt">读取失败,请使用标准的excel模板，编辑后再导入</td>
</tr>
<tr>
<td class="sj_popup_midtxt">[新建工作表.xls]</td>
<td class="sj_popup_midtxt">读取失败,请使用标准的excel模板，编辑后再导入</td>
</tr>
<tr >
<td class="sj_popup_midtxt">[新建 Microsoft Excel 97-2003 工作表.xls] </td>
<td class="sj_popup_midtxt">读取失败,请使用标准的excel模板，编辑后再导入</td>
</tr>
<tr>
<td class="sj_popup_midtxt">[新建工作表.xls]</td>
<td class="sj_popup_midtxt">读取失败,请使用标准的excel模板，编辑后再导入</td>
</tr>
<tr >
<td class="sj_popup_midtxt">[新建 Microsoft Excel 97-2003 工作表.xls] </td>
<td class="sj_popup_midtxt">读取失败,请使用标准的excel模板，编辑后再导入</td>
</tr>
<tr>
<td class="sj_popup_midtxt">[新建工作表.xls]</td>
<td class="sj_popup_midtxt">读取失败,请使用标准的excel模板，编辑后再导入</td>
</tr>
</tbody>
</table>
</div>
</div> </div>
</script> </script>
<div ng-controller="Kubernetes.TopLevel"> <div ng-controller="Kubernetes.TopLevel">

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

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

2
plugins/kubernetes/html/layoutKubernetes.html
View File

@ -296,7 +296,7 @@
</div> </div>
</script> </script>
<script type="text/ng-template" id="isExistHot.html"> <script type="text/ng-template" id="isExistHot.html">
<div class="ngCellText" ng-init="entity=row.entity"> <div class="ngCellText" ng-init="entity=row.entity">
<div ng-show="true" title="是否是标准表汇总库"> <div ng-show="true" title="是否是标准表汇总库">
<span ng-show="entity.existHotData == 0">&nbsp;否</span> <span ng-show="entity.existHotData == 0">&nbsp;否</span>
<span ng-show="entity.existHotData == 1">&nbsp;是</span> <span ng-show="entity.existHotData == 1">&nbsp;是</span>

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

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

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

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