You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2015/04/30 08:28:57 UTC
ambari git commit: AMBARI-10855. Configs disappearing under boundary
(Richard Zang via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 89144ad4e -> 9a62b4e04
AMBARI-10855. Configs disappearing under boundary (Richard Zang via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a62b4e0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a62b4e0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a62b4e0
Branch: refs/heads/trunk
Commit: 9a62b4e0447702d75e409e7aa8c9bbb57adb4be3
Parents: 89144ad
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Wed Apr 29 23:28:01 2015 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Wed Apr 29 23:28:07 2015 -0700
----------------------------------------------------------------------
ambari-web/app/app.js | 2 +-
ambari-web/app/styles/application.less | 127 ++++++++++---------
.../templates/common/configs/service_config.hbs | 2 +-
.../configs/widgets/combo_config_widget.hbs | 2 +-
4 files changed, 68 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a62b4e0/ambari-web/app/app.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index 4817c27..6a49d23 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -190,7 +190,7 @@ module.exports = Em.Application.create({
*/
isClusterSupportsEnhancedConfigs: function() {
return this.get('isHadoop22Stack') && App.get('supports.enhancedConfigs')
- }.property('isHadoop22Stack'),
+ }.property('isHadoop22Stack', 'supports.enhancedConfigs'),
/**
* If NameNode High Availability is enabled
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a62b4e0/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 8cd22c4..a4df22a 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -5617,69 +5617,72 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox {
}
}
-.enhanced-config-tab-content {
- overflow: hidden;
- .section-layout-container {
- width: 104%; // fallback option
- width: ~"calc(100% + 40px)";
- margin-top: -20px;
- .config-section-table {
- width: 100%;
- border-spacing: 20px;
- border-collapse: separate;
- table-layout: fixed; // for width to be equally distributed
- margin: 0 -20px;
- .config-section {
- overflow: hidden;
- height: 100%;
- padding: 18px;
- border: 1px solid #aaa;
- vertical-align: top;
- h4 {
- margin: 0px;
- font-size: 22px;
- font-weight: 400;
- }
- h5 {
- font-size: 18px;
- font-weight: 400;
- }
- .vertical-splitter-r {
- border-right: 2px solid #ccc; // vertical splitter
- padding-right: 20px;
- padding-left: 0px;
- }
-
- .vertical-splitter-l {
- border-left: 2px solid #ccc; // vertical splitter
- margin-left: -2px;
- padding-left: 20px;
- padding-right: 0px;
- }
- div.with-border {
+.tab-content.service-config-tab-content {
+ overflow: visible;
+ .enhanced-config-tab-content {
+ overflow: visible;
+ .section-layout-container {
+ width: 104%; // fallback option
+ width: ~"calc(100% + 40px)";
+ margin-top: -20px;
+ .config-section-table {
+ width: 100%;
+ border-spacing: 20px;
+ border-collapse: separate;
+ table-layout: fixed; // for width to be equally distributed
+ margin: 0 -20px;
+ .config-section {
+ overflow: visible;
+ height: 100%;
+ padding: 18px;
border: 1px solid #aaa;
- padding: 10px;
- margin-bottom: 20px;
- }
- .config-subsection-table {
- width: 100%;
- height: 90%; // fallback option
- height: ~"calc(100% - 30px)";
- border-collapse: separate;
- table-layout: fixed;
- .config-subsection {
- padding: 0px;
- vertical-align: top;
- &.no-horizontal-splitter {
- border-bottom: none; // no horizontal splitter for subsection on the last row
- }
- &.top-horizontal-splitter {
- border-top: 2px solid #ccc; // horizontal splitter
- padding-top: 15px;
- padding-bottom: 15px;
- }
- .directories {
- min-width: 0px !important;
+ vertical-align: top;
+ h4 {
+ margin: 0px;
+ font-size: 22px;
+ font-weight: 400;
+ }
+ h5 {
+ font-size: 18px;
+ font-weight: 400;
+ }
+ .vertical-splitter-r {
+ border-right: 2px solid #ccc; // vertical splitter
+ padding-right: 20px;
+ padding-left: 0px;
+ }
+
+ .vertical-splitter-l {
+ border-left: 2px solid #ccc; // vertical splitter
+ margin-left: -2px;
+ padding-left: 20px;
+ padding-right: 0px;
+ }
+ div.with-border {
+ border: 1px solid #aaa;
+ padding: 10px;
+ margin-bottom: 20px;
+ }
+ .config-subsection-table {
+ width: 100%;
+ height: 90%; // fallback option
+ height: ~"calc(100% - 30px)";
+ border-collapse: separate;
+ table-layout: fixed;
+ .config-subsection {
+ padding: 0px;
+ vertical-align: top;
+ &.no-horizontal-splitter {
+ border-bottom: none; // no horizontal splitter for subsection on the last row
+ }
+ &.top-horizontal-splitter {
+ border-top: 2px solid #ccc; // horizontal splitter
+ padding-top: 15px;
+ padding-bottom: 15px;
+ }
+ .directories {
+ min-width: 0px !important;
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a62b4e0/ambari-web/app/templates/common/configs/service_config.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs
index 573a75e..9270f19 100644
--- a/ambari-web/app/templates/common/configs/service_config.hbs
+++ b/ambari-web/app/templates/common/configs/service_config.hbs
@@ -114,7 +114,7 @@
{{/unless}}
{{/each}}
</ul>
- <div class="tab-content">
+ <div class="tab-content service-config-tab-content">
{{#each tab in view.tabs}}
<div {{bindAttr class=":tab-pane tab.isActive:active tab.id"}}>
{{#if tab.isAdvanced}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a62b4e0/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
index 101a3c8..eed3559 100644
--- a/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
@@ -23,7 +23,7 @@
<button {{bindAttr class="view.disabled:disabled :btn :dropdown-toggle"}} data-toggle="dropdown">
<span class="caret"></span>
</button>
- <ul {{bindAttr class="view.section.isLastColumn:pull-right :dropdown-menu"}}>
+ <ul {{bindAttr class=":pull-left :dropdown-menu"}}>
{{#each item in view.content.valuesList}}
<li>
<a href="#" {{action setConfigValue item.configValue target="view"}}>{{item.widgetValue}}</a>