Repository: ambari Updated Branches: refs/heads/trunk f50ff49d9 -> af497bddf
AMBARI-18730. Fix different styles issues (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af497bdd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af497bdd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af497bdd Branch: refs/heads/trunk Commit: af497bddf61c9099cf9d45a4f9f608ae74924479 Parents: f50ff49 Author: Aleksandr Kovalenko <[email protected]> Authored: Fri Oct 28 20:31:37 2016 +0300 Committer: Aleksandr Kovalenko <[email protected]> Committed: Sat Oct 29 09:30:31 2016 +0300 ---------------------------------------------------------------------- .../templates/common/configs/widgets/plain_config_text_field.hbs | 2 +- .../templates/common/configs/widgets/slider_config_widget.hbs | 2 +- ambari-web/app/templates/common/editable_list.hbs | 2 +- ambari-web/app/templates/common/filter_combobox.hbs | 2 +- ambari-web/app/templates/common/modal_popups/prompt_popup.hbs | 2 +- .../app/templates/main/admin/highAvailability/nameNode/step1.hbs | 2 +- ambari-web/app/templates/main/admin/stack_upgrade/services.hbs | 2 +- ambari-web/app/templates/main/alerts/definition_details.hbs | 2 +- ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs | 4 ++-- .../main/dashboard/edit_widget_popup_single_threshold.hbs | 2 +- ambari-web/app/templates/main/host/rack_id_popup.hbs | 2 +- .../app/templates/main/service/info/confirm_delete_service.hbs | 2 +- .../app/templates/main/service/widgets/create/step2_graph.hbs | 2 +- ambari-web/app/templates/main/service/widgets/create/step3.hbs | 2 +- .../main/service/widgets/create/widget_property_threshold.hbs | 4 ++-- ambari-web/app/templates/wizard/step1_addLocalRepository.hbs | 2 +- .../app/views/common/configs/selectable_popup_body_view.js | 2 +- ambari-web/app/views/common/host_progress_popup_body_view.js | 2 +- ambari-web/app/views/main/service/service.js | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/common/configs/widgets/plain_config_text_field.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/widgets/plain_config_text_field.hbs b/ambari-web/app/templates/common/configs/widgets/plain_config_text_field.hbs index cea5083..b32edc2 100644 --- a/ambari-web/app/templates/common/configs/widgets/plain_config_text_field.hbs +++ b/ambari-web/app/templates/common/configs/widgets/plain_config_text_field.hbs @@ -17,6 +17,6 @@ }} <div class="input-group"> - {{view App.ConfigTextField valueBinding="view.value" classBinding=":col-md-9 view.unit:form-control" placeholderBinding="view.placeholder" disabledBinding="view.disabled"}} + {{view App.ConfigTextField valueBinding="view.value" class="col-md-9 form-control" placeholderBinding="view.placeholder" disabledBinding="view.disabled"}} <div {{bindAttr class=":input-group-addon view.unit::hidden"}}>{{view.displayUnit}}</div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs index 58e3c91..b1f0719 100644 --- a/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs +++ b/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs @@ -19,7 +19,7 @@ <div class="widget-config slider-widget"> {{template "templates/common/configs/widgets/config_label"}} <div {{bindAttr class="view.isOriginalSCP:original-widget view.doNotShowWidget:hide :ui-slider-wrapper"}}> - <div {{bindAttr class=":pull-left :ui-slider-wrapper-inner"}}>{{view Ember.TextField valueBinding="view.config.value" class="input-mini slider-input"}}</div> + <div {{bindAttr class=":pull-left :ui-slider-wrapper-inner"}}>{{view Ember.TextField valueBinding="view.config.value" class="input-mini slider-input form-control"}}</div> </div> {{template "templates/common/configs/widgets/controls"}} </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/common/editable_list.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/editable_list.hbs b/ambari-web/app/templates/common/editable_list.hbs index 665f38b..27a9553 100644 --- a/ambari-web/app/templates/common/editable_list.hbs +++ b/ambari-web/app/templates/common/editable_list.hbs @@ -33,7 +33,7 @@ {{/each}} {{#if view.editMode}} <li class="item add-item-input"> - {{view Ember.TextField valueBinding="view.input" placeholder="New" classBinding="input-area"}} + {{view Ember.TextField valueBinding="view.input" placeholder="New" classBinding="form-control"}} {{#if view.typeahead}} <div class="typeahead-box"> <ul> http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/common/filter_combobox.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/filter_combobox.hbs b/ambari-web/app/templates/common/filter_combobox.hbs index 56057f2..4efbfca 100644 --- a/ambari-web/app/templates/common/filter_combobox.hbs +++ b/ambari-web/app/templates/common/filter_combobox.hbs @@ -18,7 +18,7 @@ <div class="btn-group"> <div class="input-group"> - {{view Ember.TextField valueBinding="view.filter" placeholderBinding="view.placeHolder"}} + {{view Ember.TextField valueBinding="view.filter" placeholderBinding="view.placeHolder" class="form-control"}} <div class="input-group-btn"> <button class="btn btn-default dropdown-toggle btn-icon" data-toggle="dropdown"> <span class="caret"></span> http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/common/modal_popups/prompt_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/prompt_popup.hbs b/ambari-web/app/templates/common/modal_popups/prompt_popup.hbs index c1ef0e8..1dee1a9 100644 --- a/ambari-web/app/templates/common/modal_popups/prompt_popup.hbs +++ b/ambari-web/app/templates/common/modal_popups/prompt_popup.hbs @@ -25,7 +25,7 @@ <p>{{view.description}}</p> <div> <strong>{{view.label}} </strong> - {{view Em.TextField class="prompt-input" valueBinding="view.parentView.inputValue"}} + {{view Em.TextField class="prompt-input form-control" valueBinding="view.parentView.inputValue"}} {{#if view.parentView.isChanged}} <a href="#" data-toggle="tooltip" class="btn-sm" {{action "doRestoreDefaultValue" this target="view.parentView"}} http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs index d2c1be1..63793e8 100644 --- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs +++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs @@ -32,7 +32,7 @@ <label class="control-label">{{t admin.highAvailability.wizard.step1.nameserviceid}}:</label> <div> - {{view Ember.TextField valueBinding="content.nameServiceId" classNames="input-sm"}} + {{view Ember.TextField valueBinding="content.nameServiceId" classNames="input-sm form-control"}} <span {{bindAttr class=":help-block :validation-block :col-sm-9 :pull-right view.showInputError::hidden"}}> {{t admin.highAvailability.wizard.step1.nameserviceid.error}} </span> http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs index 1c91d3e..f1c61f9 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs @@ -81,7 +81,7 @@ <!--edit mode for current url--> {{#if repository.onEdit}} <div {{bindAttr class=":url-td repository.empty-error:textfield-error repository.invalid-error:textfield-error"}}> - {{view Ember.TextField valueBinding="repository.baseUrl"}} + {{view Ember.TextField valueBinding="repository.baseUrl" class="form-control"}} </div> <div class="clear-td"> {{#if repository.clearAll}} http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/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 c39fe93..c7fa613 100644 --- a/ambari-web/app/templates/main/alerts/definition_details.hbs +++ b/ambari-web/app/templates/main/alerts/definition_details.hbs @@ -26,7 +26,7 @@ <div class="definition-name row"> {{#if controller.editing.label.isEditing}} <div {{bindAttr class="controller.editing.label.isError:error :col-md-5 :name-text-field :form-group"}}> - {{view Em.TextField valueBinding="controller.editing.label.value" maxlength="255"}} + {{view Em.TextField valueBinding="controller.editing.label.value" maxlength="255" class="form-control"}} </div> <div class="edit-buttons"> <button {{action cancelEdit controller.editing.label target="controller"}} http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs b/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs index d261fb0..727543e 100644 --- a/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs +++ b/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs @@ -45,13 +45,13 @@ <div class="row"> <div id="slider-value1" class="value-on-slider col-md-2">0</div> <div id="slider-value2" {{bindAttr class="view.configPropertyObj.isThresh1Error:slider-error :value-on-slider :col-md-4 view.configPropertyObj.isThresh1Error:has-error"}}> - {{view Ember.TextField valueBinding="view.configPropertyObj.thresh1"}} + {{view Ember.TextField class="form-control" valueBinding="view.configPropertyObj.thresh1"}} {{#if view.configPropertyObj.errorMessage1}} <span class="help-block validation-block">{{view.configPropertyObj.errorMessage1}}</span> {{/if}} </div> <div id="slider-value3" {{bindAttr class="view.configPropertyObj.isThresh2Error:slider-error :value-on-slider :col-md-4 view.configPropertyObj.isThresh2Error:has-error"}}> - {{view Ember.TextField valueBinding="view.configPropertyObj.thresh2"}} + {{view Ember.TextField class="form-control" valueBinding="view.configPropertyObj.thresh2"}} {{#if view.configPropertyObj.errorMessage1}} <span class="help-block validation-block">{{view.configPropertyObj.errorMessage2}}</span> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs b/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs index e65f0da..035b62e 100644 --- a/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs +++ b/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs @@ -44,7 +44,7 @@ <div class="row"> <div id="slider-value1" class="value-on-slider col-md-2" style="margin-left: 20px">0</div> <div id="slider-value2" style="margin-left: 100px"{{bindAttr class="view.configPropertyObj.isThresh1Error:slider-error :value-on-slider :col-md-4 view.configPropertyObj.isThresh1Error:has-error"}}> - {{view Ember.TextField valueBinding="view.configPropertyObj.thresh1"}} + {{view Ember.TextField valueBinding="view.configPropertyObj.thresh1" class="form-control"}} {{#if view.configPropertyObj.errorMessage1}} <span class="help-block validation-block">{{view.configPropertyObj.errorMessage1}}</span> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/main/host/rack_id_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/rack_id_popup.hbs b/ambari-web/app/templates/main/host/rack_id_popup.hbs index fbad317..66f9afb 100644 --- a/ambari-web/app/templates/main/host/rack_id_popup.hbs +++ b/ambari-web/app/templates/main/host/rack_id_popup.hbs @@ -19,7 +19,7 @@ <div id="host-rack-id-popup"> <div {{bindAttr class=":form-group :list-inline view.isValid::has-error"}}> <span>{{t hostPopup.RackId}}: </span> - {{view Em.TextField valueBinding="view.parentView.rackId" class="input-xlarge"}} + {{view Em.TextField valueBinding="view.parentView.rackId" class="input-xlarge form-control"}} {{#if view.errorMessage}} <span class="help-block validation-block">{{view.errorMessage}}</span> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/main/service/info/confirm_delete_service.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/confirm_delete_service.hbs b/ambari-web/app/templates/main/service/info/confirm_delete_service.hbs index 4ca1c73..3a3bbd0 100644 --- a/ambari-web/app/templates/main/service/info/confirm_delete_service.hbs +++ b/ambari-web/app/templates/main/service/info/confirm_delete_service.hbs @@ -19,5 +19,5 @@ {{{view.parentView.message}}} <div class="form-inline align-center"><br /> <label><strong>{{view.typeMessage}}</strong></label> - {{view Ember.TextField valueBinding="view.parentView.confirmInput" class="input-sm"}}<br /> + {{view Ember.TextField valueBinding="view.parentView.confirmInput" class="input-sm form-control"}}<br /> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/main/service/widgets/create/step2_graph.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/step2_graph.hbs b/ambari-web/app/templates/main/service/widgets/create/step2_graph.hbs index 59a697c..0040a9f 100644 --- a/ambari-web/app/templates/main/service/widgets/create/step2_graph.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/step2_graph.hbs @@ -27,7 +27,7 @@ {{/if}} {{#each dataSet in dataSets}} <fieldset> - <h5>{{view Ember.TextField valueBinding="dataSet.label"}}</h5> + <h5>{{view Ember.TextField valueBinding="dataSet.label" class="form-control"}}</h5> <h5>{{t common.expression}}:</h5> {{view App.WidgetWizardExpressionView expressionBinding="dataSet.expression"}} {{#if dataSet.isRemovable}} http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/main/service/widgets/create/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/step3.hbs b/ambari-web/app/templates/main/service/widgets/create/step3.hbs index cb9ffd5..a4ee81c 100644 --- a/ambari-web/app/templates/main/service/widgets/create/step3.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/step3.hbs @@ -23,7 +23,7 @@ <div class="row"> <div class="col-md-2 title">{{t widget.create.wizard.step3.widgetName}}<i class="glyphicon glyphicon-asterisk"></i></div> <div {{bindAttr class=":col-md-10 isNameInvalid:error"}}> - {{view Ember.TextField valueBinding="widgetName"}} + {{view Ember.TextField valueBinding="widgetName" class="form-control"}} {{#if isNameInvalid}} <div>{{widgetNameErrorMessage}}</div> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/main/service/widgets/create/widget_property_threshold.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/widget_property_threshold.hbs b/ambari-web/app/templates/main/service/widgets/create/widget_property_threshold.hbs index df31d13..7196ddb 100644 --- a/ambari-web/app/templates/main/service/widgets/create/widget_property_threshold.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/widget_property_threshold.hbs @@ -20,13 +20,13 @@ <div class="col-md-3 badge-container"><span {{bindAttr class=":label view.property.badgeWarning"}}>{{view.property.badgeWarning}}</span> </div> <div {{bindAttr class=":col-md-2 :threshold-input property.isSmallValueValid::error"}} rel="threshold-tooltip" {{translateAttr data-original-title="dashboard.widgets.wizard.step2.threshold.ok.tooltip"}}> - {{view Em.TextField valueBinding="view.property.smallValue" class ="col-md-10"}} + {{view Em.TextField valueBinding="view.property.smallValue" class ="col-md-10 form-control"}} </div> </div> <div class="row"> <div class="col-md-3 badge-container"><span {{bindAttr class=":label view.property.badgeCritical"}}>{{view.property.badgeCritical}}</span> </div> <div {{bindAttr class=":col-md-2 :threshold-input property.isBigValueValid::error"}} rel="threshold-tooltip" {{translateAttr data-original-title="dashboard.widgets.wizard.step2.threshold.warning.tooltip"}}> - {{view Em.TextField valueBinding="view.property.bigValue" class ="col-md-10"}} + {{view Em.TextField valueBinding="view.property.bigValue" class ="col-md-10 form-control"}} </div> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/templates/wizard/step1_addLocalRepository.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step1_addLocalRepository.hbs b/ambari-web/app/templates/wizard/step1_addLocalRepository.hbs index d701bf8..6c48a64 100644 --- a/ambari-web/app/templates/wizard/step1_addLocalRepository.hbs +++ b/ambari-web/app/templates/wizard/step1_addLocalRepository.hbs @@ -36,7 +36,7 @@ </div> <div class="each-row"> <label class="control-label">{{t installer.step1.advancedRepo.localRepo.label.baseUrl}}</label> - {{view Em.TextField valueBinding="view.enteredUrl" classNames="col-md-6"}} + {{view Em.TextField valueBinding="view.enteredUrl" classNames="col-md-6 form-control"}} </div> <div class="each-row"> <label class="control-label">{{t installer.step1.advancedRepo.localRepo.label.stack}}</label> http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/views/common/configs/selectable_popup_body_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/selectable_popup_body_view.js b/ambari-web/app/views/common/configs/selectable_popup_body_view.js index e527563..acd687f 100644 --- a/ambari-web/app/views/common/configs/selectable_popup_body_view.js +++ b/ambari-web/app/views/common/configs/selectable_popup_body_view.js @@ -48,7 +48,7 @@ App.SelectablePopupBodyView = Em.View.extend({ var content = this.get('parentView.content'); if (this.get('textareaVisible')) { var wrapper = $(".task-detail-log-maintext"); - $('.task-detail-log-clipboard').html(content).width(wrapper.width()).height(wrapper.height()); + $('.task-detail-log-clipboard').html(content).css('width', wrapper.css('width')).height(wrapper.height()); Em.run.next(function () { $('.task-detail-log-clipboard').select(); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/views/common/host_progress_popup_body_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/host_progress_popup_body_view.js b/ambari-web/app/views/common/host_progress_popup_body_view.js index b9181e2..375225c 100644 --- a/ambari-web/app/views/common/host_progress_popup_body_view.js +++ b/ambari-web/app/views/common/host_progress_popup_body_view.js @@ -962,7 +962,7 @@ App.HostProgressPopupBodyView = App.TableView.extend({ $(".task-detail-log-clipboard") .html(isLogComponentActive ? this.get('clipBoardContent') : "stderr: \n" + $(".stderr").html() + "\n stdout:\n" + $(".stdout").html()) .css('display', 'block') - .width(logElementRect.width) + .css('width', logElementRect.width) .height(isLogComponentActive ? logElement[0].scrollHeight : logElementRect.height) .select(); http://git-wip-us.apache.org/repos/asf/ambari/blob/af497bdd/ambari-web/app/views/main/service/service.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/service.js b/ambari-web/app/views/main/service/service.js index 76fad19..75f20e6 100644 --- a/ambari-web/app/views/main/service/service.js +++ b/ambari-web/app/views/main/service/service.js @@ -105,7 +105,7 @@ App.MainDashboardServiceHealthView = Em.View.extend({ didInsertElement: function () { this.updateToolTip(); - App.tooltip($("[rel='HealthTooltip']")); + App.tooltip($("[rel='HealthTooltip']"), {html: true}); this.doBlink(); // check for blink availability } });
