AMBARI-7614. Slider View: UI cleanup (Denys Buzhor via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/30bdc96f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/30bdc96f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/30bdc96f Branch: refs/heads/branch-alerts-dev Commit: 30bdc96f8f3f7519e4006c2bc61d6b6daed494ac Parents: c272607 Author: Srimanth Gunturi <[email protected]> Authored: Fri Oct 3 12:32:03 2014 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Fri Oct 3 12:32:03 2014 -0700 ---------------------------------------------------------------------- .../slider/src/main/resources/ui/app/styles/wizard.less | 8 ++++++-- .../resources/ui/app/templates/createAppWizard/step1.hbs | 10 +++++----- .../slider/src/main/resources/ui/app/translations.js | 6 +++++- 3 files changed, 16 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/30bdc96f/contrib/views/slider/src/main/resources/ui/app/styles/wizard.less ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/styles/wizard.less b/contrib/views/slider/src/main/resources/ui/app/styles/wizard.less index a28355a..986b99e 100644 --- a/contrib/views/slider/src/main/resources/ui/app/styles/wizard.less +++ b/contrib/views/slider/src/main/resources/ui/app/styles/wizard.less @@ -25,9 +25,9 @@ } #createAppWizard { - width: 80%; + width: 94%; margin: 0 0 auto; - left: 10%; + left: 3%; .wizard-nav { padding-left: 0px; } @@ -108,6 +108,10 @@ .app-types-alert { margin-top: 20px; } + .alert-warning { + border-color: #fbeed5; + color: #c09853; + } } .pseudo-label { display: inline-block; http://git-wip-us.apache.org/repos/asf/ambari/blob/30bdc96f/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step1.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step1.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step1.hbs index 0711450..f25bc04 100644 --- a/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step1.hbs +++ b/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step1.hbs @@ -20,7 +20,7 @@ <!-- Available Applications --> {{#if controller.isAppTypesError}} <div class="row"> - <div class="col-xs-12 alert alert-info app-types-alert"> + <div class="col-xs-12 alert alert-warning app-types-alert"> {{t wizard.step1.noAppTypesError}} </div> </div> @@ -71,7 +71,7 @@ </div> </div> <div class="col-xs-7"> - {{input id="app-name-input" class="form-control" valueBinding="controller.newApp.name" disabledBinding="controller.isAppTypesError"}} + {{input id="app-name-input" class="form-control" valueBinding="controller.newApp.name" disabledBinding="controller.isAppTypesError" placeholderTranslation="form.placeholder.step1.name"}} </div> </div> {{#if controller.isNameError}} @@ -139,7 +139,7 @@ <label class="control-label">{{t wizard.step1.logAggregation.filePatterns.include}}</label> </div> <div class="col-xs-7"> - {{input class="form-control" valueBinding="controller.newApp.includeFilePatterns"}} + {{input class="form-control" valueBinding="controller.newApp.includeFilePatterns" placeholderTranslation="form.placeholder.include.file.patterns"}} </div> </div> <div class="row"> @@ -147,7 +147,7 @@ <label class="control-label">{{t wizard.step1.logAggregation.filePatterns.exclude}}</label> </div> <div class="col-xs-7"> - {{input class="form-control" valueBinding="controller.newApp.excludeFilePatterns"}} + {{input class="form-control" valueBinding="controller.newApp.excludeFilePatterns" placeholderTranslation="form.placeholder.exclude.file.patterns"}} </div> </div> <div class="row"> @@ -156,7 +156,7 @@ </div> <div class="col-xs-7"> <div class="input-group"> - {{input class="form-control" valueBinding="controller.newApp.frequency"}} + {{input class="form-control" valueBinding="controller.newApp.frequency" placeholderTranslation="form.placeholder.frequency"}} <div class="input-group-addon">{{t common.seconds}}</div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/30bdc96f/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 979f0c8..63c211d 100644 --- a/contrib/views/slider/src/main/resources/ui/app/translations.js +++ b/contrib/views/slider/src/main/resources/ui/app/translations.js @@ -63,7 +63,11 @@ Em.I18n.translations = { 'form': { 'placeholder': { - 'optional': '(optional)' + 'optional': '(optional)', + 'step1.name': 'Enter Name (required)', + 'include.file.patterns': '*.log', + 'exclude.file.patterns': '*.zip', + 'frequency': '3600' } },
