You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2012/09/11 07:06:22 UTC
svn commit: r1383244 - in /incubator/ambari/branches/AMBARI-666: AMBARI-666-CHANGES.txt ambari-web/app/routes/installer.js ambari-web/app/templates/installer/step8.hbs ambari-web/app/templates/installer/step9.hbs

Author: yusaku
Date: Tue Sep 11 05:06:22 2012
New Revision: 1383244

URL: http://svn.apache.org/viewvc?rev=1383244&view=rev
Log:
AMBARI-718. Fix installer navigation. (Contributed by yusaku)

Modified:
    incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
    incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step8.hbs
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs

Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1383244&r1=1383243&r2=1383244&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Tue Sep 11 05:06:22 2012
@@ -67,6 +67,8 @@ AMBARI-666 branch (unreleased changes)
 
   BUG FIXES
 
+  AMBARI-718. Fix installer navigation. (yusaku)
+
   AMBARI-684. Remove non-required dependencies from pom files (hitesh via jitendra)
 
   AMBARI-680. Fix pom structure. (hitesh)

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js?rev=1383244&r1=1383243&r2=1383244&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js Tue Sep 11 05:06:22 2012
@@ -127,7 +127,7 @@ module.exports = Em.Route.extend({
   }),
 
   step8: Em.Route.extend({
-    route: '/step7',
+    route: '/step8',
 
     connectOutlets: function (router, context) {
       router.setInstallerCurrentStep('8', false);
@@ -138,7 +138,7 @@ module.exports = Em.Route.extend({
   }),
 
   step9: Em.Route.extend({
-    route: '/step7',
+    route: '/step9',
     connectOutlets: function (router, context) {
       router.setInstallerCurrentStep('9', false);
       router.get('installerController').connectOutlet('installerStep9');
@@ -148,7 +148,7 @@ module.exports = Em.Route.extend({
   }),
 
   step10: Em.Route.extend({
-    route: '/step8',
+    route: '/step10',
     connectOutlets: function (router, context) {
       router.setInstallerCurrentStep('10', false);
       router.get('installerController').connectOutlet('installerStep10');

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step8.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step8.hbs?rev=1383244&r1=1383243&r2=1383244&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step8.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step8.hbs Tue Sep 11 05:06:22 2012
@@ -18,4 +18,4 @@
 
 <h2>{{App.messages.step8_header}}</h2>
 <a class="btn" {{action back}}>Back</a>
-<a class="btn btn-success" {{action complete}}>Complete</a>
+<a class="btn btn-success" {{action next}}>Next</a>

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs?rev=1383244&r1=1383243&r2=1383244&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs Tue Sep 11 05:06:22 2012
@@ -18,4 +18,4 @@
 
 <h2>{{App.messages.step9_header}}</h2>
 <a class="btn" {{action back}}>Back</a>
-<a class="btn btn-success" {{action complete}}>Complete</a>
+<a class="btn btn-success" {{action next}}>Next</a>