Repository: ambari Updated Branches: refs/heads/trunk bf2e51900 -> bd3aea50a
AMBARI-8616. Kerberos Wizard: make the markup test friendly. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bd3aea50 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd3aea50 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd3aea50 Branch: refs/heads/trunk Commit: bd3aea50a66199d16de10096069f906db0b8b944 Parents: bf2e519 Author: Jaimin Jetly <[email protected]> Authored: Wed Dec 10 12:37:51 2014 -0800 Committer: Jaimin Jetly <[email protected]> Committed: Wed Dec 10 12:37:57 2014 -0800 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 2 +- ambari-web/app/templates/common/progress.hbs | 2 +- .../app/templates/main/admin/kerberos/step1.hbs | 54 +++++++++++--------- .../app/templates/main/admin/kerberos/step2.hbs | 31 ++++++----- .../app/templates/main/admin/kerberos/step3.hbs | 4 +- .../app/templates/main/admin/kerberos/step4.hbs | 22 ++++---- .../app/templates/main/admin/kerberos/step5.hbs | 5 +- .../app/templates/main/admin/kerberos/step6.hbs | 4 +- 8 files changed, 71 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3aea50/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index ef6f618..7ac2ea8 100644 --- a/ambari-web/app/styles/application.less +++ b/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%; http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3aea50/ambari-web/app/templates/common/progress.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/progress.hbs b/ambari-web/app/templates/common/progress.hbs index ad7a30b..cf573e5 100644 --- a/ambari-web/app/templates/common/progress.hbs +++ b/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}}} http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3aea50/ambari-web/app/templates/main/admin/kerberos/step1.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos/step1.hbs b/ambari-web/app/templates/main/admin/kerberos/step1.hbs index 9f04342..ef99c1b 100644 --- a/ambari-web/app/templates/main/admin/kerberos/step1.hbs +++ b/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}} →</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}} →</a> + </div> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3aea50/ambari-web/app/templates/main/admin/kerberos/step2.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos/step2.hbs b/ambari-web/app/templates/main/admin/kerberos/step2.hbs index 2fdf55b..c91167b 100644 --- a/ambari-web/app/templates/main/admin/kerberos/step2.hbs +++ b/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}}>← {{t common.back}}</a> - <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} - {{action submit target="controller"}}>{{t common.next}} →</a> + <div class="btn-area"> + <a id="back-kerberos-step2" class="btn" {{action back}}>← {{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}} →</a> + </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3aea50/ambari-web/app/templates/main/admin/kerberos/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos/step3.hbs b/ambari-web/app/templates/main/admin/kerberos/step3.hbs index 08dc3b9..c74b677 100644 --- a/ambari-web/app/templates/main/admin/kerberos/step3.hbs +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3aea50/ambari-web/app/templates/main/admin/kerberos/step4.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos/step4.hbs b/ambari-web/app/templates/main/admin/kerberos/step4.hbs index 1039b61..6d71c0c 100644 --- a/ambari-web/app/templates/main/admin/kerberos/step4.hbs +++ b/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}} →</button> + {{view App.ServicesConfigView}} + + <div class="btn-area"> + <button id="back-kerberos-step4" class="btn" {{action back}}>← {{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}} →</button> + </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3aea50/ambari-web/app/templates/main/admin/kerberos/step5.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos/step5.hbs b/ambari-web/app/templates/main/admin/kerberos/step5.hbs index 08dc3b9..d8307fb 100644 --- a/ambari-web/app/templates/main/admin/kerberos/step5.hbs +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/bd3aea50/ambari-web/app/templates/main/admin/kerberos/step6.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos/step6.hbs b/ambari-web/app/templates/main/admin/kerberos/step6.hbs index 08dc3b9..e77077d 100644 --- a/ambari-web/app/templates/main/admin/kerberos/step6.hbs +++ b/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>
