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

解决冲突问题

This commit is contained in:
wu ming 2016-09-06 22:34:48 +08:00
parent 562b55eb79
commit d70816ba29
8 changed files with 1641 additions and 2069 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
defs.d.ts vendored
View File

@ -1,17 +1,13 @@
/// <reference path="d.ts/includes.d.ts"/>
/// <reference path="d.ts/kubernetes/ts/kubernetesInterfaces.d.ts"/>
/// <reference path="d.ts/kubernetes/ts/kubernetesHelpers.d.ts"/>
/// <reference path="d.ts/developer/ts/developerEnrichers.d.ts"/>
/// <reference path="d.ts/developer/ts/developerHelpers.d.ts"/>
/// <reference path="d.ts/developer/ts/developerNavigation.d.ts"/>
/// <reference path="d.ts/developer/ts/FileMode.d.ts"/>
/// <reference path="d.ts/developer/ts/dataManagerHelper.d.ts"/>
/// <reference path="d.ts/developer/ts/developerHelpers.d.ts"/>
/// <reference path="d.ts/developer/ts/developerPlugin.d.ts"/>
/// <reference path="d.ts/developer/ts/dataManagerModel.d.ts"/>
/// <reference path="d.ts/developer/ts/developerPlugin.ts.BASE.d.ts"/>
/// <reference path="d.ts/developer/ts/developerPlugin.ts.LOCAL.d.ts"/>
/// <reference path="d.ts/developer/ts/developerPlugin.ts.REMOTE.d.ts"/>
/// <reference path="d.ts/developer/ts/developerEnrichers.d.ts"/>
/// <reference path="d.ts/developer/ts/developerNavigation.d.ts"/>
/// <reference path="d.ts/developer/ts/environmentPanel.d.ts"/>
/// <reference path="d.ts/kubernetes/ts/kubernetesInterfaces.d.ts"/>
/// <reference path="d.ts/kubernetes/ts/kubernetesHelpers.d.ts"/>
/// <reference path="d.ts/developer/ts/home.d.ts"/>
/// <reference path="d.ts/developer/ts/jenkinsJob.d.ts"/>
/// <reference path="d.ts/developer/ts/jenkinsJobs.d.ts"/>
@ -28,6 +24,7 @@
/// <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/navigation/ts/navigationPlugin.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"/>
@ -72,4 +69,3 @@
/// <reference path="d.ts/kubernetes/ts/sharedControllers.d.ts"/>
/// <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"/>

3503
dist/hawtio-kubernetes.js vendored
View File

File diff suppressed because one or more lines are too long

26
index.html
View File

@ -24,14 +24,10 @@
<link rel="stylesheet" href="libs/kubernetes-container-terminal/dist/container-terminal.css" />
<!-- endbower -->
<link rel="stylesheet" type="text/css" href="libs/angular-tree-control/css/tree-control-attribute.css">
<link rel="stylesheet" type="text/css" href="libs/angular-tree-control/css/tree-control.css">
<link rel="stylesheet" href="dist/hawtio-kubernetes.css" />
<<<<<<< .mine
=======
<link rel="stylesheet" type="text/css" href="new/sj_style.css">
>>>>>>> .theirs
<!-- bower:js -->
<script src="libs/jquery/dist/jquery.js"></script>
<script src="libs/angular/angular.js"></script>
@ -99,8 +95,7 @@
<script type="text/javascript" src="libs/codemirror/mode/clike/clike.js"></script>
<script type="text/javascript" src="libs/codemirror/mode/yaml/yaml.js"></script>
<!-- link for js when using the tree as -->
<script type="text/javascript" src="libs/angular-tree-control/angular-tree-control.js"></script>
<script type="text/javascript" src="resumable.js"></script>
<script type="text/javascript" src="libs/angular-tree-control/angular-tree-control.js"></script>
<script src="libs/bootstrap/dist/js/bootstrap.js"></script>
<script src="libs/patternfly/dist/js/patternfly.js"></script>
<script src="libs/hawtio-extension-service/dist/hawtio-extension-service.js"></script>
@ -134,31 +129,14 @@
}
</style>
</head>
<<<<<<< .mine
<body style="padding-top: 75px;">
<nav class="navbar navbar-fixed-top navbar-pf" role="navigation">
<a href="/" class="log fl"><img src="/" class="log-img"></a>
<ul class="nav navbar-nav navbar-primary" hawtio-main-nav></ul>
=======
</head>
<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>
>>>>>>> .theirs
</nav>
<platform-sub-tabs-outlet></platform-sub-tabs-outlet>
<<<<<<< .mine
<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">
=======
<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()" >
>>>>>>> .theirs
<hawtio-breadcrumbs-outlet></hawtio-breadcrumbs-outlet>
</div>
<div class="row" ng-class="getClass()">

