You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/11/10 13:32:31 UTC
[1/2] ambari git commit: AMBARI-8246. Service Config page: config
banner breaks when trying to add an override (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 6f1e47637 -> 771d17e84
AMBARI-8246. Service Config page: config banner breaks when trying to add an override (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/771d17e8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/771d17e8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/771d17e8
Branch: refs/heads/trunk
Commit: 771d17e8458476851e1dab401561fbc5f8692a29
Parents: e2fc2da
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Mon Nov 10 14:11:33 2014 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Mon Nov 10 14:32:14 2014 +0200
----------------------------------------------------------------------
ambari-web/app/templates/common/configs/config_history_flow.hbs | 4 ++++
ambari-web/app/views/common/configs/config_history_flow.js | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/771d17e8/ambari-web/app/templates/common/configs/config_history_flow.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/config_history_flow.hbs b/ambari-web/app/templates/common/configs/config_history_flow.hbs
index def5820..0ad38aa 100644
--- a/ambari-web/app/templates/common/configs/config_history_flow.hbs
+++ b/ambari-web/app/templates/common/configs/config_history_flow.hbs
@@ -97,11 +97,15 @@
</ul>
</div>
<div class="label-wrapper span8" data-toggle="tooltip" {{bindAttr data-original-title="view.displayedServiceVersion.fullNotes"}}>
+ {{#if view.displayedServiceVersion.versionText}}
<span class="label label-info">{{view.displayedServiceVersion.versionText}}</span>
+ {{/if}}
{{#if view.displayedServiceVersion.isCurrent}}
<span class="label label-success">{{t common.current}}</span>
{{/if}}
+ {{#if view.displayedServiceVersion.author}}
<strong>{{view.displayedServiceVersion.author}}</strong> {{t dashboard.configHistory.info-bar.authoredOn}} <strong>{{view.displayedServiceVersion.createdDate}}</strong>
+ {{/if}}
</div>
{{#if App.isManager}}
<div class="pull-right operations-button">
http://git-wip-us.apache.org/repos/asf/ambari/blob/771d17e8/ambari-web/app/views/common/configs/config_history_flow.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/config_history_flow.js b/ambari-web/app/views/common/configs/config_history_flow.js
index 12b0c51..72fe62b 100644
--- a/ambari-web/app/views/common/configs/config_history_flow.js
+++ b/ambari-web/app/views/common/configs/config_history_flow.js
@@ -249,6 +249,7 @@ App.ConfigHistoryFlowView = Em.View.extend({
// find current in default group
if (serviceVersion.get('isCurrent') && serviceVersion.get('groupName') == Em.I18n.t('dashboard.configHistory.table.configGroup.default')){
currentIndex = index + 1;
+ serviceVersion.set('isDisplayed', true);
}
});
}
[2/2] ambari git commit: Merge branch 'trunk' of D:\incubator-ambari
with conflicts.
Posted by on...@apache.org.
Merge branch 'trunk' of D:\incubator-ambari with conflicts.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e2fc2da4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e2fc2da4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e2fc2da4
Branch: refs/heads/trunk
Commit: e2fc2da45e6b392502dee2955096371cf21c3398
Parents: 6f1e476
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Mon Nov 10 12:28:14 2014 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Mon Nov 10 14:32:14 2014 +0200
----------------------------------------------------------------------
ambari-web/karma.conf.js | 4 +--
.../jobs/src/main/resources/ui/Gruntfile.js | 36 +++++++++++++-------
2 files changed, 26 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e2fc2da4/ambari-web/karma.conf.js
----------------------------------------------------------------------
diff --git a/ambari-web/karma.conf.js b/ambari-web/karma.conf.js
index 3a54978..d5351a6 100644
--- a/ambari-web/karma.conf.js
+++ b/ambari-web/karma.conf.js
@@ -102,7 +102,7 @@ module.exports = function(config) {
},
preprocessors: {
-// '!(vendor|node_modules|test)/**/!(karma_setup|tests).js': 'coverage',
+ '!(vendor|node_modules|test)/**/!(karma_setup|tests).js': 'coverage',
'app/templates/**/*.hbs': ['ember-precompiler-brunch', 'common-require'],
'app!(assets)/**/!(karma_setup|tests).js': ['common-require'],
'test/**/*.js': ['common-require']
@@ -117,7 +117,7 @@ module.exports = function(config) {
// test results reporter to use
// possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
// reporters: ['progress', 'coverage'],
- reporters: ['progress'],
+ reporters: ['progress', 'coverage'],
// web server port
http://git-wip-us.apache.org/repos/asf/ambari/blob/e2fc2da4/contrib/views/jobs/src/main/resources/ui/Gruntfile.js
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/src/main/resources/ui/Gruntfile.js b/contrib/views/jobs/src/main/resources/ui/Gruntfile.js
index f5c13e6..ba69c24 100644
--- a/contrib/views/jobs/src/main/resources/ui/Gruntfile.js
+++ b/contrib/views/jobs/src/main/resources/ui/Gruntfile.js
@@ -181,6 +181,18 @@ module.exports = function (grunt) {
dirs: ['<%= yeoman.dist %>']
}
},
+ imagemin: {
+ dist: {
+ files: [
+ {
+ expand: true,
+ cwd: '<%= yeoman.app %>/images',
+ src: '{,*/}*.{png,jpg,jpeg}',
+ dest: '<%= yeoman.dist %>/images'
+ }
+ ]
+ }
+ },
svgmin: {
dist: {
files: [
@@ -260,24 +272,22 @@ module.exports = function (grunt) {
cwd: '<%= yeoman.app %>',
dest: '<%= yeoman.dist %>',
src: [
- '*.{ico,txt}',
+ '*.{ico,txt,php}',
'.htaccess',
'img/*',
'styles/fonts/*',
'scripts/assets/**/*'
]
- },
- {
- expand: true,
- flatten: true,
- src: '<%= yeoman.app %>/bower_components/jquery-ui/themes/base/images/*',
- dest: '<%= yeoman.dist %>/styles/images/'
- },
+ }
+ ]
+ },
+ xampp: {
+ files: [
{
expand: true,
- flatten: true,
- src: '<%= yeoman.app %>/bower_components/font-awesome/font/*',
- dest: '<%= yeoman.dist %>/font/'
+ flatten: false,
+ src: '<%= yeoman.dist %>/**/*',
+ dest: 'D:/xampp/htdocs/'
}
]
}
@@ -291,6 +301,7 @@ module.exports = function (grunt) {
],
dist: [
'emberTemplates',
+ 'imagemin',
'svgmin',
'htmlmin'
]
@@ -385,7 +396,8 @@ module.exports = function (grunt) {
//'uglify',
'copy:dist',
//'rev',
- 'usemin'
+ 'usemin',
+ 'copy:xampp'
]);
grunt.registerTask('default', [