Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Krueger2015-07-02 06:51:14 -0400
committerJan Krueger2015-07-02 06:51:14 -0400
commit4a34d463da5c0e5402e1a9ca71b414f38b472baa (patch)
treef181d727dfc319e0109876b746f1d557c0eb6d27
parent163fa31be9acc0be81f34400987635dcbaf1fb75 (diff)
parent8856c37faaaf1519feae03dfae4d367e4d852ed0 (diff)
downloadorg.eclipse.openk-platform.openk-repo-develop-ui.tar.gz
org.eclipse.openk-platform.openk-repo-develop-ui.tar.xz
org.eclipse.openk-platform.openk-repo-develop-ui.zip
Merge https://git.eclipse.org/r/openk-platform/org.eclipse.openk-platform.openk-repodevelop-ui
-rw-r--r--openk-platform/openk-eisman-portlet/src/main/webapp/js/app.js3
-rw-r--r--openk-platform/openk-eisman-portlet/src/main/webapp/jsp/create.jsp5
-rw-r--r--openk-platform/openk-theme/src/main/webapp/css/additional.css14
3 files changed, 20 insertions, 2 deletions
diff --git a/openk-platform/openk-eisman-portlet/src/main/webapp/js/app.js b/openk-platform/openk-eisman-portlet/src/main/webapp/js/app.js
index d9680bae..3fde340a 100644
--- a/openk-platform/openk-eisman-portlet/src/main/webapp/js/app.js
+++ b/openk-platform/openk-eisman-portlet/src/main/webapp/js/app.js
@@ -953,6 +953,7 @@ app.controller('NetworkStateController', ['$scope', '$http', '$timeout', '$trans
//TODO Fehlerhandling
});
}
+
};
$scope.getSumValue = function(value){
@@ -1033,7 +1034,7 @@ app.controller('NetworkStateController', ['$scope', '$http', '$timeout', '$trans
onRegisterApi: function( gridApi ) {
$scope.gridApi = gridApi;
- /* $scope.gridApi.core.on.filterChanged( $scope, function(){
+/* $scope.gridApi.core.on.filterChanged( $scope, function(){
var grid = this.grid;
diff --git a/openk-platform/openk-eisman-portlet/src/main/webapp/jsp/create.jsp b/openk-platform/openk-eisman-portlet/src/main/webapp/jsp/create.jsp
index 5e3a1f35..2040cf7c 100644
--- a/openk-platform/openk-eisman-portlet/src/main/webapp/jsp/create.jsp
+++ b/openk-platform/openk-eisman-portlet/src/main/webapp/jsp/create.jsp
@@ -47,7 +47,10 @@
<script type="text/ng-template" id="stationlist">
<div class="col-xs-3 col-sm-3 col-md-4 table-responsive" ng-app="app" ng-controller="NetworkStateController">
- <tree-grid col-defs="treeColumns" tree-data="treeData"></tree-grid>
+ <tree-grid col-defs="treeColumns" tree-data="treeData" icon-leaf="glyphicon glyphicon-arrow-right" icon-expand="glyphicon glyphicon-folder-open" icon-collapse="glyphicon glyphicon-folder-open"></tree-grid>
+ </div>
+ <div id="stats" class="col-xs-9 col-sm-9 col-md-8 table-responsive" ng-app="app" ng-controller="NetworkStateController">
+ <div class="grid table" ui-grid="substations" ui-grid-pagination ui-grid-selection></div>
</div>
<div id="stats" class="col-xs-9 col-sm-9 col-md-8 table-responsive" ng-app="app" ng-controller="NetworkStateController">
<div class="grid table" ui-grid="substations" ui-grid-pagination ui-grid-selection></div>
diff --git a/openk-platform/openk-theme/src/main/webapp/css/additional.css b/openk-platform/openk-theme/src/main/webapp/css/additional.css
index 9528568c..5184e89d 100644
--- a/openk-platform/openk-theme/src/main/webapp/css/additional.css
+++ b/openk-platform/openk-theme/src/main/webapp/css/additional.css
@@ -70,4 +70,18 @@
border: 1px solid #b7cbda;
border-radius: 8px;
min-height:34px!important;
+}
+
+.tree-grid table, .tree-grid td {
+ border: 1px solid #ccdbe6;
+}
+
+.tree-grid .level-1 {
+ background: none repeat scroll 0 0 #f5f8fc;
+ padding-left: 5px;
+}
+
+.tree-grid .level-2 {
+ background: none repeat scroll 0 0 #ffffff;
+ padding-left: 15px;
} \ No newline at end of file

Back to the top