You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/09/26 15:03:54 UTC
[1/2] git commit: AMBARI-7515 Ambari-admin should show hover on view
parameter values also. (Max Shepel via ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk a43c0816b -> d7dd184c3
AMBARI-7515 Ambari-admin should show hover on view parameter values also. (Max Shepel via ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a5d07d6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a5d07d6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a5d07d6
Branch: refs/heads/trunk
Commit: 4a5d07d66a51a5d6569cb4430e7c16603057aa7b
Parents: 2bb687b
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Sep 26 15:51:39 2014 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Sep 26 15:51:39 2014 +0300
----------------------------------------------------------------------
.../resources/ui/admin-web/app/views/ambariViews/create.html | 2 +-
.../resources/ui/admin-web/app/views/ambariViews/edit.html | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a5d07d6/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 fa06ed4..f92efe9 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
@@ -102,7 +102,7 @@
ng-class="{'has-error' : (form.isntanceCreateForm[parameter.name].$error.required && form.isntanceCreateForm.submitted)}" >
<label for="" class="col-sm-3 control-label" ng-class="{'not-required': !parameter.required}" tooltip="{{parameter.description}}">{{parameter.name}}{{parameter.required ? '*' : ''}}</label>
<div class="col-sm-9">
- <input type="{{parameter.masked ? 'password' : 'text'}}" class="form-control viewproperty-input" name="{{parameter.name}}" ng-required="parameter.required" ng-model="parameter.value" autocomplete="off">
+ <input type="{{parameter.masked ? 'password' : 'text'}}" class="form-control viewproperty-input" name="{{parameter.name}}" ng-required="parameter.required" ng-model="parameter.value" autocomplete="off" tooltip="{{parameter.description}}">
<div class="alert alert-danger no-margin-bottom top-margin" ng-show='form.isntanceCreateForm[parameter.name].$error.required && form.isntanceCreateForm.submitted'>
This field is required.
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a5d07d6/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
index 92d319d..d3a1390 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
@@ -135,11 +135,11 @@
</div>
<div class="panel-body">
<form name="propertiesForm" class="form-horizontal" ng-hide="isConfigurationEmpty" novalidate>
- <fieldset ng-disabled="editConfigurationDisabled">
- <div class="form-group" ng-repeat="property in configurationMeta" ng-class="{'has-error' : property.required && propertiesForm[property.name].$error.required && !editConfigurationDisabled}">
- <label for="" class="control-label col-sm-3" ng-class="{'not-required': !property.required}" tooltip="{{property.description}}">{{property.name}}{{property.required ? '*' : ''}}</label>
+ <fieldset>
+ <div class="form-group" ng-repeat="property in configurationMeta" ng-class="{'has-error' : property.required && propertiesForm[property.name].$error.required && !editConfigurationDisabled}" tooltip="{{property.description}}">
+ <label for="" class="control-label col-sm-3" ng-class="{'not-required': !property.required}">{{property.name}}{{property.required ? '*' : ''}}</label>
<div class="col-sm-9">
- <input type="{{property.masked ? 'password' : 'text'}}" class="form-control propertie-input" ng-required="property.required" name="{{property.name}}" ng-model="configuration[property.name]">
+ <input type="{{property.masked ? 'password' : 'text'}}" class="form-control propertie-input" ng-required="property.required" ng-disabled="editConfigurationDisabled" name="{{property.name}}" ng-model="configuration[property.name]">
<div class="alert alert-danger no-margin-bottom top-margin" ng-show='property.required && propertiesForm[property.name].$error.required && !editConfigurationDisabled'>
This field is required.
</div>
[2/2] git commit: Merge remote-tracking branch 'origin/trunk' into
trunk
Posted by ab...@apache.org.
Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7dd184c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7dd184c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7dd184c
Branch: refs/heads/trunk
Commit: d7dd184c36985d58f501d729cc13022e040b7f23
Parents: 4a5d07d a43c081
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Sep 26 16:03:24 2014 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Sep 26 16:03:24 2014 +0300
----------------------------------------------------------------------
ambari-web/app/views/common/filter_view.js | 20 ++++++++++++++------
ambari-web/app/views/common/table_view.js | 1 +
.../views/main/dashboard/config_history_view.js | 1 +
ambari-web/app/views/main/dashboard/widgets.js | 6 ++++++
4 files changed, 22 insertions(+), 6 deletions(-)
----------------------------------------------------------------------