Переглянути джерело

AMBARI-8616. Kerberos Wizard: make the markup test friendly. (jaimin)

Jaimin Jetly 10 роки тому
батько
коміт
bd3aea50a6

+ 1 - 1
ambari-web/app/styles/application.less

@@ -942,7 +942,7 @@ h1 {
       margin-left: 0;
     }
   }
-  #ha-progress-page {
+  #common-progress-page {
     .item {
       line-height: 40px;
       width:100%;

+ 1 - 1
ambari-web/app/templates/common/progress.hbs

@@ -15,7 +15,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-<div id="ha-progress-page">
+<div id="common-progress-page">
   <h2>{{view.headerTitle}}</h2>
 
   <div {{bindAttr class="view.noticeClass"}}>{{{view.notice}}}

+ 29 - 25
ambari-web/app/templates/main/admin/kerberos/step1.hbs

@@ -16,32 +16,36 @@
 * limitations under the License.
 }}
 
-<h2>{{t admin.kerberos.wizard.step1.header}}</h2>
-<p class="alert alert-info">
-  {{t admin.kerberos.wizard.step1.info.body}}
-</p>
-<div class="alert">
-  {{t admin.kerberos.wizard.step1.alert.body}}
-</div>
+<div id="kerberos-wizard-step1">
+  <h2>{{t admin.kerberos.wizard.step1.header}}</h2>
 
-<div class="step1-options-body">
-  {{t admin.kerberos.wizard.step1.body.text}}
-  {{#each option in options}}
-    <label>
-      {{view Ember.RadioButton name="option.displayName" selectionBinding="selectedItem" valueBinding="option.value"}}  {{option.displayName}}
-    </label>
-  {{/each}}
-  <br/>
-</div>
-<div class="alert alert-info step1-prerequisites-body">
-  <h5>{{selectedOption.displayName}}:</h5>
-  <b>{{t admin.kerberos.wizard.step1.prerequisites.label}}</b> <br/> <br/>
-  {{#each condition in selectedOption.preConditions}}
-    <label class="checkbox"> {{view Ember.Checkbox  checkedBinding="condition.checked"}} {{condition.displayText}} </label>
-  {{/each}}
-</div>
+  <p class="alert alert-info">
+    {{t admin.kerberos.wizard.step1.info.body}}
+  </p>
 
+  <div class="alert">
+    {{t admin.kerberos.wizard.step1.alert.body}}
+  </div>
 
-<div class="btn-area">
-  <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action "next" target="controller"}}>{{t common.next}} &rarr;</a>
+  <div id="kerberos-step1-options-body">
+    {{t admin.kerberos.wizard.step1.body.text}}
+    {{#each option in options}}
+      <label class="checkbox kerberos-step1-option-radiobutton">
+        {{view Ember.RadioButton name="option.displayName" selectionBinding="selectedItem" valueBinding="option.value"}}  {{option.displayName}}
+      </label>
+    {{/each}}
+    <br/>
+  </div>
+  <div class="alert alert-info" id="kerberos-step1-prerequisites-body">
+    <h5>{{selectedOption.displayName}}:</h5>
+    <b>{{t admin.kerberos.wizard.step1.prerequisites.label}}</b> <br/> <br/>
+    {{#each condition in selectedOption.preConditions}}
+      <label class="checkbox kerberos-step1-prerequiste-checkboxes"> {{view Ember.Checkbox  checkedBinding="condition.checked"}} {{condition.displayText}} </label>
+    {{/each}}
+  </div>
+
+
+  <div class="btn-area">
+    <a id="submit-kerberos-step1" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action "next" target="controller"}}>{{t common.next}} &rarr;</a>
+  </div>
 </div>

+ 17 - 14
ambari-web/app/templates/main/admin/kerberos/step2.hbs

@@ -16,20 +16,23 @@
 * limitations under the License.
 }}
 
-<div id="serviceConfig">
-  <h2>{{t admin.kerberos.wizard.step2.header}}</h2>
-  <div class="alert alert-info">
-    {{t admin.kerberos.wizard.step2.info.body}}
-  </div>
-  {{#if isConfigsLoaded}}
-    {{view App.ServicesConfigView}}
-  {{else}}
-    <div class="spinner"></div>
-  {{/if}}
+<div id="kerberos-wizard-step2">
+  <div id="serviceConfig">
+    <h2>{{t admin.kerberos.wizard.step2.header}}</h2>
+
+    <div class="alert alert-info">
+      {{t admin.kerberos.wizard.step2.info.body}}
+    </div>
+    {{#if isConfigsLoaded}}
+      {{view App.ServicesConfigView}}
+    {{else}}
+      <div class="spinner"></div>
+    {{/if}}
 
-  <div class="btn-area">
-    <a class="btn" {{action back}}>&larr; {{t common.back}}</a>
-    <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}}
-      {{action submit target="controller"}}>{{t common.next}} &rarr;</a>
+    <div class="btn-area">
+      <a id="back-kerberos-step2" class="btn" {{action back}}>&larr; {{t common.back}}</a>
+      <a id="submit-kerberos-step2" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}}
+        {{action submit target="controller"}}>{{t common.next}} &rarr;</a>
+    </div>
   </div>
 </div>

+ 3 - 1
ambari-web/app/templates/main/admin/kerberos/step3.hbs

@@ -15,4 +15,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-{{template "templates/common/progress"}}
+<div id="kerberos-wizard-step3">
+  {{template "templates/common/progress"}}
+</div>

+ 13 - 9
ambari-web/app/templates/main/admin/kerberos/step4.hbs

@@ -15,16 +15,20 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-<div id="serviceConfig">
-  <h2>{{t admin.kerberos.wizard.step4.header}}</h2>
-  <p class="alert alert-info">
-    {{t admin.kerberos.wizard.step4.info.body}}
-  </p>
+<div id="kerberos-wizard-step4">
+  <div id="serviceConfig">
+    <h2>{{t admin.kerberos.wizard.step4.header}}</h2>
 
-  {{view App.ServicesConfigView}}
+    <p class="alert alert-info">
+      {{t admin.kerberos.wizard.step4.info.body}}
+    </p>
 
-  <div class="btn-area">
-    <button id="submit-kerberos-step4" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}}
-       {{action submit target="controller"}}>{{t common.next}} &rarr;</button>
+    {{view App.ServicesConfigView}}
+
+    <div class="btn-area">
+      <button id="back-kerberos-step4" class="btn" {{action back}}>&larr; {{t common.back}}</button>
+      <button id="submit-kerberos-step4" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}}
+        {{action submit target="controller"}}>{{t common.next}} &rarr;</button>
+    </div>
   </div>
 </div>

+ 4 - 1
ambari-web/app/templates/main/admin/kerberos/step5.hbs

@@ -15,4 +15,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-{{template "templates/common/progress"}}
+
+<div id="kerberos-wizard-step5">
+  {{template "templates/common/progress"}}
+</div>

+ 3 - 1
ambari-web/app/templates/main/admin/kerberos/step6.hbs

@@ -15,4 +15,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-{{template "templates/common/progress"}}
+<div id="kerberos-wizard-step6">
+  {{template "templates/common/progress"}}
+</div>