ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gna...@apache.org
Subject ambari git commit: AMBARI-19454. Label changes and missing fields for action nodes (Madhan Mohan Reddy via gauravn7)
Date Wed, 11 Jan 2017 14:07:10 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 5f62d3f56 -> 9bf6bdfb1


AMBARI-19454. Label changes and missing fields for action nodes (Madhan Mohan Reddy via gauravn7)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9bf6bdfb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9bf6bdfb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9bf6bdfb

Branch: refs/heads/trunk
Commit: 9bf6bdfb14dc7c69f2a1ccb37ed71f68a1eefb78
Parents: 5f62d3f
Author: Gaurav Nagar <grvngr@gmail.com>
Authored: Wed Jan 11 19:36:17 2017 +0530
Committer: Gaurav Nagar <grvngr@gmail.com>
Committed: Wed Jan 11 19:37:00 2017 +0530

----------------------------------------------------------------------
 .../src/main/resources/ui/app/styles/app.less       |  3 +++
 .../ui/app/templates/components/arg-config.hbs      | 13 ++++---------
 .../ui/app/templates/components/file-config.hbs     |  8 ++------
 .../ui/app/templates/components/java-action.hbs     |  4 ++--
 .../app/templates/components/name-value-config.hbs  | 16 ++++------------
 .../ui/app/templates/components/prepare-config.hbs  |  8 ++------
 .../ui/app/templates/components/spark-action.hbs    |  4 ++--
 .../ui/app/templates/components/ssh-action.hbs      |  2 +-
 8 files changed, 20 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9bf6bdfb/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