89
plugins/developer/html/workspaces.html
View File

@ -12,86 +12,59 @@
<p class="alert alert-info">当前没有可以查看的数据.</p>
</div>
<div ng-show="model.data.length">
<<<<<<< .mine
<table class="table table-striped table-bordered" hawtio-simple-table="tableConfig"></table>
<div class="row">
<div class="col-xs-6 col-sm-2">
<button ng-show="true" class="btn btn-danger pull-right" ng-disabled="!id && tableConfig.selectedItems.length == 0" ng-click="deletePrompt(id || tableConfig.selectedItems)">
<i class="fa fa-remove"></i> 删除数据
</button>
<span class="pull-right">&nbsp;</span>
<button ng-show="id" class="btn btn-primary pull-right" ng-click="id = undefined"><i class="fa fa-list"></i></button>
<span class="pull-right">&nbsp;</span>
<a class="btn btn-default pull-right" title="启动oracle服务" href="/kubernetes/replicationControllers" ng-disabled="!id && tableConfig.selectedItems.length == 0" ng-click="createOracleService(id || tableConfig.selectedItems)"><i class="fa fa-plus"></i> 启动服务</a>
<span class="pull-right">&nbsp;</span>
<a class="btn btn-default pull-right" title="迁移数据" " ng-disabled="!id && tableConfig.selectedItems.length==0 " ng-click="migrationClick.open(id || tableConfig.selectedItems) "><i class="fa fa-plus "></i> 数据迁移</a>
</div>
<div class="col-md-6 col-md-offset-9 ">
每页显示&nbsp
<select ng-options="value for value in pageSizeChoses " ng-change="selectAction() " ng-model="options.currentTableSize "></select>
&nbsp&nbsp当前页码
<div class="hawtio-pager clearfix ">
<label>{{options.currentPageNum}} / {{options.getPageSizeNum()}}</label>
<div class=btn-group>
<button class="btn " ng-disabled="isEmptyOrFirst() " ng-click="first() "><i class="fa fa-fast-backward "></i></button>
<button class="btn " ng-disabled="isEmptyOrFirst() " ng-click="previous() "><i class="fa fa-step-backward "></i></button>
<button class="btn " ng-disabled="isEmptyOrLast() " ng-click="next() "><i class="fa fa-step-forward "></i></button>
<button class="btn " ng-disabled="isEmptyOrLast() " ng-click="last() "><i class="fa fa-fast-forward "></i></button>
</div>
</div>
</div>
=======
<table class="table table-striped table-bordered sj_content_table" hawtio-simple-table="tableConfig"></table>
<div class="row clear">
<div class=" fl">
<input type="checkbox" class="fl mr5 " style="margin-top: 8px;" />
<label class="fl mr5 " style="margin-top: 5px; font-style:nomal;">全选</label>
<a class="sj_btn_grey pull-left mr5" title="启动oracle服务" href="/kubernetes/replicationControllers" ng-disabled="!id && tableConfig.selectedItems.length == 0" ng-click="createOracleService(id || tableConfig.selectedItems)">启动oracle服务</a>
<a class="sj_btn_grey pull-left mr5" title="迁移数据" href="/kubernetes/replicationControllers" ng-disabled="!id && tableConfig.selectedItems.length == 0" ng-click="createOracleService(id || tableConfig.selectedItems)">迁移数据</a>
<a class="sj_btn_grey pull-left mr5" title="删除数据" href="/kubernetes/replicationControllers" ng-disabled="!id && tableConfig.selectedItems.length == 0" ng-click="createOracleService(id || tableConfig.selectedItems)">删除数据</a>
</div>
<ul class="fr sj_table_bottom">
<li class="mr5">当前显示1~7行，共7行。</li>
<li class="mr5">每页显示
<select ng-options="value for value in pageSizeChoses" ng-change="selectAction()" ng-model="options.currentTableSize"></select>行
</li>
<li class="mr5">当前页码</li>
<li>
<div class="hawtio-pager clearfix">
<label>{{options.currentPageNum}} / {{options.getPageSizeNum()}}</label>
<div class=btn-group>
<button class="btn sj_btn_grey" ng-disabled="isEmptyOrFirst()" ng-click="first()"><i class="fa fa-fast-backward"></i></button>
<button class="btn sj_btn_grey" ng-disabled="isEmptyOrFirst()" ng-click="previous()"><i class="fa fa-step-backward"></i></button>
<button class="btn sj_btn_grey " ng-disabled="isEmptyOrLast()" ng-click="next()"><i class="fa fa-step-forward"></i></button>
<button class="btn sj_btn_grey" ng-disabled="isEmptyOrLast()" ng-click="last()"><i class="fa fa-fast-forward"></i></button>
</div>
</div>
</li>
</ul>
>>>>>>> .theirs
<a class="sj_btn_grey pull-left mr5" title="迁移数据" href="#" ng-disabled="!id && tableConfig.selectedItems.length == 0" ng-click="migrationClick.open(id || tableConfig.selectedItems)">迁移数据</a>
<a class="sj_btn_grey pull-left mr5" title="删除数据" href="#" ng-disabled="!id && tableConfig.selectedItems.length == 0" ng-click="deletePrompt(id || tableConfig.selectedItems)">删除数据</a>
</div>
<ul class="fr sj_table_bottom">
<li class="mr5">当前显示1~7行，共7行。</li>
<li class="mr5">每页显示
<select ng-options="value for value in pageSizeChoses" ng-change="selectAction()" ng-model="options.currentTableSize"></select>行
</li>
<li class="mr5">当前页码</li>
<li>
<div class="hawtio-pager clearfix">
<label>{{options.currentPageNum}} / {{options.getPageSizeNum()}}</label>
<div class=btn-group>
<button class="btn sj_btn_grey" ng-disabled="isEmptyOrFirst()" ng-click="first()"><i class="fa fa-fast-backward"></i></button>
<button class="btn sj_btn_grey" ng-disabled="isEmptyOrFirst()" ng-click="previous()"><i class="fa fa-step-backward"></i></button>
<button class="btn sj_btn_grey " ng-disabled="isEmptyOrLast()" ng-click="next()"><i class="fa fa-step-forward"></i></button>
<button class="btn sj_btn_grey" ng-disabled="isEmptyOrLast()" ng-click="last()"><i class="fa fa-fast-forward"></i></button>
</div>
</div>
</li>
</ul>
</div>
</div>
</div>
</div>
<div modal="migrationClick.dialog.show ">
<div modal="migrationClick.dialog.show ">
<form name="selectFolder " class=" " ng-submit="migrationClick.onOk() ">
<div class="modal-header "><h4>数据迁移</h4></div>
<div class="modal-header ">
<h4>数据迁移</h4></div>
<div class="modal-body">
<div class="row">
<label class="col-sm-3 control-label" for="selectedItem ">
请选择迁移集群
</label>
<select ng-model="migrationClick.selectedItem " class="col-sm-3" title="name of the new namespace " id ="selectedItem " ng-options="x.$oracleName for x in filterReplicationControllers " />
<select ng-model="migrationClick.selectedItem " class="col-sm-3" title="name of the new namespace " id="selectedItem " ng-options="x.$oracleName for x in filterReplicationControllers " />
</div>
<div>
<treecontrol class="tree-classic" tree-model="dataForTheTree" options="treeOptions" on-selection="showSelected(node)" selected-node="selectNode">
{{node.name}}
</treecontrol>
</div>
</div>
<div class="modal-footer ">
<input class="btn btn-primary " type="submit" ng-disabled="false" value="确定">
<input class="btn btn-primary " type="submit" ng-disabled="!selectNode || selectNode.children.length <= 0" value="确定">
<button class="btn btn-warning cancel " type="button" ng-click="migrationClick.close()">取消</button>
</div>
</form>
</div>
</form>
</div>
<div class="prettify "></div>
</div>

