You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2015/09/17 14:02:43 UTC
ambari git commit: AMBARI-13124. Provide ability to change background
via custom_ui.less (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 9763e6447 -> b58fa9258
AMBARI-13124. Provide ability to change background via custom_ui.less (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b58fa925
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b58fa925
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b58fa925
Branch: refs/heads/trunk
Commit: b58fa92582c5b820c0bd9b536ce99c4dfac677f5
Parents: 9763e64
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Thu Sep 17 13:56:42 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Thu Sep 17 15:01:06 2015 +0300
----------------------------------------------------------------------
ambari-web/app/styles/alerts.less | 8 +-
ambari-web/app/styles/application.less | 14 ++-
.../templates/common/widget/heatmap_widget.hbs | 2 +-
.../app/templates/main/admin/kerberos.hbs | 2 +-
.../templates/main/admin/serviceAccounts.hbs | 2 +-
.../main/alerts/definition_details.hbs | 121 ++++++++++---------
.../app/templates/main/charts/heatmap.hbs | 2 +-
ambari-web/app/templates/main/host/details.hbs | 18 +--
ambari-web/app/templates/main/views.hbs | 4 +-
9 files changed, 96 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b58fa925/ambari-web/app/styles/alerts.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/alerts.less b/ambari-web/app/styles/alerts.less
index e6f0bbc..3cfafe7 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -186,13 +186,15 @@
}
#alert-definition-details {
+ .alert-definition-details-header {
+ margin-bottom: 30px;
+ }
.box {
.box-header {
.edit-link {
margin: 5px;
}
}
- margin-top: 20px;
margin-bottom: 0px;
}
.definition-details-block {
@@ -213,7 +215,6 @@
}
.status {
- margin-bottom: 30px;
text-align: right;
.label {
font-size: 14px;
@@ -222,13 +223,12 @@
}
.right-column {
- text-align: right;
button {
margin-top: 10px;
width: 100%;
}
.properties-list {
- margin-top: 50px;
+ padding: 10px;
text-align: left;
.property-name {
font-weight: bold;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b58fa925/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index daa2557..dd45a9c 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -423,6 +423,7 @@ footer {
color: #7B7B7B;
text-align: right;
font-size: 12px;
+ background-color: #FFFFFF;
label {
font-size: 12px;
}
@@ -1438,6 +1439,7 @@ a:focus {
.box {
border: 1px solid #D4D4D4;
margin-bottom: 20px;
+ background-color: #FFFFFF;
.box-header {
border-bottom: 1px solid #D4D4D4;
@@ -3927,11 +3929,10 @@ ul.filter {
margin-right: 4px;
margin-bottom: 10px;
margin-top:5px;
+ background-color: #FFFFFF;
.rackHeader {
background-color: #F7F7F7;
- border-top-right-radius: 5px;
- border-top-left-radius: 5px;
padding: 5px 5px 5px 10px;
border-bottom: 1px solid #D4D4D4;
@@ -5852,6 +5853,7 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox {
padding: 18px;
border: 1px solid #e4e4e4;
vertical-align: top;
+ background-color: #FFFFFF;
h4 {
margin: 0px;
font-size: 22px;
@@ -5957,6 +5959,14 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox {
}
}
+.table {
+ background-color: #FFFFFF;
+}
+
+.accordion {
+ background-color: #FFFFFF;
+}
+
.config-manage-nav {
.config-groups-dropdown {
display: inline-block;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b58fa925/ambari-web/app/templates/common/widget/heatmap_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/widget/heatmap_widget.hbs b/ambari-web/app/templates/common/widget/heatmap_widget.hbs
index 98dcbb4..17e7ee9 100644
--- a/ambari-web/app/templates/common/widget/heatmap_widget.hbs
+++ b/ambari-web/app/templates/common/widget/heatmap_widget.hbs
@@ -19,7 +19,7 @@
<div class="heatmap-widget">
<div class="span10 heatmap-content">
<h4 id="heatmap-metric-loading">
- <span id="heatmap-metric-title">
+ <span class="background-text" id="heatmap-metric-title">
{{view.content.widgetName}}
{{#unless view.isLoaded}}
<i class='icon-spinner icon-spin icon-small'></i>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b58fa925/ambari-web/app/templates/main/admin/kerberos.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs b/ambari-web/app/templates/main/admin/kerberos.hbs
index b72627f..88aa4e2 100644
--- a/ambari-web/app/templates/main/admin/kerberos.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos.hbs
@@ -49,7 +49,7 @@
{{/if}}
{{else}}
<div>
- <p class="muted">{{t admin.security.disabled}}
+ <p class="muted background-text">{{t admin.security.disabled}}
{{#isAccessible ADMIN}}
<a class="btn btn-padding btn-success admin-enable-security-btn" {{action checkAndStartKerberosWizard target="controller"}}>{{t admin.kerberos.button.enable}} </a>
<br/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b58fa925/ambari-web/app/templates/main/admin/serviceAccounts.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/serviceAccounts.hbs b/ambari-web/app/templates/main/admin/serviceAccounts.hbs
index 09b7020..c54379e 100644
--- a/ambari-web/app/templates/main/admin/serviceAccounts.hbs
+++ b/ambari-web/app/templates/main/admin/serviceAccounts.hbs
@@ -16,7 +16,7 @@
* limitations under the License.
}}
<div class="admin-misc">
- <div class="header">
+ <div class="header background-text">
<strong>{{t admin.misc.header}}</strong>
</div>
{{#if controller.dataIsLoaded}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b58fa925/ambari-web/app/templates/main/alerts/definition_details.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs b/ambari-web/app/templates/main/alerts/definition_details.hbs
index d5497f5..4b0f1d7 100644
--- a/ambari-web/app/templates/main/alerts/definition_details.hbs
+++ b/ambari-web/app/templates/main/alerts/definition_details.hbs
@@ -19,10 +19,9 @@
{{#if view.isLoaded}}
<div id="alert-definition-details">
- <div class="row-fluid">
- {{! Left column }}
- <div class="span9">
+ <div class="alert-definition-details-header row-fluid">
+ <div class="span8">
{{! Alert Definition Name }}
<div class="definition-name row-fluid">
{{#if controller.editing.label.isEditing}}
@@ -51,46 +50,52 @@
{{! Alert Definition Name end }}
<div><a href="javascript:void(null)" data-toggle="modal" {{action back}}><i
- class="icon-arrow-left"></i> {{t common.back}}</a></div>
+ class="icon-arrow-left"></i> {{t common.back}}</a>
+ </div>
+ </div>
- {{! Alert Definition Configs }}
- <div class="box">
- <div class="box-header">
- <div class="pull-left">
- <h4>{{t common.configuration}}</h4>
- </div>
- <div class="pull-right span5 row-fluid" style="padding:0 10px;">
- {{#isAccessible ADMIN}}
- {{#unless App.router.mainAlertDefinitionConfigsController.canEdit}}
- <a {{action editConfigs target="App.router.mainAlertDefinitionConfigsController"}}
- class="pull-right edit-link">
- {{t common.edit}}
- </a>
- {{/unless}}
- {{/isAccessible}}
- </div>
+ <div class="status span4">
+ {{{controller.content.status}}}
+ </div>
+ </div>
+
+ <div class="row-fluid" style="display: flex; align-items: stretch;">
+
+ {{! Left column }}
+ {{! Alert Definition Configs }}
+ <div class="box span9">
+ <div class="box-header">
+ <div class="pull-left">
+ <h4>{{t common.configuration}}</h4>
+ </div>
+ <div class="pull-right span5 row-fluid" style="padding:0 10px;">
+ {{#isAccessible ADMIN}}
+ {{#unless App.router.mainAlertDefinitionConfigsController.canEdit}}
+ <a {{action editConfigs target="App.router.mainAlertDefinitionConfigsController"}}
+ class="pull-right edit-link">
+ {{t common.edit}}
+ </a>
+ {{/unless}}
+ {{/isAccessible}}
</div>
- {{view App.AlertDefinitionConfigsView contentBinding="view.controller.content" alertDefinitionTypeBinding="view.controller.content.type" canEdit=false}}
- {{#if App.router.mainAlertDefinitionConfigsController.canEdit}}
- <div class="edit-buttons">
- <button {{action cancelEditConfigs target="App.router.mainAlertDefinitionConfigsController"}}
- class="btn">{{t common.cancel}}</button>
- <button {{bindAttr disabled="App.router.mainAlertDefinitionConfigsController.hasErrors"}} {{action saveConfigs target="App.router.mainAlertDefinitionConfigsController"}}
- class="btn btn-primary">{{t common.save}}
- </button>
- </div>
- {{/if}}
</div>
- {{! Alert Definition Configs end }}
+ {{view App.AlertDefinitionConfigsView contentBinding="view.controller.content" alertDefinitionTypeBinding="view.controller.content.type" canEdit=false}}
+ {{#if App.router.mainAlertDefinitionConfigsController.canEdit}}
+ <div class="edit-buttons">
+ <button {{action cancelEditConfigs target="App.router.mainAlertDefinitionConfigsController"}}
+ class="btn">{{t common.cancel}}</button>
+ <button {{bindAttr disabled="App.router.mainAlertDefinitionConfigsController.hasErrors"}} {{action saveConfigs target="App.router.mainAlertDefinitionConfigsController"}}
+ class="btn btn-primary">{{t common.save}}
+ </button>
+ </div>
+ {{/if}}
</div>
+ {{! Alert Definition Configs end }}
{{! Left column end }}
{{! Right column }}
<div class="span3 right-column">
- <div class="status">
- {{{controller.content.status}}}
- </div>
- <div class="properties-list">
+ <div class="properties-list background-text">
<div class="row-fluid">
<div class="span4 property-name">{{t alerts.table.state}}:</div>
<div class="span8">
@@ -162,11 +167,11 @@
</div>
</div>
</div>
- {{! Right column end }}
+ {{! Right column end }}
- {{! List of alerts }}
+ {{! List of alerts }}
<div class="definition-details-block">
- <span>
+ <span class="background-text">
<strong>{{t alerts.definition.details.instances}}</strong>
</span>
<hr>
@@ -184,29 +189,31 @@
</tr>
</thead>
<tbody>
- {{#if view.pageContent}}
- {{#each instance in view.pageContent}}
- {{#view view.instanceTableRow}}
- <td class="first">
- {{view App.AlertInstanceServiceHostView instanceBinding="instance"}}
- </td>
- <td>{{{instance.status}}}
- <time class="timeago" rel="tooltip" {{bindAttr data-original-title="instance.statusChangedAndLastCheckedFormatted"}}>
- {{instance.lastTriggeredForFormatted}}
- </time>
- </td>
- <td>{{view view.parentView.lastDayCount hostNameBinding="instance.hostName"}}</td>
- <td>
- <span class="alert-text" {{bindAttr data-original-title="instance.text"}}>{{instance.text}}</span></td>
- {{/view}}
- {{/each}}
- {{else}}
+ {{#if view.pageContent}}
+ {{#each instance in view.pageContent}}
+ {{#view view.instanceTableRow}}
+ <td class="first">
+ {{view App.AlertInstanceServiceHostView instanceBinding="instance"}}
+ </td>
+ <td>{{{instance.status}}}
+ <time class="timeago"
+ rel="tooltip" {{bindAttr data-original-title="instance.statusChangedAndLastCheckedFormatted"}}>
+ {{instance.lastTriggeredForFormatted}}
+ </time>
+ </td>
+ <td>{{view view.parentView.lastDayCount hostNameBinding="instance.hostName"}}</td>
+ <td>
+ <span class="alert-text" {{bindAttr data-original-title="instance.text"}}>{{instance.text}}</span>
+ </td>
+ {{/view}}
+ {{/each}}
+ {{else}}
<tr>
<td class="first" colspan="5">
{{t alerts.definition.details.noAlerts}}
</td>
</tr>
- {{/if}}
+ {{/if}}
</tbody>
</table>
@@ -229,7 +236,7 @@
</div>
</div>
- {{! List of alerts end }}
+ {{! List of alerts end }}
</div>
{{else}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b58fa925/ambari-web/app/templates/main/charts/heatmap.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/charts/heatmap.hbs b/ambari-web/app/templates/main/charts/heatmap.hbs
index c94a0a2..a66e4f2 100644
--- a/ambari-web/app/templates/main/charts/heatmap.hbs
+++ b/ambari-web/app/templates/main/charts/heatmap.hbs
@@ -20,7 +20,7 @@
{{#if isLoaded}}
<div class="container-fluid">
<div class="row-fluid">
- <div class="span2 legend-column">
+ <div class="span2 legend-column background-text">
{{view view.dropdownView}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b58fa925/ambari-web/app/templates/main/host/details.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/details.hbs b/ambari-web/app/templates/main/host/details.hbs
index 9ca1820..bcb087b 100644
--- a/ambari-web/app/templates/main/host/details.hbs
+++ b/ambari-web/app/templates/main/host/details.hbs
@@ -18,15 +18,17 @@
{{#if view.isLoaded}}
<div id="host-details">
- <div class="status-info">
- <span rel="HealthTooltip" {{bindAttr class="view.content.healthClass view.content.healthIconClass"}} {{bindAttr data-original-title="view.content.healthToolTip" }}></span><span
- class='host-title'>{{unbound view.content.hostName}}</span>
- {{#unless view.isActive}}
- <span class="host-maintenance-notice pull-right"><span class="icon-medkit"></span> {{t hosts.host.passive.mode}}</span>
- {{/unless}}
+ <div class="host-details-header">
+ <div class="status-info">
+ <span rel="HealthTooltip" {{bindAttr class="view.content.healthClass view.content.healthIconClass"}} {{bindAttr data-original-title="view.content.healthToolTip" }}></span><span
+ class='host-title'>{{unbound view.content.hostName}}</span>
+ {{#unless view.isActive}}
+ <span class="host-maintenance-notice pull-right"><span class="icon-medkit"></span> {{t hosts.host.passive.mode}}</span>
+ {{/unless}}
+ </div>
+ <div><a href="javascript:void(null)" id="host-details-back-btn" data-toggle="modal" {{action back}}><i
+ class="icon-arrow-left"></i> {{t common.back}}</a></div>
</div>
- <div><a href="javascript:void(null)" id="host-details-back-btn" data-toggle="modal" {{action back}}><i
- class="icon-arrow-left"></i> {{t common.back}}</a></div>
<div class="content">
{{view App.MainHostMenuView hostBinding="view.content"}}
{{#isAccessible ADMIN}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b58fa925/ambari-web/app/templates/main/views.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/views.hbs b/ambari-web/app/templates/main/views.hbs
index 536577c..cbbaa52 100644
--- a/ambari-web/app/templates/main/views.hbs
+++ b/ambari-web/app/templates/main/views.hbs
@@ -17,7 +17,7 @@
}}
<div id="views">
- <h4>{{t views.main.yourViews}}</h4>
+ <h4 class="background-text">{{t views.main.yourViews}}</h4>
{{#if view.views.length}}
<table class="table views-table">
<tbody>
@@ -38,6 +38,6 @@
</tbody>
</table>
{{else}}
- <div class="muted no-views-text">{{t views.main.noViews}}</div>
+ <div class="muted no-views-text background-text">{{t views.main.noViews}}</div>
{{/if}}
</div>