Преглед изворни кода

AMBARI-2646. Improve styles for HostCleanup code area. (Jeff Sposetti via yusaku)

Yusaku Sako пре 12 година
родитељ
комит
4b2fa7be8c

+ 1 - 1
ambari-web/app/messages.js

@@ -338,7 +338,7 @@ Em.I18n.translations = {
   'installer.step3.hostWarningsPopup.report.user': '<br><br>######################################<br># Users<br>#<br># A space delimited list of users who should not exist.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: userdel hdfs<br>######################################<br>USERS<br>',
   'installer.step3.hostWarningsPopup.report.folder': '\\ /folder',
   'installer.step3.hostWarningsPopup.checks': 'Host Checks found',
-  'installer.step3.hostWarningsPopup.notice':'After manually resolving the issues, click <b>Rerun Checks</b>. To manually resolve issues on <b>each host</b> run the HostCleanup script:<br><code>python /usr/lib/python2.6/site-packages/ambari_agent/HostCleanup.py</code>',
+  'installer.step3.hostWarningsPopup.notice':'After manually resolving the issues, click <b>Rerun Checks</b>.<br>To manually resolve issues on <b>each host</b> run the HostCleanup script:<br><div class="code-snippet">python /usr/lib/python2.6/site-packages/ambari_agent/HostCleanup.py</div>',
   'installer.step3.hostWarningsPopup.summary':'{0} on {1}',
   'installer.step3.hostWarningsPopup.process':'Process Issues',
   'installer.step3.hostWarningsPopup.processes.message':'The following processes should not be running',

+ 13 - 1
ambari-web/app/styles/application.less

@@ -2609,7 +2609,10 @@ table.graphs {
 
 #host-warnings {
   .notice {
-    padding-bottom: 10px;
+    padding-bottom: 20px;
+  }
+  .code-snippet {
+    margin: 10px 0;
   }
   .warnings-list {
     .block {
@@ -3891,6 +3894,15 @@ i.icon-asterisks {
   visibility: hidden;
 }
 
+.code-snippet {
+  background-color: #EEEEEE;
+  border: 1px dashed #CCCCCC;
+  font-family: Courier;
+  font-size: 12px;
+  padding: 4px;
+  white-space: nowrap;
+}
+
 //styles for screen width more than 1200px
 @media (min-width: 1200px) {
 

+ 1 - 1
ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs

@@ -19,7 +19,7 @@
 
 <div id="host-warnings">
   <div class="notice">
-    <span>{{t installer.step3.hostWarningsPopup.checks}} <b>{{view.warningsNotice}}</b>. {{t installer.step3.hostWarningsPopup.notice}}</span>
+    <span>{{t installer.step3.hostWarningsPopup.checks}} <b>{{view.warningsNotice}}</b>.<br>{{t installer.step3.hostWarningsPopup.notice}}</span>
   </div>
   <div class="row-fluid">
     <div class="span7">