ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [10/16] ambari git commit: AMBARI-18669 - Manage Journal Node Wizard Initial UI <fix_style> (rzang)
Date Thu, 27 Oct 2016 15:20:38 GMT
AMBARI-18669 - Manage Journal Node Wizard Initial UI <fix_style> (rzang)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: d52154ee1e526efb78b1847106d0ea85462d596b
Parents: 0c5bcbb
Author: Richard Zang <rzang@apache.org>
Authored: Wed Oct 26 18:08:52 2016 -0700
Committer: Richard Zang <rzang@apache.org>
Committed: Wed Oct 26 18:08:52 2016 -0700

----------------------------------------------------------------------
 .../app/routes/manage_journalnode_routes.js     |  3 +-
 .../highAvailability/journalNode/wizard.hbs     | 34 ++++++++------------
 2 files changed, 15 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d52154ee/ambari-web/app/routes/manage_journalnode_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/manage_journalnode_routes.js b/ambari-web/app/routes/manage_journalnode_routes.js
index b108f74..4803ca7 100644
--- a/ambari-web/app/routes/manage_journalnode_routes.js
+++ b/ambari-web/app/routes/manage_journalnode_routes.js
@@ -26,7 +26,8 @@ module.exports = App.WizardRoute.extend({
     manageJournalNodeWizardController.dataLoading().done(function () {
       App.router.get('updateController').set('isWorking', false);
       var popup = App.ModalPopup.show({
-        classNames: ['full-width-modal'],
+        classNames: ['wizard-modal-wrapper'],
+        modalDialogClasses: ['modal-xlg'],
         header: Em.I18n.t('admin.manageJournalNode.wizard.header'),
         bodyClass: App.ManageJournalNodeWizardView.extend({
           controller: manageJournalNodeWizardController

http://git-wip-us.apache.org/repos/asf/ambari/blob/d52154ee/ambari-web/app/templates/main/admin/highAvailability/journalNode/wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/journalNode/wizard.hbs b/ambari-web/app/templates/main/admin/highAvailability/journalNode/wizard.hbs
index a15b8c0..c191d50 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/journalNode/wizard.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/journalNode/wizard.hbs
@@ -17,27 +17,19 @@
 }}
 
 <div class="wizard">
-    <div class="container">
-        <div class="container-fluid">
-            <div class="row-fluid">
-                <div class="span3">
-                    <!--Sidebar content-->
-                    <div class="well">
-                        <ul class="nav nav-pills nav-stacked">
-                            <li class="nav-header">{{t admin.manageJournalNode.wizard.header}}</li>
-                            <li {{bindAttr class="isStep1:active view.isStep1Disabled:disabled"}}><a
href="javascript:void(null);"  {{action gotoStep1 target="controller"}}>{{t admin.manageJournalNode.wizard.step1.header}}</a></li>
-                            <li {{bindAttr class="isStep2:active view.isStep2Disabled:disabled"}}><a
href="javascript:void(null);"  {{action gotoStep2 target="controller"}}>{{t admin.manageJournalNode.wizard.step2.header}}</a></li>
-                            <li {{bindAttr class="isStep3:active view.isStep3Disabled:disabled"}}><a
href="javascript:void(null);"  {{action gotoStep3 target="controller"}}>{{t admin.manageJournalNode.wizard.step3.header}}</a></li>
-                            <li {{bindAttr class="isStep4:active view.isStep4Disabled:disabled"}}><a
href="javascript:void(null);"  {{action gotoStep4 target="controller"}}>{{t admin.manageJournalNode.wizard.step4.header}}</a></li>
-                            <li {{bindAttr class="isStep5:active view.isStep5Disabled:disabled"}}><a
href="javascript:void(null);"  {{action gotoStep5 target="controller"}}>{{t admin.manageJournalNode.wizard.step5.header}}</a></li>
-                            <li {{bindAttr class="isStep6:active view.isStep6Disabled:disabled"}}><a
href="javascript:void(null);"  {{action gotoStep6 target="controller"}}>{{t admin.manageJournalNode.wizard.step6.header}}</a></li>
-                        </ul>
-                    </div>
-                </div>
-                <div class="wizard-content well span9">
-                    {{outlet}}
-                </div>
-            </div>
+    <div class="wizard-body row">
+        <div class="wizard-nav col-md-3">
+            <ul class="nav nav-pills nav-stacked">
+                <li {{bindAttr class="isStep1:active view.isStep1Disabled:disabled view.isStep1Completed:completed"}}><a
href="javascript:void(null);"  {{action gotoStep1 target="controller"}}><i class="step-marker"><span
class="step-index">1</span></i><p class="step-name">{{t admin.manageJournalNode.wizard.step1.header}}</p></a></li>
+                <li {{bindAttr class="isStep2:active view.isStep2Disabled:disabled view.isStep2Completed:completed"}}><a
href="javascript:void(null);"  {{action gotoStep2 target="controller"}}><i class="step-marker"><span
class="step-index">2</span></i><p class="step-name">{{t admin.manageJournalNode.wizard.step2.header}}</p></a></li>
+                <li {{bindAttr class="isStep3:active view.isStep3Disabled:disabled view.isStep3Completed:completed"}}><a
href="javascript:void(null);"  {{action gotoStep3 target="controller"}}><i class="step-marker"><span
class="step-index">3</span></i><p class="step-name">{{t admin.manageJournalNode.wizard.step3.header}}</p></a></li>
+                <li {{bindAttr class="isStep4:active view.isStep4Disabled:disabled view.isStep4Completed:completed"}}><a
href="javascript:void(null);"  {{action gotoStep4 target="controller"}}><i class="step-marker"><span
class="step-index">4</span></i><p class="step-name">{{t admin.manageJournalNode.wizard.step4.header}}</p></a></li>
+                <li {{bindAttr class="isStep5:active view.isStep5Disabled:disabled view.isStep5Completed:completed"}}><a
href="javascript:void(null);"  {{action gotoStep5 target="controller"}}><i class="step-marker"><span
class="step-index">5</span></i><p class="step-name">{{t admin.manageJournalNode.wizard.step5.header}}</p></a></li>
+                <li {{bindAttr class="isStep6:active view.isStep6Disabled:disabled view.isStep6Completed:completed"}}><a
href="javascript:void(null);"  {{action gotoStep6 target="controller"}}><i class="step-marker"><span
class="step-index">6</span></i><p class="step-name">{{t admin.manageJournalNode.wizard.step6.header}}</p></a></li>
+            </ul>
+        </div>
+        <div class="wizard-content col-md-9">
+            {{outlet}}
         </div>
     </div>
 </div>


Mime
View raw message