ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject [1/2] ambari git commit: AMBARI-10441. Alerts explanation text cannot be seen in its entirety - should be wider/scrollable (alexantonenko)
Date Fri, 10 Apr 2015 15:41:56 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 3eba89a14 -> 3ae841a24


AMBARI-10441. Alerts explanation text cannot be seen in its entirety - should be wider/scrollable
(alexantonenko)


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

Branch: refs/heads/trunk
Commit: 3ae841a2494152d53a00dbf6487a966091d94ca6
Parents: 136b3b6
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Fri Apr 10 18:27:00 2015 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Fri Apr 10 18:41:51 2015 +0300

----------------------------------------------------------------------
 .../app/controllers/main/service/info/summary.js       |  1 +
 ambari-web/app/styles/alerts.less                      | 13 ++++++++++++-
 .../main/service/info/service_alert_popup.hbs          |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3ae841a2/ambari-web/app/controllers/main/service/info/summary.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/summary.js b/ambari-web/app/controllers/main/service/info/summary.js
index f25ad56..c4b9a53 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -252,6 +252,7 @@ App.MainServiceInfoSummaryController = Em.Controller.extend({
     return App.ModalPopup.show({
       header: Em.I18n.t('services.service.summary.alerts.popup.header').format(service.get('displayName')),
       autoHeight: false,
+      classNames: [ 'forty-percent-width-modal' ],
       bodyClass: Em.View.extend({
         templateName: require('templates/main/service/info/service_alert_popup'),
         classNames: ['service-alerts'],

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ae841a2/ambari-web/app/styles/alerts.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/alerts.less b/ambari-web/app/styles/alerts.less
index 6204e78..e6f0bbc 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -517,6 +517,17 @@
   }
 }
 
+.forty-percent-width-modal {
+  .modal {
+    width: 40%;
+
+    .definition-latest-text {
+      overflow-x: auto;
+      text-overflow: inherit;
+      white-space: nowrap;
+    }
+  }
+}
 
 /*****end styles for manage alerts popup*****/
 
@@ -625,4 +636,4 @@
 .enable-disable-button::before {
   font-family: FontAwesome;
   content: "\f011";
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ae841a2/ambari-web/app/templates/main/service/info/service_alert_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs
index 8090b59..730906f 100644
--- a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs
+++ b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs
@@ -21,7 +21,7 @@
     {{#each alert in view.alerts}}
       <li class="alert-list-wrap">
         <div class="row-fluid">
-          <div class="span7 name-text">
+          <div class="span8 name-text">
             <div>
               <a href="#" {{action "gotoAlertDetails" alert target="view"}}>{{alert.label}}</a>
             </div>
@@ -29,7 +29,7 @@
               {{alert.latestText}}
             </div>
           </div>
-          <div class="span5 status-col" rel="alert-status-tooltip" >
+          <div class="span4 status-col" rel="alert-status-tooltip" >
             <span class="timeago" {{bindAttr data-original-title="alert.lastTriggeredVerboseDisplay"}}>
               <span class="status-icon">{{{alert.status}}}</span>
               <time>{{alert.lastTriggeredForFormatted}}</time>


Mime
View raw message