You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/07/17 23:38:00 UTC
git commit: AMBARI-2646. Improve styles for HostCleanup code area.
(Jeff Sposetti via yusaku)
Updated Branches:
refs/heads/branch-1.2.5 288cc9920 -> 896621132
AMBARI-2646. Improve styles for HostCleanup code area. (Jeff Sposetti via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/89662113
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/89662113
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/89662113
Branch: refs/heads/branch-1.2.5
Commit: 8966211329f704d80ae26e43e28e1218d5e84fa9
Parents: 288cc99
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Wed Jul 17 13:57:58 2013 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Wed Jul 17 14:26:53 2013 -0700
----------------------------------------------------------------------
ambari-web/app/messages.js | 2 +-
ambari-web/app/styles/application.less | 14 +++++++++++++-
.../templates/wizard/step3_host_warnings_popup.hbs | 2 +-
3 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/89662113/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 67ab803..348c2b7 100644
--- a/ambari-web/app/messages.js
+++ b/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',
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/89662113/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 447b147..f5b54d3 100644
--- a/ambari-web/app/styles/application.less
+++ b/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) {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/89662113/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs b/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs
index 8ad5409..8910b66 100644
--- a/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs
+++ b/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">