You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/04/22 20:06:51 UTC
ambari git commit: AMBARI-10667. View: create view layout is
incorrect (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk ff90c33ba -> fb87f8d29
AMBARI-10667. View: create view layout is incorrect (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb87f8d2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb87f8d2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb87f8d2
Branch: refs/heads/trunk
Commit: fb87f8d291836e7465878ac29cadbd874310d6a5
Parents: ff90c33
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Apr 22 20:46:37 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Apr 22 21:06:49 2015 +0300
----------------------------------------------------------------------
.../ambariViews/CreateViewInstanceCtrl.js | 3 +-
.../admin-web/app/views/ambariViews/create.html | 35 ++++++++++++--------
2 files changed, 24 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb87f8d2/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
index e6c047b..902a593 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
@@ -34,7 +34,7 @@ angular.module('ambariAdminConsole')
item.value = item['defaultValue'];
item.clusterConfig = !!item.clusterConfig;
item.displayName = item.name.replace(/\./g, '\.\u200B');
- $scope.numberOfClusterConfigs = item.clusterConfig ? $scope.numberOfClusterConfigs+1 : $scope.numberOfClusterConfigs;
+ item.clusterConfig ? $scope.numberOfClusterConfigs++ : $scope.numberOfSettingConfigs++;
});
$scope.clusterConfigurable = viewVersion.ViewVersionInfo.cluster_configurable;
@@ -74,6 +74,7 @@ angular.module('ambariAdminConsole')
$scope.noClusterAvailible = true;
$scope.cluster = null;
$scope.numberOfClusterConfigs = 0;
+ $scope.numberOfSettingConfigs = 0;
Cluster.getAllClusters().then(function (clusters) {
if(clusters.length >0){
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb87f8d2/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
index 08e4f26..4c8469b 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
@@ -23,14 +23,14 @@
<form class="form-horizontal create-view-form" role="form" name="form.instanceCreateForm" novalidate>
<div class="view-header">
<div class="form-group">
- <div class="col-sm-3">
+ <div class="col-sm-2">
<label for="" class="control-label">View</label>
</div>
<div class="col-sm-10"><label for="" class="control-label">{{view.ViewVersionInfo.view_name}}</label></div>
</div>
<div class="form-group">
- <div class="col-sm-3"><label for="" class="control-label">Version</label></div>
- <div class="col-sm-3">
+ <div class="col-sm-2"><label for="" class="control-label">Version</label></div>
+ <div class="col-sm-2">
<select ng-model="version" class="instanceversion-input form-control" ng-change="versionChanged()" ng-options="o as o for o in versions"></select>
</div>
</div>
@@ -38,7 +38,7 @@
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title">Settings</h3>
+ <h3 class="panel-title">Details</h3>
</div>
<div class="panel-body">
<div class="form-group"
@@ -82,6 +82,23 @@
</div>
</div>
</div>
+ <div class="form-group">
+ <div class="col-sm-10 col-sm-offset-3">
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" ng-model='instance.visible' class="visibilityCheckbox"> Visible
+ </label>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="panel panel-default" ng-hide="!numberOfSettingConfigs">
+ <div class="panel-heading">
+ <h3 class="panel-title">Settings</h3>
+ </div>
+ <div class="panel-body">
<div class="form-group" ng-repeat="parameter in instance.properties | filter:{clusterConfig:false}"
ng-class="{'has-error' : ((form.instanceCreateForm[parameter.name].$error.required && form.instanceCreateForm.submitted) || form.instanceCreateForm[parameter.name].validationError)}" >
<label for="" class="col-sm-3 control-label" ng-class="{'not-required': !parameter.required}">{{parameter.label || parameter.displayName}}{{parameter.required ? '*' : ''}}</label>
@@ -100,17 +117,9 @@
</div>
</div>
</div>
- <div class="form-group">
- <div class="col-sm-10 col-sm-offset-3">
- <div class="checkbox">
- <label>
- <input type="checkbox" ng-model='instance.visible' class="visibilityCheckbox"> Visible
- </label>
- </div>
- </div>
- </div>
</div>
</div>
+
<div class="panel panel-default" ng-hide="!numberOfClusterConfigs">
<div class="panel-heading">
<h3 class="panel-title">Cluster Configuration</h3>