index 0c1e4ed..dcf2905 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
@@ -1612,3 +1612,6 @@ input:invalid {
 .margin3{
   margin: 3px;
 }
+.visibility-hidden {
+  visibility: hidden;
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/9bf6bdfb/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/arg-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/arg-config.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/arg-config.hbs
index bcf393b..e11d896 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/arg-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/arg-config.hbs
@@ -18,13 +18,7 @@
 <div>
   {{#each args as |arg index|}}
     <div class="form-group">
-      {{#if (eq index 0)}}
-        
-        <label class="control-label col-xs-2">{{#unless hideLabel}}{{title}}{{/unless}}</label>
-        
-      {{else}}
-        <label class="control-label col-xs-2"></label>
-      {{/if}}
+      <label class="control-label col-xs-2 {{if (or (not-eq index 0) hideLabel) 'visibility-hidden'}}">{{title}}</label>
       <div class=" col-xs-7">
         {{input type="text" class="form-control" value=arg.value placeholder=title}}
       </div>
@@ -35,9 +29,10 @@
   {{/each}}
   <div class="form-group">
     {{#if args}}
-      <label class="control-label col-xs-2"></label>
+      <label class="control-label col-xs-2 visibility-hidden">{{title}}</label>
     {{else}}
-      <label class="control-label col-xs-2">{{#unless hideLabel}}{{title}}{{/unless}}</label>
+      {{#unless hideLabel}}<label class="control-label col-xs-2">{{title}}</label>{{/unless}}
+      {{#if hideLabel}}<label class="control-label col-xs-2 visibility-hidden">{{title}}</label>{{/if}}
     {{/if}}
     <div class=" col-xs-7">
       {{input type="text" class="form-control" value=arg placeholder=title}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/9bf6bdfb/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/file-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/file-config.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/file-config.hbs
index 7111c31..66d3460 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/file-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/file-config.hbs
@@ -18,11 +18,7 @@
 <div id="fileHolder">
   {{#each files as |file index|}}
   <div class="form-group">
-    {{#if (eq index 0)}}
-      <label class="control-label col-xs-2">{{title}}</label>
-    {{else}}
-      <label class="control-label col-xs-2"></label>
-    {{/if}}
+    <label class="control-label col-xs-2 {{if (not-eq index 0) 'visibility-hidden'}}">{{title}}</label>
     <div class="col-xs-7">
       <div class="input-group">
         {{input type="text" class="form-control" value=file.value placeholder=title}}
@@ -38,7 +34,7 @@
   {{/each}}
   <div class="form-group">
     {{#if files}}
-      <label class="control-label col-xs-2"></label>
+      <label class="control-label col-xs-2 visibility-hidden">{{title}}</label>
     {{else}}
       <label class="control-label col-xs-2">{{title}}</label>
     {{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/9bf6bdfb/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/java-action.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/java-action.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/java-action.hbs
index bdb5261..3de5677 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/java-action.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/java-action.hbs
@@ -27,7 +27,7 @@
     </div>
 
     <div class="form-group">
-      <label class="control-label col-xs-2">Java opts</label>
+      <label class="control-label col-xs-2">Java Options</label>
       <div class="col-xs-3">
         <input type="radio" name="javaOpt" checked={{if (eq isSingle false) 'checked'}}
 {{action "onJavaOptChange" "multiple" preventDefault=false on="change"}}> Java Option
List
       </div>
@@ -37,7 +37,7 @@
     </div>
     {{#if isSingle}}
     <div class="form-group">
-      <label for="inputPassword" class="control-label col-xs-2"></label>
+      <label for="inputPassword" class="control-label col-xs-2 visibility-hidden">Java
opts</label>
       <div class="col-xs-7">
         {{input type="text" class="form-control" value=actionModel.javaOpts name="java-opts"
placeholder="Java opts"}}
       </div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9bf6bdfb/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/name-value-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/name-value-config.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/name-value-config.hbs
index 7d28d00..f69a2d4 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/name-value-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/name-value-config.hbs
@@ -19,19 +19,11 @@
   {{#each configuration.property as |property index|}}
   {{#if (not property.static)}}
   <div class="form-group">
-    {{#if (eq index 0)}}
-      <label class="control-label col-xs-2">Name</label>
-    {{else}}
-      <label class="control-label col-xs-2"></label>
-    {{/if}}
+    <label class="control-label col-xs-2 {{if (not-eq index 0) 'visibility-hidden'}}">Name</label>
     <div class=" col-xs-3">
       {{input type="text" class="form-control" value=property.name placeholder="name"}}
     </div>
-    {{#if (eq index 0)}}
-      <label class="control-label col-xs-1">Value</label>
-    {{else}}
-      <label class="control-label col-xs-1"></label>
-    {{/if}}
+    <label class="control-label col-xs-1 {{if (not-eq index 0) 'visibility-hidden'}}">Value</label>
     <div class=" col-xs-3">
       {{input class="form-control" type="text" value=property.value placeholder="value"}}
     </div>
@@ -43,7 +35,7 @@
   {{/each}}
   <div class="form-group">
     {{#if configuration.property}}
-      <label class="control-label col-xs-2"></label>
+      <label class="control-label col-xs-2 visibility-hidden">Name</label>
     {{else}}
       <label class="control-label col-xs-2">Name</label>
     {{/if}}
@@ -51,7 +43,7 @@
       {{input type="text" class="form-control" name="name" value=propertyName placeholder="name"}}
     </div>
     {{#if configuration.property}}
-      <label class="control-label col-xs-1"></label>
+      <label class="control-label col-xs-1 visibility-hidden">Value</label>
     {{else}}
       <label class="control-label col-xs-1">Value</label>
     {{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/9bf6bdfb/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config.hbs
index 6c6c750..fab0d97 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config.hbs
@@ -18,11 +18,7 @@
 <div id="prepareHolder">
   {{#each prepare as |prep index|}}
     <div class="form-group">
-      {{#if (eq index 0)}}
-        <label class="control-label col-xs-2">Prepare</label>
-      {{else}}
-        <label class="control-label col-xs-2"></label>
-      {{/if}}
+      <label class="control-label col-xs-2 {{if (not-eq index 0) 'visibility-hidden'}}">Prepare</label>
       <div class=" col-xs-2">
         <select class="form-control" onchange={{action (mut prep.type) value="target.value"}}>
           <option value="mkdir" selected={{eq prep.type "mkdir"}}>mkdir</option>
@@ -44,7 +40,7 @@
   {{/each}}
   <div class="form-group">
     {{#if prepare}}
-      <label class="control-label col-xs-2"></label>
+      <label class="control-label col-xs-2 visibility-hidden">Prepare</label>
     {{else}}
       <label class="control-label col-xs-2">Prepare</label>
     {{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/9bf6bdfb/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
index 52bdad5..5b7e7a3 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
@@ -19,7 +19,7 @@
   <div class="panel-heading">General</div>
   <div class="panel-body">
     <div class="form-group">
-      <label for="inputPassword" class="control-label col-xs-2">Name<span class="requiredField">&nbsp;*</span></label>
+      <label for="inputPassword" class="control-label col-xs-2">Application Name<span
class="requiredField">&nbsp;*</span></label>
       <div class="col-xs-7">
         {{input type="text" class="form-control" name="spark-name" value=actionModel.sparkName
placeholder="Spark Name"}}
         {{field-error model=this field='actionModel.sparkName' showErrorMessage=showErrorMessage}}
@@ -91,7 +91,7 @@
     <div class=" panel panel-default">
       <div class="panel-body handlerPanel">
         <div class="form-group">
-          <label for="inputEmail" class="control-label col-xs-2">Job tracker</label>
+          <label for="inputEmail" class="control-label col-xs-2">Resource Manager</label>
           <div class="col-xs-7">
             {{input type="text" class="form-control" name="job-tracker" value=actionModel.jobTracker
placeholder="Job tracker"}}
           </div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9bf6bdfb/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action.hbs
index ab2ebb2..64f3906 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action.hbs
@@ -34,7 +34,7 @@
     </div>
 
     <div class="form-group">
-      <label class="control-label col-xs-2"></label>
+      <label class="control-label col-xs-2 visibility-hidden">Args</label>
       <div class="col-xs-2">
         <input type="radio" name="Args" checked={{if (eq isSingle false) 'checked'}} 
{{action "onJavaOptChange" "multiple" preventDefault=false on="change"}}> Args
       </div>


Mime
View raw message