Browse Source

AMBARI-3913. Description should be shown properly in Manage Config Groups dialog (Denys Buzhor via alexantonenko)

Alex Antonenko 11 năm trước cách đây
mục cha
commit
0afd327c94

+ 1 - 1
ambari-web/app/controllers/main/service/manage_config_groups_controller.js

@@ -163,7 +163,7 @@ App.ManageConfigGroupsController = Em.Controller.extend({
   },
 
   showProperties: function () {
-    var properies = this.get('selectedConfigGroup.propertiesList');
+    var properies = this.get('selectedConfigGroup.propertiesList').htmlSafe();
     if (properies) {
       App.showAlertPopup(Em.I18n.t('services.service.config_groups_popup.properties'), properies);
     }

+ 2 - 2
ambari-web/app/models/config_group.js

@@ -126,8 +126,8 @@ App.ConfigGroup = Ember.Object.extend({
   propertiesList: function () {
     var result = '';
     this.get('properties').forEach(function (item) {
-      result += item.name + " : " + item.value + '\n';
+      result += item.name + " : " + item.value + '<br/>';
     }, this);
     return result;
   }.property('properties.length')
-});
+});

+ 5 - 0
ambari-web/app/styles/application.less

@@ -4985,3 +4985,8 @@ i.icon-asterisks {
   }
 }
 
+.prrl {
+  position: relative;
+  right: 10px;
+}
+

+ 14 - 7
ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs

@@ -72,14 +72,21 @@
               {{bindAttr data-original-title="selectedConfigGroup.propertiesList" }}>{{selectedConfigGroup.properties.length}} {{t common.properties}}</a>
           </div>
         </div>
+        <div class="clearfix"></div>
+        <div class="row-fluid">
+          <div class="span2"><span class="prrl">{{t common.description}}</span></div>
+          <div class="span10">{{selectedConfigGroup.description}}</div>
+        </div>
       </div>
-      <div class="span12">{{selectedConfigGroup.description}}</div>
-      <div class="span12 text-error" id="manage-config-group-error-div">
-        {{#if errorMessage}}
-          {{errorMessage}}
-        {{else}}
-          &nbsp;
-        {{/if}}
+      <div class="clearfix"></div>
+      <div class="row-fluid">
+        <div class="span12 text-error" id="manage-config-group-error-div">
+          {{#if errorMessage}}
+            {{errorMessage}}
+          {{else}}
+              &nbsp;
+          {{/if}}
+        </div>
       </div>
     </div>
   </div>