incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1471204 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/messages.js ambari-web/app/styles/application.less ambari-web/app/templates/common/host_progress_popup.hbs
Date Tue, 23 Apr 2013 23:17:42 GMT
Author: yusaku
Date: Tue Apr 23 23:17:42 2013
New Revision: 1471204

URL: http://svn.apache.org/r1471204
Log:
AMBARI-2004. Background Operation Popup needs label/styling fixes. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/messages.js
    incubator/ambari/trunk/ambari-web/app/styles/application.less
    incubator/ambari/trunk/ambari-web/app/templates/common/host_progress_popup.hbs

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1471204&r1=1471203&r2=1471204&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Apr 23 23:17:42 2013
@@ -269,6 +269,9 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-2004. Background Operation Popup needs label/styling fixes.
+ (yusaku)
+
  AMBARI-2003. Hosts tab: clicking on red badge should not toggle "Alerts"
  filter. (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=1471204&r1=1471203&r2=1471204&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Tue Apr 23 23:17:42 2013
@@ -127,6 +127,7 @@ Em.I18n.translations = {
   'common.stats':'Stats',
   'common.abort': 'Abort',
   'common.misc': 'Misc',
+  'common.operations': 'Operations',
 
   'requestInfo.installComponents':'Install Components',
   'requestInfo.installServices':'Install Services',

Modified: incubator/ambari/trunk/ambari-web/app/styles/application.less
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/styles/application.less?rev=1471204&r1=1471203&r2=1471204&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/styles/application.less (original)
+++ incubator/ambari/trunk/ambari-web/app/styles/application.less Tue Apr 23 23:17:42 2013
@@ -1235,7 +1235,7 @@ a:focus {
       float: right;
       margin-top: -20px;
 
-      div {
+      a {
         cursor: pointer;
       }
       .task-detail-copy {

Modified: incubator/ambari/trunk/ambari-web/app/templates/common/host_progress_popup.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/common/host_progress_popup.hbs?rev=1471204&r1=1471203&r2=1471204&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/common/host_progress_popup.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/common/host_progress_popup.hbs Tue Apr
23 23:17:42 2013
@@ -22,7 +22,7 @@
 
     <div {{bindAttr class="view.isServiceListHidden:hidden :task-list-main-warp"}}>
       <div class="task-top-wrap">
-        {{t common.services}}
+        {{t common.operations}}
         <div class="select-wrap">
           {{t common.show}}:
           {{view Ember.Select
@@ -64,14 +64,10 @@
 
   <div {{bindAttr class="view.isHostListHidden:hidden :task-list-main-warp"}}>
     <div class="task-top-wrap">
-      {{#if controller.showServices}}
-        <a class="task-detail-back-to-hosts" href="javascript:void(null)" {{action backToServiceList}}
><i class="icon-arrow-left"></i>&nbsp;{{t common.services}}</a>
-        <div>
-          <span class="task-detail-log-rolename" >{{t common.services}}</span>
-        </div>
-      {{else}}
-         {{t common.hosts}}
-      {{/if}}
+      <a class="task-detail-back-to-hosts" href="javascript:void(null)" {{action backToServiceList}}
><i class="icon-arrow-left"></i>&nbsp;{{t common.operations}}</a>
+      <div>
+        <span class="task-detail-log-rolename" >{{t common.hosts}}</span>
+      </div>
       <div {{bindAttr class="controller.showServices:tasks-list-select :select-wrap"}}>
         {{t common.show}}:
         {{view Ember.Select
@@ -156,8 +152,8 @@
         <span class="task-detail-log-rolename" >{{{view.openedTask.role}} {{view.openedTask.command}}</span>
       </div>
       <div class="task-detail-ico-wrap">
-        <div title="Click to Copy" {{action "textTrigger" taskInfo target="view"}} class="task-detail-copy"><i
class="icon-copy"></i> {{t common.copy}}</div>
-        <div title="Open in New Window" {{action openTaskLogInDialog}} class="task-detail-open-dialog"><i
class="icon-external-link"></i> {{t common.open}}</div>
+        <a title="Click to Copy" {{action "textTrigger" taskInfo target="view"}} class="task-detail-copy"><i
class="icon-copy"></i> {{t common.copy}}</a>
+        <a title="Open in New Window" {{action openTaskLogInDialog}} class="task-detail-open-dialog"><i
class="icon-external-link"></i> {{t common.open}}</a>
       </div>
     </div>
     <div class="task-detail-log-info">



Mime
View raw message