40
plugins/developer/ts/FileMode.ts
View File

@ -1,40 +0,0 @@
/// <reference path="../../includes.ts"/>
/// <reference path="../../kubernetes/ts/kubernetesHelpers.ts"/>
/// <reference path="developerEnrichers.ts"/>
/// <reference path="developerHelpers.ts"/>
/// <reference path="developerNavigation.ts"/>
module Developer {
/* export var DataOverView = controller("DataOverView",
["$scope", "$location", "$routeParams", "$http", "$timeout", ($scope, $location:ng.ILocationService, $routeParams, $http, $timeout) => {
$scope.treeOptions = {
nodeChildren: "children",
dirSelectable: true,
injectClasses: {
ul: "a1",
li: "a2",
liSelected: "a7",
iExpanded: "a3",
iCollapsed: "a4",
iLeaf: "a5",
label: "a6",
labelSelected: "a8"
}
}
$scope.dataForTheTree =
[
{ "name" : "Joe", "age" : "21", "children" : [
{ "name" : "Smith", "age" : "42", "children" : [] },
{ "name" : "Gary", "age" : "21", "children" : [
{ "name" : "Jenifer", "age" : "23", "children" : [
{ "name" : "Dani", "age" : "32", "children" : [] },
{ "name" : "Max", "age" : "34", "children" : [] }
]}
]}
]},
{ "name" : "Albert", "age" : "33", "children" : [] },
{ "name" : "Ron", "age" : "29", "children" : [] }
];
}]);*/
}

