incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1482167 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/messages.js ambari-web/app/routes/main.js ambari-web/app/templates/main/host/details.hbs
Date Tue, 14 May 2013 01:13:00 GMT
Author: yusaku
Date: Tue May 14 01:12:59 2013
New Revision: 1482167

URL: http://svn.apache.org/r1482167
Log:
 AMBARI-2122. Improve navigation when jumping from one page to Host Details page and back.
(yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/messages.js
    incubator/ambari/trunk/ambari-web/app/routes/main.js
    incubator/ambari/trunk/ambari-web/app/templates/main/host/details.hbs

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1482167&r1=1482166&r2=1482167&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue May 14 01:12:59 2013
@@ -293,6 +293,9 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-2122. Improve navigation when jumping from one page to Host Details
+ page and back. (yusaku)
+
  AMBARI-2121. Allow Nagios user to be customized during install. (yusaku)
 
  AMBARI-2111. Enable customization of smoke test user. (yusaku)

Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1482167&r1=1482166&r2=1482167&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Tue May 14 01:12:59 2013
@@ -816,7 +816,6 @@ Em.I18n.translations = {
   'services.hbase.master.error':'None of the HBase masters is active',
 
   'hosts.host.add':'Add New Hosts',
-  'hosts.host.back':'Back to Hosts',
   'hosts.table.noHosts':'No hosts to display',
   
   'hosts.selectHostsDialog.title': 'Select Exception Hosts',

Modified: incubator/ambari/trunk/ambari-web/app/routes/main.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/main.js?rev=1482167&r1=1482166&r2=1482167&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/main.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/main.js Tue May 14 01:12:59 2013
@@ -518,8 +518,8 @@ module.exports = Em.Route.extend({
       }
     }),
 
-    backToHostsList: function (router, event) {
-      router.transitionTo('hosts.index');
+    back: function (router, event) {
+      window.history.back();
     },
 
     showDetails: function (router, event) {

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/host/details.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/host/details.hbs?rev=1482167&r1=1482166&r2=1482167&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/host/details.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/host/details.hbs Tue May 14 01:12:59
2013
@@ -23,7 +23,7 @@
   {{else}}
     <span class="label label-success alerts-count" {{action "showAlertsPopup" content
target="App.router.mainHostController"}}>{{t hosts.host.alert.noAlerts}}</span>
   {{/if}}
-  <div><a href="javascript:void(null)" data-toggle="modal" {{action backToHostsList}}><i
class="icon-arrow-left"></i>&nbsp;{{t hosts.host.back}}</a></div>
+  <div><a href="javascript:void(null)" data-toggle="modal" {{action back}}><i
class="icon-arrow-left"></i>&nbsp;{{t common.back}}</a></div>
 <!--   {{#if App.isAdmin}} -->
 <!--   <div class="host-maintenance"> -->
 <!--     <div class="host-maintenance-btn btn-group display-inline-block"> -->



Mime
View raw message