AMBARI-7954. Slider View: UI updates. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/405ccff2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/405ccff2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/405ccff2 Branch: refs/heads/branch-alerts-dev Commit: 405ccff20deb6686a3f94dfe5ce5dd9d5f73b9b7 Parents: 0502673 Author: Aleksandr Kovalenko <[email protected]> Authored: Thu Sep 25 20:12:56 2014 +0300 Committer: Aleksandr Kovalenko <[email protected]> Committed: Thu Sep 25 20:13:59 2014 +0300 ---------------------------------------------------------------------- .../resources/ui/app/controllers/slider_controller.js | 1 + .../slider/src/main/resources/ui/app/initialize.js | 5 +++++ .../src/main/resources/ui/app/styles/application.less | 14 ++++++++++++++ .../src/main/resources/ui/app/styles/application.styl | 3 --- .../main/resources/ui/app/templates/application.hbs | 2 +- .../main/resources/ui/app/templates/slider_apps.hbs | 2 +- .../slider/src/main/resources/ui/app/translations.js | 1 + .../main/resources/ui/app/views/common/filter_view.js | 4 ++-- 8 files changed, 25 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/405ccff2/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js index 3063828..40fd0ce 100644 --- a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js +++ b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js @@ -58,6 +58,7 @@ App.SliderController = Ember.Controller.extend({ initialValuesToLoad = this.get('initialValuesToLoad'), sliderConfigs = App.SliderApp.store.all('sliderConfig'), self = this; + App.set('label', Em.get(data, 'ViewInstanceInfo.label') || App.get('instance')); sliderConfigs.forEach(function (model) { var key = model.get('viewConfigName'); model.set('value', properties[key]); http://git-wip-us.apache.org/repos/asf/ambari/blob/405ccff2/contrib/views/slider/src/main/resources/ui/app/initialize.js ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/initialize.js b/contrib/views/slider/src/main/resources/ui/app/initialize.js index 4e14d14..865bb6c 100755 --- a/contrib/views/slider/src/main/resources/ui/app/initialize.js +++ b/contrib/views/slider/src/main/resources/ui/app/initialize.js @@ -65,6 +65,11 @@ App.initializer({ instance: instanceName, /** + * @type {string} + */ + label: '', + + /** * API url for Slider * Format: * <code>/api/v1/views/[VIEW_NAME]/versions/[VERSION]/instances/[INSTANCE_NAME]/</code> http://git-wip-us.apache.org/repos/asf/ambari/blob/405ccff2/contrib/views/slider/src/main/resources/ui/app/styles/application.less ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/styles/application.less b/contrib/views/slider/src/main/resources/ui/app/styles/application.less index e60948b..901682c 100644 --- a/contrib/views/slider/src/main/resources/ui/app/styles/application.less +++ b/contrib/views/slider/src/main/resources/ui/app/styles/application.less @@ -91,6 +91,9 @@ select { #slider-apps-table { #slider-table { + border-bottom: 1px solid #ddd; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; margin-top: 10px; margin-bottom: 10px; font-size: 13px\9; @@ -153,6 +156,7 @@ select { } thead { background: none repeat scroll 0 0 #F8F8F8; + border-top: 1px solid #ddd; } } .page-bar { @@ -256,8 +260,18 @@ select { .filter-input-width{ width:68%; + font-weight: normal; } .table { + + thead { + tr { + th { + border-bottom: none; + } + } + } + table-layout: fixed; th { border-top: none; http://git-wip-us.apache.org/repos/asf/ambari/blob/405ccff2/contrib/views/slider/src/main/resources/ui/app/styles/application.styl ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/styles/application.styl b/contrib/views/slider/src/main/resources/ui/app/styles/application.styl index 7943d4e..a1a9008 100755 --- a/contrib/views/slider/src/main/resources/ui/app/styles/application.styl +++ b/contrib/views/slider/src/main/resources/ui/app/styles/application.styl @@ -16,6 +16,3 @@ * limitations under the License. */ @import 'nib' - -html, body - margin 20px http://git-wip-us.apache.org/repos/asf/ambari/blob/405ccff2/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs index ccccf62..33633b8 100755 --- a/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs +++ b/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs @@ -18,7 +18,7 @@ <div class="slider-header"> {{#view view.SliderTitleView}} - <h1 class="pull-left">{{t slider.apps.title}} - <span class="slider-app-title" {{bs-bind-popover view.popover}}>{{App.instance}}</span></h1> + <h3 class="pull-left"><span class="slider-app-title" {{bs-bind-popover view.popover}}>{{App.label}}</span></h3> {{#if view.isIndexPage}} <div class="box-header pull-right"> <div class="create-app"> http://git-wip-us.apache.org/repos/asf/ambari/blob/405ccff2/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs index 46f2356..626dfb0 100644 --- a/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs +++ b/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs @@ -18,7 +18,7 @@ <div id="slider-apps-table"> - <table class="datatable table table-bordered table-striped" id="slider-table"> + <table class="datatable table table-striped" id="slider-table"> <thead> {{#view view.sortView classNames="label-row" contentBinding="view.filteredContent"}} {{view view.parentView.nameSort}} http://git-wip-us.apache.org/repos/asf/ambari/blob/405ccff2/contrib/views/slider/src/main/resources/ui/app/translations.js ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/translations.js b/contrib/views/slider/src/main/resources/ui/app/translations.js index f66b2a3..ccc1901 100644 --- a/contrib/views/slider/src/main/resources/ui/app/translations.js +++ b/contrib/views/slider/src/main/resources/ui/app/translations.js @@ -22,6 +22,7 @@ Em.I18n.translations = { 'ok': 'OK', 'yes': 'Yes', 'no': 'No', + 'any': 'Any', 'common' : { 'add': 'Add', http://git-wip-us.apache.org/repos/asf/ambari/blob/405ccff2/contrib/views/slider/src/main/resources/ui/app/views/common/filter_view.js ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/views/common/filter_view.js b/contrib/views/slider/src/main/resources/ui/app/views/common/filter_view.js index 9f8e6cc..3390a44 100644 --- a/contrib/views/slider/src/main/resources/ui/app/views/common/filter_view.js +++ b/contrib/views/slider/src/main/resources/ui/app/views/common/filter_view.js @@ -137,7 +137,7 @@ var wrapperView = Ember.View.extend({ */ var textFieldView = Ember.TextField.extend({ type:'text', - // placeholder: Em.I18n.t('any'), + placeholder: Em.I18n.t('any'), valueBinding: "parentView.value" }); @@ -271,7 +271,7 @@ module.exports = { attributeBindings: ['disabled','multiple'], disabled: false }); - config.emptyValue = '';//Em.I18n.t('any'); + config.emptyValue = Em.I18n.t('any'); return wrapperView.extend(config); },