6
plugins/developer/ts/developerPlugin.ts
View File

@ -3,7 +3,7 @@
module Developer {
export var _module = angular.module(pluginName, ['hawtio-core', 'hawtio-ui', 'ui.codemirror', 'nvd3']);
export var _module = angular.module(pluginName, ['hawtio-core', 'hawtio-ui', 'ui.codemirror', 'nvd3', 'treeControl']);
export var controller = PluginHelpers.createControllerFunction(_module, pluginName);
export var route = PluginHelpers.createRoutingFunction(templatePath);
@ -12,8 +12,8 @@ module Developer {
.when("/data-manager", route('workspaces.html', false))
.when(UrlHelpers.join(context, 'Overview/:type/data-type/all'), route('workspaces.html', false))
.when(UrlHelpers.join(context, 'Overview/:type/data-type/financial'), route('workspaces.html', false))
.when(UrlHelpers.join(context, 'Overview/:type/data-type/social-security'), route('workspaces.html', false)
.when(UrlHelpers.join(context, 'task'), route('apps.html', false))
.when(UrlHelpers.join(context, 'Overview/:type/data-type/social-security'), route('workspaces.html', false))
.when(UrlHelpers.join(context, 'task'), route('apps.html', false))
.otherwise(context);
}]);

30
plugins/developer/ts/workspaces.ts
View File

@ -1,3 +1,4 @@
/// <reference path="../../includes.ts"/>
/// <reference path="../../kubernetes/ts/kubernetesHelpers.ts"/>
/// <reference path="developerEnrichers.ts"/>
@ -18,6 +19,35 @@ module Developer {
$scope.model.updateModel();
$scope.treeOptions = {
nodeChildren: "children",
dirSelectable: true,
injectClasses: {
ul: "a1",
li: "a2",
liSelected: "a7",
iExpanded: "a3",
iCollapsed: "a4",
iLeaf: "a5",
label: "a6",
labelSelected: "a8"
}
}
$scope.dataForTheTree =
[
{ "name" : "Joe", "age" : "21", "children" : [
{ "name" : "Smith", "age" : "42", "children" : [] },
{ "name" : "Gary", "age" : "21", "children" : [
{ "name" : "Jenifer", "age" : "23", "children" : [
{ "name" : "Dani", "age" : "32", "children" : [] },
{ "name" : "Max", "age" : "34", "children" : [] }
]}
]}
]},
{ "name" : "Albert", "age" : "33", "children" : [] },
{ "name" : "Ron", "age" : "29", "children" : [] }
];
//配置数据表格需要显示的内容及显示格式
$scope.tableConfig = {

BIN
plugins/kubernetes/html/html - 快捷方式.lnk
View File

Binary file not shown.