Repository: ambari Updated Branches: refs/heads/trunk 620329c5b -> 2e3a29ef5
AMBARI-18743. Improve wizard styles and apply on Ambari - add 'move master wizard' (xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2e3a29ef Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2e3a29ef Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2e3a29ef Branch: refs/heads/trunk Commit: 2e3a29ef5aa4f3c74f358fe03ce9a12d83bd0c30 Parents: 620329c Author: Xi Wang <xiw...@apache.org> Authored: Wed Nov 9 15:18:11 2016 -0800 Committer: Xi Wang <xiw...@apache.org> Committed: Wed Nov 9 15:18:11 2016 -0800 ---------------------------------------------------------------------- .../templates/main/service/reassign/step1.hbs | 21 ++++---- .../templates/main/service/reassign/step3.hbs | 52 +++++++++++--------- .../templates/main/service/reassign/step5.hbs | 22 ++++++--- 3 files changed, 56 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2e3a29ef/ambari-web/app/templates/main/service/reassign/step1.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/reassign/step1.hbs b/ambari-web/app/templates/main/service/reassign/step1.hbs index 9862cbe..f34a9a1 100644 --- a/ambari-web/app/templates/main/service/reassign/step1.hbs +++ b/ambari-web/app/templates/main/service/reassign/step1.hbs @@ -15,13 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. }} - -<h2>{{t services.reassign.step1.header}}</h2> -<div class="alert alert-info"> - {{#each message in view.message}} - {{{message}}} - {{/each}} -</div> -<div class="btn-area"> - <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} →</a> +<div class="wizard-content col-md-9"> + <h4 class="step-title">{{t services.reassign.step1.header}}</h4> + <p class="step-description"> + {{#each message in view.message}} + {{{message}}} + {{/each}} + </p> </div> +<div class="wizard-footer col-md-12"> + <div class="btn-area"> + <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} →</a> + </div> +</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2e3a29ef/ambari-web/app/templates/main/service/reassign/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/reassign/step3.hbs b/ambari-web/app/templates/main/service/reassign/step3.hbs index 1e8dfe0..1f88fb5 100644 --- a/ambari-web/app/templates/main/service/reassign/step3.hbs +++ b/ambari-web/app/templates/main/service/reassign/step3.hbs @@ -15,31 +15,37 @@ * See the License for the specific language governing permissions and * limitations under the License. }} +<div class="wizard-content col-md-9"> + <h4 class="step-title">{{t services.reassign.step3.header}}</h4> + <p class="step-description"> + {{t services.reassign.step3.body}} + </p> + {{#if view.jdbcSetupMessage}} + <div class="alert alert-warning"> + {{{view.jdbcSetupMessage}}} + </div> + {{/if}} + <div class="panel panel-default"> + <div class="panel-body"> + <div id="step8-content" class="well pre-scrollable"> + <div id="printReview"> + <a class="btn btn-info pull-right" {{action printReview target="view"}}>{{t common.print}}</a> <br/> + </div> + <div id="step8-info"> + <p><b>{{t services.reassign.step3.component}}</b> {{controller.content.reassign.display_name}}</p> -<h2>{{t services.reassign.step3.header}}</h2> + <p><b>{{t services.reassign.step3.sourceHost}}</b> {{view.sourceHost}}</p> -<div class="alert alert-info"> - {{t services.reassign.step3.body}} -</div> -{{#if view.jdbcSetupMessage}} - <div class="alert alert-warning"> - {{{view.jdbcSetupMessage}}} - </div> -{{/if}} -<div id="step8-content" class="well pre-scrollable"> - <div id="printReview"> - <a class="btn btn-info pull-right" {{action printReview target="view"}}>{{t common.print}}</a> <br/> - </div> - <div id="step8-info"> - <p><b>{{t services.reassign.step3.component}}</b> {{controller.content.reassign.display_name}}</p> - - <p><b>{{t services.reassign.step3.sourceHost}}</b> {{view.sourceHost}}</p> - - <p><b>{{t services.reassign.step3.targetHost}}</b> {{view.targetHost}}</p> + <p><b>{{t services.reassign.step3.targetHost}}</b> {{view.targetHost}}</p> + </div> + </div> + </div> </div> </div> -<div class="btn-area"> - <a class="btn btn-default pull-left" {{action back href="true"}}>← {{t common.back}}</a> - <a class="btn btn-success pull-right" - id="spinner" {{bindAttr disabled="controller.isSubmitDisabled"}} {{action submit target="controller"}}>{{t common.deploy}} →</a> +<div class="wizard-footer col-md-12"> + <div class="btn-area"> + <a class="btn btn-default pull-left" {{action back href="true"}}>← {{t common.back}}</a> + <a class="btn btn-success pull-right" + id="spinner" {{bindAttr disabled="controller.isSubmitDisabled"}} {{action submit target="controller"}}>{{t common.deploy}} →</a> + </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2e3a29ef/ambari-web/app/templates/main/service/reassign/step5.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/reassign/step5.hbs b/ambari-web/app/templates/main/service/reassign/step5.hbs index aee9c5b..a9cfb45 100644 --- a/ambari-web/app/templates/main/service/reassign/step5.hbs +++ b/ambari-web/app/templates/main/service/reassign/step5.hbs @@ -15,12 +15,20 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -<h2>{{t services.reassign.step5.header}}</h2> -{{{view.manualCommands}}} -{{!#if view.securityNotice}} - {{!{view.securityNotice}} -{{!/if}} -<div class="btn-area"> - <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} →</a> +<div class="wizard-content col-md-9"> + <h4 class="step-title">{{t services.reassign.step5.header}}</h4> + <div class="panel panel-default"> + <div class="panel-body"> + {{{view.manualCommands}}} + {{!#if view.securityNotice}} + {{!{view.securityNotice}} + {{!/if}} + </div> + </div> +</div> +<div class="wizard-footer col-md-12"> + <div class="btn-area"> + <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} →</a> + </div> </div>
