You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2016/10/14 21:04:37 UTC
[18/23] ambari git commit: AMBARI-18573. Migration to Bootstrap3
framework (akovalenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/overriddenProperty.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/overriddenProperty.hbs b/ambari-web/app/templates/common/configs/overriddenProperty.hbs
index 48bc171..7d8e594 100644
--- a/ambari-web/app/templates/common/configs/overriddenProperty.hbs
+++ b/ambari-web/app/templates/common/configs/overriddenProperty.hbs
@@ -16,39 +16,47 @@
* limitations under the License.
}}
{{! Here serviceConfigBinding should ideally be serviceConfigPropertyBinding }}
-<div {{bindAttr class="view.overriddenSCP.errorMessage:error: :control-group :overrideField"}}>
- {{view view.overriddenSCP.viewClass serviceConfigBinding="view.overriddenSCP" categoryConfigsBinding="view.parentView.categoryConfigs"}}
- {{#if view.overriddenSCP.supportsFinal}}
- <a href="#" data-toggle="tooltip"
- {{bindAttr class=":btn-small :btn-final view.overriddenSCP.isFinal:active view.overriddenSCP.hideFinalIcon:hidden" disabled="view.overriddenSCP.isNotEditable"}}
- {{action "toggleFinalFlag" view.overriddenSCP target="view.parentView"}}
- {{translateAttr data-original-title="services.service.config.final"}}>
- <i class="icon-lock"></i>
- </a>
- {{/if}}
- {{#if view.parentView.isDefaultGroupSelected}}
- {{#if view.overriddenSCP.group}}
- {{view App.SwitchToGroupView controllerBinding="controller" groupBinding="view.overriddenSCP.group"}}
- {{/if}}
- {{else}}
- {{#if view.overriddenSCP.isEditable}}
- {{#if isNotDefaultValue}}
- <a class="btn-small" href="#" data-toggle="tooltip"
- {{action "doRestoreDefaultValue" view.overriddenSCP target="view.parentView"}}
- {{translateAttr data-original-title="common.undo"}}>
- <i class="icon-undo"></i>
+<div {{bindAttr class="view.overriddenSCP.errorMessage:has-error: :form-group :overrideField"}}>
+ <div class="row">
+ <div class="col-md-9">
+ {{view view.overriddenSCP.viewClass serviceConfigBinding="view.overriddenSCP" categoryConfigsBinding="view.parentView.categoryConfigs"}}
+ </div>
+ <div class="col-md-3">
+ {{#if view.overriddenSCP.supportsFinal}}
+ <a href="#" data-toggle="tooltip"
+ {{bindAttr class=":btn-sm :btn-final view.overriddenSCP.isFinal:active view.overriddenSCP.hideFinalIcon:hidden" disabled="view.overriddenSCP.isNotEditable"}}
+ {{action "toggleFinalFlag" view.overriddenSCP target="view.parentView"}}
+ {{translateAttr data-original-title="services.service.config.final"}}>
+ <i class="glyphicon glyphicon-lock"></i>
</a>
{{/if}}
- {{#isAuthorized "SERVICE.MODIFY_CONFIGS"}}
- <a class="btn-small" href="#" data-toggle="tooltip"
- {{action "removeOverride" view.overriddenSCP target="view.parentView"}}
- {{translateAttr data-original-title="common.remove"}}>
- <i class="icon-minus-sign"></i>
- </a>
- {{/isAuthorized}}
- <span class="help-inline">{{view.overriddenSCP.errorMessage}}</span>
- {{else}}
- <a class="action">{{view.overriddenSCP.group.switchGroupTextShort}}</a> <i class="icon-spinner"></i>
- {{/if}}
- {{/if}}
+ {{#if view.parentView.isDefaultGroupSelected}}
+ {{#if view.overriddenSCP.group}}
+ {{view App.SwitchToGroupView controllerBinding="controller" groupBinding="view.overriddenSCP.group"}}
+ {{/if}}
+ {{else}}
+ {{#if view.overriddenSCP.isEditable}}
+ {{#if isNotDefaultValue}}
+ <a class="btn-sm" href="#" data-toggle="tooltip"
+ {{action "doRestoreDefaultValue" view.overriddenSCP target="view.parentView"}}
+ {{translateAttr data-original-title="common.undo"}}>
+ <i class="icon-undo"></i>
+ </a>
+ {{/if}}
+ {{#isAuthorized "SERVICE.MODIFY_CONFIGS"}}
+ <a class="btn-sm" href="#" data-toggle="tooltip"
+ {{action "removeOverride" view.overriddenSCP target="view.parentView"}}
+ {{translateAttr data-original-title="common.remove"}}>
+ <i class="icon-minus-sign"></i>
+ </a>
+ {{/isAuthorized}}
+ {{#if view.overriddenSCP.errorMessage}}
+ <span class="help-block validation-block pull-right">{{view.overriddenSCP.errorMessage}}</span>
+ {{/if}}
+ {{else}}
+ <a class="action">{{view.overriddenSCP.group.switchGroupTextShort}}</a> {{view App.SpinnerView}}
+ {{/if}}
+ {{/if}}
+ </div>
+ </div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/overrideWindow.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/overrideWindow.hbs b/ambari-web/app/templates/common/configs/overrideWindow.hbs
index f64f787..e618fb6 100644
--- a/ambari-web/app/templates/common/configs/overrideWindow.hbs
+++ b/ambari-web/app/templates/common/configs/overrideWindow.hbs
@@ -30,18 +30,18 @@
<td>
<a href="#" {{action toggleShowSelectedHosts target="view" }}>{{view.hostSelectMessage}}</a>
{{#if view.showOnlySelectedHosts}}
- <i class='icon-ok-sign'></i>
+ <i class='glyphicon glyphicon-ok-sign'></i>
{{/if}}
</td>
- <td width="30%">
+ <td width="45%">
<div class="row">
- <div class="span2" id="filter-dropdown-div">
+ <div class="col-md-7" id="filter-dropdown-div">
<!-- Filter text box with drop-down -->
- <div class="input-append">
+ <div class="input-group">
{{view Ember.TextField valueBinding="view.filterText" id="appendedDropdownButton"
- placeholderBinding="view.filterTextPlaceholder" class="span2" disabledBinding="view.isDisabled"}}
- <div class="btn-group">
- <button class="btn dropdown-toggle" data-toggle="dropdown" {{bindAttr disabled="view.isDisabled"}}>
+ placeholderBinding="view.filterTextPlaceholder" classNames="form-control" disabledBinding="view.isDisabled"}}
+ <div class="input-group-btn">
+ <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" {{bindAttr disabled="view.isDisabled"}}>
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
@@ -49,9 +49,9 @@
<li>
<a href="#" {{action selectFilterColumn column target="view"}}>
{{#if column.selected}}
- <i class='icon-ok-sign'></i>
+ <i class='glyphicon glyphicon-ok-sign'></i>
{{else}}
- <i class='icon-placeholder'></i>
+ <i class='glyphicon glyphicon-placeholder'></i>
{{/if}}
{{column.name}}
</a>
@@ -61,10 +61,10 @@
</div>
</div>
</div>
- <div class="span2" id="component-dropdown-div">
+ <div class="col-md-5" id="component-dropdown-div">
<!-- Host-components drop-down -->
- <div class="btn-group">
- <button class="btn dropdown-toggle" data-toggle="dropdown" href="#" {{bindAttr disabled="view.isDisabled"}}>
+ <div>
+ <button class="btn btn-block btn-default dropdown-toggle" data-toggle="dropdown" href="#" {{bindAttr disabled="view.isDisabled"}}>
{{t common.components}}
<span class="caret"></span>
</button>
@@ -74,9 +74,9 @@
<li>
<a href="#" {{action selectFilterComponent component target="view"}}>
{{#if component.selected}}
- <i class='icon-ok-sign'></i>
+ <i class='glyphicon glyphicon-ok-sign'></i>
{{else}}
- <i class='icon-placeholder'></i>
+ <i class='glyphicon glyphicon-placeholder'></i>
{{/if}}
{{component.displayName}}
</a>
@@ -126,12 +126,7 @@
<label>{{t common.show}}: {{view view.rowsPerPageSelectView selectionBinding="view.displayLength"}}</label>
</div>
<div class="info">{{view.paginationInfo}}</div>
- <div class="paging_two_button">
- {{view view.paginationFirst}}
- {{view view.paginationLeft}}
- {{view view.paginationRight}}
- {{view view.paginationLast}}
- </div>
+ {{view view.pagination4Btns}}
</div>
{{/if}}
{{! /with}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/propertyDependence_footer.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/propertyDependence_footer.hbs b/ambari-web/app/templates/common/configs/propertyDependence_footer.hbs
index b09e2bb..ee03ad4 100644
--- a/ambari-web/app/templates/common/configs/propertyDependence_footer.hbs
+++ b/ambari-web/app/templates/common/configs/propertyDependence_footer.hbs
@@ -17,7 +17,7 @@
}}
<div class="pull-right">
- <button class="btn" {{action onUndo target="view.parentView"}}>{{t common.cancel}}</button>
+ <button class="btn btn-default" {{action onUndo target="view.parentView"}}>{{t common.cancel}}</button>
{{#if view.canIgnore}}
<button class="btn btn-warning" {{action onIgnore target="view.parentView"}}>{{t common.ignore}}</button>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/queuePopup_body.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/queuePopup_body.hbs b/ambari-web/app/templates/common/configs/queuePopup_body.hbs
index 7bd0d7b..3959b3d 100644
--- a/ambari-web/app/templates/common/configs/queuePopup_body.hbs
+++ b/ambari-web/app/templates/common/configs/queuePopup_body.hbs
@@ -20,12 +20,14 @@
{{#each view.parentView.content.configs}}
{{#if isVisible}}
<div class="rw-fluid control-group">
- <div {{bindAttr class="errorMessage:error :control-label-span :span4"}}>
+ <div {{bindAttr class="errorMessage:error :control-label-span :col-md-4"}}>
<label>{{displayName}}</label>
</div>
- <div {{bindAttr class="errorMessage:error :control-group :span8"}}>
+ <div {{bindAttr class="errorMessage:error :form-group :col-md-8"}}>
{{view viewClass serviceConfigBinding="this" categoryConfigsBinding="view.categoryConfigs" }}
- <span class="help-inline">{{errorMessage}}</span>
+ {{#if errorMessage}}
+ <span class="help-block validation-block">{{errorMessage}}</span>
+ {{/if}}
</div>
</div>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/queuePopup_footer.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/queuePopup_footer.hbs b/ambari-web/app/templates/common/configs/queuePopup_footer.hbs
index 52584c5..f07c6ad 100644
--- a/ambari-web/app/templates/common/configs/queuePopup_footer.hbs
+++ b/ambari-web/app/templates/common/configs/queuePopup_footer.hbs
@@ -25,7 +25,7 @@
{{/if}}
<p class="pull-right">
{{#if view.parentView.primary}}
- <button type="button" class="btn" {{action onPrimary target="view.parentView"}}>
+ <button type="button" class="btn btn-default" {{action onPrimary target="view.parentView"}}>
{{view.parentView.primary}}
</button>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/save_configuration.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/save_configuration.hbs b/ambari-web/app/templates/common/configs/save_configuration.hbs
index 8ba7bb6..4ba97eb 100644
--- a/ambari-web/app/templates/common/configs/save_configuration.hbs
+++ b/ambari-web/app/templates/common/configs/save_configuration.hbs
@@ -16,14 +16,14 @@
* limitations under the License.
}}
{{#if view.showSaveWarning}}
- <div class="row-fluid">
- <div class="span12 alert alert-warning">{{t services.service.config.exitPopup.body}}</div>
+ <div class="row">
+ <div class="col-md-12 alert alert-warning">{{t services.service.config.exitPopup.body}}</div>
</div>
{{/if}}
{{#if view.showPasswordChangeWarning}}
<p class="alert alert-warning">{{t dashboard.configHistory.info-bar.save.popup.warningForPasswordChange}}</p>
{{/if}}
-<div class="row-fluid">
- <div class="span1">{{t common.notes}}</div>
- <div class="span10">{{view view.notesArea}}</div>
+<div class="row">
+ <div class="col-md-1">{{t common.notes}}</div>
+ <div class="col-md-10">{{view view.notesArea}}</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs b/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs
index 0954be0..a175ee5 100644
--- a/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs
+++ b/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs
@@ -22,42 +22,57 @@
<div class="text-warning">
{{view.parentView.warningMessage}}
</div>
- <label class="radio">
- {{view view.selectConfigGroupRadioButton}}
- <span {{bindAttr class="view.parentView.hasExistedGroups::message"}}>{{view.parentView.selectExistingGroupLabel}}</span>
- </label>
- {{#if view.parentView.availableConfigGroups.length}}
- <div class="select-create-config-group-div">
- <span class="btn-group">
- <button class="btn" {{bindAttr disabled="view.parentView.optionCreateConfigGroup"}}>{{view.parentView.selectedConfigGroup.name}}</button>
- <button class="btn dropdown-toggle" data-toggle="dropdown" {{bindAttr disabled="view.parentView.optionCreateConfigGroup"}}>
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu">
- <!-- available config group menu links -->
- {{#each configGroup in view.parentView.availableConfigGroups}}
- <li>
- <a href="#" {{action "doSelectConfigGroup" configGroup target="view.parentView"}}>
- {{configGroup.name}}
- </a>
- </li>
- {{/each}}
- </ul>
- </span>
- <div class="message">{{t config.group.selection.dialog.option.select.msg}}</div>
+ <form>
+ <div class="form-group">
+ <div class="radio">
+ <label {{bindAttr class="view.parentView.hasExistedGroups::message"}}>
+ {{view view.selectConfigGroupRadioButton}}
+ {{view.parentView.selectExistingGroupLabel}}
+ </label>
+ </div>
+ </div>
+ {{#if view.parentView.availableConfigGroups.length}}
+ <div class="select-create-config-group-div">
+ <span class="btn-group">
+ <button class="btn btn-default" {{bindAttr disabled="view.parentView.optionCreateConfigGroup"}}>{{view.parentView.selectedConfigGroup.name}}</button>
+ <button class="btn btn-default dropdown-toggle btn-icon" data-toggle="dropdown" {{bindAttr disabled="view.parentView.optionCreateConfigGroup"}}>
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ <!-- available config group menu links -->
+ {{#each configGroup in view.parentView.availableConfigGroups}}
+ <li>
+ <a href="#" {{action "doSelectConfigGroup" configGroup target="view.parentView"}}>
+ {{configGroup.name}}
+ </a>
+ </li>
+ {{/each}}
+ </ul>
+ </span>
+ <div class="message">{{t config.group.selection.dialog.option.select.msg}}</div>
+ </div>
+ {{else}}
+ <div class="select-create-config-group-div">
+ <div class="alert alert-block">{{view.parentView.noGroups}}</div>
+ </div>
+ {{/if}}
+ <div class="form-group">
+ <div class="radio">
+ <label>
+ {{view view.createConfigGroupRadioButton}}
+ {{view.parentView.createNewGroupLabel}}
+ </label>
+ </div>
</div>
- {{else}}
<div class="select-create-config-group-div">
- <div class="alert alert-block">{{view.parentView.noGroups}}</div>
+ <div class="row">
+ <div class="col-md-5">
+ {{view Ember.TextField valueBinding="view.parentView.newConfigGroupName"
+ disabledBinding="view.parentView.optionSelectConfigGroup" maxlength="255" class="form-control"}}
+ </div>
+ </div>
+ <div class="clearfix"></div>
+ <div class="message">{{view.parentView.createNewGroupDescription}}</div>
</div>
- {{/if}}
- <label class="radio">
- {{view view.createConfigGroupRadioButton}}
- {{view.parentView.createNewGroupLabel}}
- </label>
- <div class="select-create-config-group-div">
- {{view Ember.TextField valueBinding="view.parentView.newConfigGroupName"
- disabledBinding="view.parentView.optionSelectConfigGroup" maxlength="255" class="span5"}}
- <div class="message">{{view.parentView.createNewGroupDescription}}</div>
- </div>
+ </form>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/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 b78fecf..ed70f8c 100644
--- a/ambari-web/app/templates/common/configs/service_config.hbs
+++ b/ambari-web/app/templates/common/configs/service_config.hbs
@@ -21,11 +21,11 @@
<div class="alert">
<div class="clearfix like_pointer collapsable" {{action toggleRestartMessageView target="view"}}>
{{#if view.isRestartMessageCollapsed}}
- <i class="icon-caret-down pull-left"></i>
+ <i class="glyphicon glyphicon-caret-down pull-left"></i>
{{else}}
- <i class="icon-caret-right pull-left"></i>
+ <i class="iglyphicon glyphicon-caret-right pull-left"></i>
{{/if}}
- <i class="icon-refresh"></i>
+ <i class="glyphicon glyphicon-refresh"></i>
<strong>{{t dashboard.services.configs.popup.restartService.header}}</strong> {{selectedService.restartRequiredMessage}}
</div>
<div class="service-body">
@@ -51,9 +51,9 @@
{{t common.group}}
<span class="btn-group config-groups-dropdown">
{{#if controller.configGroupsAreLoaded}}
- <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn dropdown-toggle first"
+ <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn btn-default dropdown-toggle first"
data-toggle="dropdown">{{selectedConfigGroup.displayNameHosts}}</button>
- <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn dropdown-toggle" data-toggle="dropdown">
+ <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu config-groups-dropdown-menu">
@@ -135,13 +135,11 @@
{{#if tab.isAdvanced}}
{{#if tab.isRendered}}
{{#each category in selectedService.configCategories}}
- <div class="accordion">
- {{#if category.isCustomView}}
- {{view category.customView categoryBinding="category" serviceBinding="selectedService" canEditBinding="view.canEdit" serviceConfigsBinding="selectedService.configs"}}
- {{else}}
- {{view App.ServiceConfigsByCategoryView categoryBinding="category" canEditBinding="view.canEdit" serviceBinding="selectedService" serviceConfigsBinding="selectedService.configs" supportsHostOverridesBinding="view.supportsHostOverrides"}}
- {{/if}}
- </div>
+ {{#if category.isCustomView}}
+ {{view category.customView categoryBinding="category" serviceBinding="selectedService" canEditBinding="view.canEdit" serviceConfigsBinding="selectedService.configs"}}
+ {{else}}
+ {{view App.ServiceConfigsByCategoryView categoryBinding="category" canEditBinding="view.canEdit" serviceBinding="selectedService" serviceConfigsBinding="selectedService.configs" supportsHostOverridesBinding="view.supportsHostOverrides"}}
+ {{/if}}
{{/each}}
{{else}}
{{view App.SpinnerView}}
@@ -155,13 +153,11 @@
</div>
{{else}}
{{#each category in selectedService.configCategories}}
- <div class="accordion">
- {{#if category.isCustomView}}
- {{view category.customView categoryBinding="category" serviceBinding="selectedService" canEditBinding="view.canEdit" serviceConfigsBinding="selectedService.configs"}}
- {{else}}
- {{view App.ServiceConfigsByCategoryView categoryBinding="category" canEditBinding="view.canEdit" serviceBinding="selectedService" serviceConfigsBinding="selectedService.configs" supportsHostOverridesBinding="view.supportsHostOverrides"}}
- {{/if}}
- </div>
+ {{#if category.isCustomView}}
+ {{view category.customView categoryBinding="category" serviceBinding="selectedService" canEditBinding="view.canEdit" serviceConfigsBinding="selectedService.configs"}}
+ {{else}}
+ {{view App.ServiceConfigsByCategoryView categoryBinding="category" canEditBinding="view.canEdit" serviceBinding="selectedService" serviceConfigsBinding="selectedService.configs" supportsHostOverridesBinding="view.supportsHostOverrides"}}
+ {{/if}}
{{/each}}
{{/if}}
{{#if view.isAllConfigsHidden}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/service_config_category.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config_category.hbs b/ambari-web/app/templates/common/configs/service_config_category.hbs
index 38b4f83..8539e4e 100644
--- a/ambari-web/app/templates/common/configs/service_config_category.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_category.hbs
@@ -15,48 +15,51 @@
* See the License for the specific language governing permissions and
* limitations under the License.
}}
+<div class="panel panel-default">
+ <div class="panel-heading" {{action "onToggleBlock" category target="view"}}>
+ <h3 class="panel-title">
+ <i {{bindAttr class=":pull-left :panel-toggle view.category.isCollapsed:icon-caret-right:icon-caret-down"}}></i>
+ <a class="panel-toggle category-header">
+ <span class="category-name">{{view.category.displayName}}</span>
+ {{#if view.category.errorCount}}
+ <span class="badge badge-important">{{view.category.errorCount}}</span>
+ {{/if}}
+ </a>
+ </h3>
+ </div>
-<div class="accordion-heading" {{action "onToggleBlock" category target="view"}}>
- <i {{bindAttr class=":pull-left :accordion-toggle view.category.isCollapsed:icon-caret-right:icon-caret-down"}}></i>
- <a class="accordion-toggle category-header">
- <span class="category-name">{{view.category.displayName}}</span>
- {{#if view.category.errorCount}}
- <span class="badge badge-important">{{view.category.errorCount}}</span>
- {{/if}}
- </a>
-</div>
-
-<div class="accordion-body collapse in" {{bindAttr style="view.isCategoryBodyVisible"}}>
- <div class="accordion-inner service-config-section">
+ <div class="panel-body collapse in" {{bindAttr style="view.isCategoryBodyVisible"}}>
+ <div class="service-config-section">
<form class="form-horizontal" autocomplete="off">
{{#each view.categoryConfigs}}
{{#unless widget}} {{! configs with widgets should be shown only on the EnhancedConfigs tabs }}
- <div {{bindAttr class=":entry-row isHiddenByFilter:hide isOverridden:overridden-property hasCompareDiffs:overridden-property"}}>
+ <div {{bindAttr class=":entry-row :form-group isHiddenByFilter:hide isOverridden:overridden-property hasCompareDiffs:overridden-property"}}>
{{#if showLabel}}
{{#unless rightSideLabel}}
- <span {{bindAttr class="errorMessage:error: :control-group :control-label-span"}}>
+ <span {{bindAttr class="errorMessage:has-error: :form-group :control-label-span :col-md-3"}}>
<label class="control-label">
{{formatWordBreak displayName}}
{{#if isSecureConfig}}
- <a href="javascript:void(null);"><i class="icon-lock" rel="tooltip" data-toggle="tooltip"
+ <a href="javascript:void(null);"><i class="glyphicon glyphicon-lock" rel="tooltip" data-toggle="tooltip"
title="security knob"></i></a>
{{/if}}
</label>
</span>
{{else}}
- <span class="control-group control-label-span"> </span>
+ <span class="control-group control-label-span col-md-3"> </span>
{{/unless}}
{{/if}}
- <div {{bindAttr class="showLabel:controls"}}>
+ <div class="col-md-9">
{{! Here serviceConfigBinding should ideally be serviceConfigPropertyBinding }}
{{#if this.isOriginalSCP}}
- <div {{bindAttr class="errorMessage:error: warnMessage:warning: :control-group"}}>
+ <div {{bindAttr class="errorMessage:has-error: warnMessage:has-warning: :form-group"}}>
{{view viewClass serviceConfigBinding="this" categoryConfigsAllBinding="view.categoryConfigsAll" }}
{{#if rightSideLabel}}
<span {{bindAttr class="isEditable::muted"}}>{{formatWordBreak displayName}}</span>
{{/if}}
{{#if hintMessage}}
- <a class="icon-question-sign icon-blue" href="#" data-toggle="tooltip" {{bindAttr data-original-title="hintMessage"}}></a>
+ <a class="icon-question-sign glyphicon glyphicon-blue" href="#"
+ data-toggle="tooltip" {{bindAttr data-original-title="hintMessage"}}></a>
{{/if}}
{{#if this.isComparison}}
{{#if controller.selectedConfigGroup.isDefault}}
@@ -73,8 +76,14 @@
{{#if controller.canEdit}}
{{view App.ControlsView serviceConfigPropertyBinding="this"}}
{{/if}}
- <span class="help-inline">{{errorMessage}}</span>
- <span class="help-inline">{{warnMessage}}</span>
+ {{#if errorMessage}}
+ <span class="help-block validation-block">{{errorMessage}}</span>
+ {{/if}}
+ {{#if warnMessage}}
+ <span class="has-warning">
+ <span class="help-block validation-block">{{warnMessage}}</span>
+ </span>
+ {{/if}}
</div>
{{/if}}
{{#if this.isComparison}}
@@ -109,3 +118,4 @@
</form>
</div>
</div>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/service_config_wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config_wizard.hbs b/ambari-web/app/templates/common/configs/service_config_wizard.hbs
index e785055..57bf5ee 100644
--- a/ambari-web/app/templates/common/configs/service_config_wizard.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_wizard.hbs
@@ -20,8 +20,8 @@
<div class="alert alert-info config-manage-nav">
{{t common.group}}
<span class="btn-group config-groups-dropdown">
- <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn dropdown-toggle first" data-toggle="dropdown">{{selectedConfigGroup.displayNameHosts}}</button>
- <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn dropdown-toggle" data-toggle="dropdown">
+ <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn btn-default dropdown-toggle first" data-toggle="dropdown">{{selectedConfigGroup.displayNameHosts}}</button>
+ <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu config-groups-dropdown-menu">
@@ -72,11 +72,9 @@
{{#each tab in view.tabs}}
<div {{bindAttr class=":tab-pane tab.isActive:active tab.id"}}>
{{#if tab.isAdvanced}}
- <div class="accordion">
- {{#each catView in view.serviceConfigsByCategoryView.childViews}}
- {{view catView}}
- {{/each}}
- </div>
+ {{#each catView in view.serviceConfigsByCategoryView.childViews}}
+ {{view catView}}
+ {{/each}}
{{else}}
{{! Render Enhanced Config Section }}
{{view App.ServiceConfigLayoutTabView contentBinding="tab"}}
@@ -85,11 +83,9 @@
{{/each}}
</div>
{{else}}
- <div class="accordion">
- {{#each catView in view.serviceConfigsByCategoryView.childViews}}
- {{view catView}}
- {{/each}}
- </div>
+ {{#each catView in view.serviceConfigsByCategoryView.childViews}}
+ {{view catView}}
+ {{/each}}
{{/if}}
{{#if view.isAllConfigsHidden}}
<div class="alert alert-info col-sm-12">
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/service_version_box.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_version_box.hbs b/ambari-web/app/templates/common/configs/service_version_box.hbs
index d44efb8..6e05369 100644
--- a/ambari-web/app/templates/common/configs/service_version_box.hbs
+++ b/ambari-web/app/templates/common/configs/service_version_box.hbs
@@ -28,8 +28,8 @@
<div class="stack-label">{{view.serviceVersion.stackVersion}}</div>
{{#if view.serviceVersion.isCurrent}}
<div class="current-label">
- <span class="label label-success label-current icon-ok" data-toggle="tooltip" {{translateAttr title="common.current"}}>
- <i {{bindAttr class=":icon-refresh :restart-required-service view.serviceVersion.isRestartRequired::hidden"}}></i>
+ <span class="label label-success label-current glyphicon glyphicon-ok" data-toggle="tooltip" {{translateAttr title="common.current"}}>
+ <i {{bindAttr class=":glyphicon :glyphicon-refresh :restart-required-service view.serviceVersion.isRestartRequired::hidden"}}></i>
</span>
</div>
{{/if}}
@@ -43,12 +43,12 @@
<div class="notes">{{view.serviceVersion.fullNotes}}</div>
</div>
<div class="version-operations-buttons">
- <button {{bindAttr disabled="view.disabledActionAttr.view" class=":btn view.serviceVersion.isDisplayed:not-allowed-cursor" title="view.disabledActionMessages.view"}} {{action doAction view.serviceVersion view.actionTypes.SWITCH target="view.parentView"}}><i class="icon-search"></i> {{t common.view}}</button>
+ <button {{bindAttr disabled="view.disabledActionAttr.view" class=":btn :btn-default view.serviceVersion.isDisplayed:not-allowed-cursor" title="view.disabledActionMessages.view"}} {{action doAction view.serviceVersion view.actionTypes.SWITCH target="view.parentView"}}><i class="glyphicon glyphicon-search"></i> {{t common.view}}</button>
{{#isAuthorized "SERVICE.COMPARE_CONFIGS"}}
- <button {{bindAttr disabled="view.disabledActionAttr.compare" class=":btn view.serviceVersion.isDisplayed:not-allowed-cursor" title="view.disabledActionMessages.compare"}} {{action doAction view.serviceVersion view.actionTypes.COMPARE target="view.parentView"}}><i class="icon-copy"></i> {{t common.compare}}</button>
+ <button {{bindAttr disabled="view.disabledActionAttr.compare" class=":btn :btn-default view.serviceVersion.isDisplayed:not-allowed-cursor" title="view.disabledActionMessages.compare"}} {{action doAction view.serviceVersion view.actionTypes.COMPARE target="view.parentView"}}><i class="glyphicon glyphicon-copy"></i> {{t common.compare}}</button>
{{/isAuthorized}}
{{#isAuthorized "SERVICE.MODIFY_CONFIGS"}}
- <button {{bindAttr disabled="view.disabledActionAttr.revert" class=":btn view.serviceVersion.isCurrent:not-allowed-cursor view.serviceVersion.isCompatible::hidden" title="view.disabledActionMessages.revert"}} {{action doAction view.serviceVersion view.actionTypes.REVERT target="view.parentView"}}>{{t dashboard.configHistory.info-bar.revert.button}}</button>
+ <button {{bindAttr disabled="view.disabledActionAttr.revert" class=":btn :btn-default view.serviceVersion.isCurrent:not-allowed-cursor view.serviceVersion.isCompatible::hidden" title="view.disabledActionMessages.revert"}} {{action doAction view.serviceVersion view.actionTypes.REVERT target="view.parentView"}}>{{t dashboard.configHistory.info-bar.revert.button}}</button>
{{/isAuthorized}}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/services_config.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/services_config.hbs b/ambari-web/app/templates/common/configs/services_config.hbs
index 87bfdef..d052424 100644
--- a/ambari-web/app/templates/common/configs/services_config.hbs
+++ b/ambari-web/app/templates/common/configs/services_config.hbs
@@ -46,13 +46,13 @@
<p class="loading align-center"></p>
{{#unless controller.transitionInProgress}}
{{#if controller.hasStepConfigIssues}}
- <div class="alert">
- <span class="icon-warning-sign"></span> {{t installer.step7.attentionNeeded}}<br />
+ <div class="alert alert-warning">
+ <span class="glyphicon glyphicon-warning-sign"></span> {{t installer.step7.attentionNeeded}}<br />
{{issuesFilterText}} <a href="#" {{action toggleIssuesFilter target="controller"}}>{{issuesFilterLinkText}}</a>
</div>
{{else}}
<div class="alert alert-success">
- <span class="icon-check"></span> {{t installer.step7.noIssues}}<br />
+ <span class="glyphicon glyphicon-check"></span> {{t installer.step7.noIssues}}<br />
{{#if controller.issuesFilterSelected}}
<a href="#" {{action toggleIssuesFilter target="controller"}}>{{issuesFilterLinkText}}</a>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/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 a338315..f199614 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
@@ -17,10 +17,10 @@
}}
{{template "templates/common/configs/widgets/config_label"}}
<div {{bindAttr class=":pull-left view.isOriginalSCP:original-widget view.disabled:disabled view.doNotShowWidget:hide"}}>
- <div class="input-append">
+ <div class="input-group">
<div class="dropdown btn-group">
- {{view Em.TextField valueBinding="view.content.value" disabled="disabled"}}
- <button {{bindAttr class="view.disabled:disabled :btn :dropdown-toggle"}} data-toggle="dropdown">
+ {{view Em.TextField valueBinding="view.content.value" disabled="disabled" class="form-control"}}
+ <button {{bindAttr class="view.disabled:disabled :btn :btn-default :dropdown-toggle :btn-icon"}} data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul {{bindAttr class=":pull-left :dropdown-menu"}}>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs b/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
index f4ea796..b692550 100644
--- a/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
@@ -18,7 +18,7 @@
{{#each compareConfig in view.serviceConfigProperty.compareConfigs}}
<div class="clearfix"></div>
- <div {{bindAttr class=":control-group :overrideField :widget-config-comparison"}}>
+ <div {{bindAttr class=":form-group :overrideField :widget-config-comparison"}}>
{{view view.serviceConfigProperty.widget canEditBinding="view.canEdit" configBinding="compareConfig"
isBeingComparedBinding="view.isBeingCompared" categoryConfigsAllBinding="view.parentView.categoryConfigsAll" isPopoverEnabled="false"}}
<div class="widget-config-controls version-labels">
@@ -28,7 +28,7 @@
{{/if}}
{{#unless compareConfig.isMock}}
{{#if compareConfig.supportsFinal}}
- <i {{bindAttr class=":icon-lock compareConfig.isFinal::hidden" }}></i>
+ <i {{bindAttr class=":glyphicon :glyphicon-lock compareConfig.isFinal::hidden" }}></i>
{{/if}}
{{/unless}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/widgets/controls.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/controls.hbs b/ambari-web/app/templates/common/configs/widgets/controls.hbs
index 9c6197b..cd4f5c2 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs
@@ -28,9 +28,9 @@
{{/if}}
{{#if view.canEdit}}
<div {{bindAttr class=":widget-config-controls view.referToSelectedGroup::clear-min-height"}}>
- <div {{bindAttr class=":widget-col :left view.config.isNotDefaultValue::not-show"}}>
+ <div {{bindAttr class=":widget-col :left view.config.isNotDefaultValue::hidden"}}>
<a href="#"
- {{bindAttr class=":widget-action :widget-action-undo view.undoAllowed::not-show"}}
+ {{bindAttr class=":widget-action :widget-action-undo view.undoAllowed::hidden"}}
data-toggle="tooltip" {{translateAttr data-original-title="common.undo"}}
{{action "restoreValue" target="view"}}>
<i class="icon-undo"></i>
@@ -41,11 +41,11 @@
{{#if view.isWidgetViewAllowed}}
<a href="#"
data-toggle="tooltip" {{translateAttr data-original-title="common.edit"}}
- {{bindAttr class=":icon-pencil :widget-action :widget-action-switch-view view.isHover::hide view.config.showAsTextBox::active"}}
+ {{bindAttr class=":glyphicon :glyphicon-pencil :widget-action :widget-action-switch-view view.isHover::hide view.config.showAsTextBox::active"}}
{{action "toggleWidgetView" target="view"}}>
</a>
{{else}}
- <i class="icon-pencil widget-action widget-action-switch-view text-error"
+ <i class="icon-pencil widget-action widget-action-switch-view text-danger"
data-toggle="tooltip" {{bindAttr data-original-title="view.issueMessage"}}></i>
{{/if}}
{{/if}}
@@ -64,7 +64,7 @@
{{bindAttr class=":widget-action :widget-action-final view.config.isFinal:active view.showFinalConfig:show:hide" disabled="view.config.isNotEditable"}}
{{action "toggleFinalFlag" view.config target="view"}}
{{translateAttr data-original-title="services.service.config.final"}}>
- <i class="icon-lock"></i>
+ <i class="glyphicon glyphicon-lock"></i>
</a>
{{/if}}
{{#unless view.isOriginalSCP}}
@@ -74,7 +74,7 @@
data-toggle="tooltip"
{{action "removeOverride" view.config target="view.parentView"}}
{{translateAttr data-original-title="common.remove"}}>
- <i class="icon-minus-sign"></i>
+ <i class="glyphicon glyphicon-minus-sign"></i>
</a>
{{/isAuthorized}}
{{/unless}}
@@ -85,7 +85,7 @@
<a class="widget-action widget-action-override" href="#" data-toggle="tooltip"
{{action "createOverrideProperty" view.config target="view.parentView"}}
{{translateAttr data-original-title="common.override"}}>
- <i class="icon-plus-sign"></i>
+ <i class="glyphicon glyphicon-plus-sign"></i>
</a>
</div>
{{/isAuthorized}}
@@ -105,10 +105,10 @@
{{#if controller.selectedConfigGroup.isDefault}}
<span class="label label-info">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span>
{{#if controller.isCurrentSelected}}
- <span class="label label-success icon-ok label-current" data-toggle="tooltip" {{translateAttr title="common.current"}}></span>
+ <span class="label label-success glyphicon glyphicon-ok label-current" data-toggle="tooltip" {{translateAttr title="common.current"}}></span>
{{/if}}
{{#if view.config.supportsFinal}}
- <i {{bindAttr class=":icon-lock view.config.isFinal::hidden" }}></i>
+ <i {{bindAttr class=":glyphicon :glyphicon-lock view.config.isFinal::hidden" }}></i>
{{/if}}
{{else}}
<span class="label label-info">{{t common.default}}
@@ -120,7 +120,7 @@
{{#unless view.canEdit}}
{{#if view.config.supportsFinal}}
<div class="widget-config-controls version-labels">
- <i {{bindAttr class=":icon-lock view.config.isFinal::hidden" }}></i>
+ <i {{bindAttr class=":glyphicon :glyphicon-lock view.config.isFinal::hidden" }}></i>
</div>
{{/if}}
{{/unless}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs
index 439250a..75ab2bf 100644
--- a/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/list_config_widget.hbs
@@ -19,7 +19,7 @@
<div {{bindAttr class="view.config.isHiddenByFilter:hide view.isOriginalSCP:original-widget"}}>
{{template "templates/common/configs/widgets/config_label"}}
<div class="pull-left btn-group">
- <a {{bindAttr class=":btn :dropdown-toggle view.config.isEditable::disabled view.doNotShowWidget:hide"}} data-toggle="dropdown">{{view.displayVal}} <span class="caret"></span></a>
+ <a {{bindAttr class=":btn :btn-default :dropdown-toggle view.config.isEditable::disabled view.doNotShowWidget:hide"}} data-toggle="dropdown">{{view.displayVal}} <span class="caret"></span></a>
<ul class="dropdown-menu">
{{#each option in view.options}}
<li>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/widgets/overrides/config_widget_override.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/overrides/config_widget_override.hbs b/ambari-web/app/templates/common/configs/widgets/overrides/config_widget_override.hbs
index 95cb7be..f901387 100644
--- a/ambari-web/app/templates/common/configs/widgets/overrides/config_widget_override.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/overrides/config_widget_override.hbs
@@ -17,7 +17,7 @@
}}
{{#each overriddenSCP in view.serviceConfigProperty.overrides}}
{{! Here serviceConfigBinding should ideally be serviceConfigPropertyBinding }}
- <div {{bindAttr class="overriddenSCP.errorMessage:error: :control-group :overrideField"}}>
+ <div {{bindAttr class="overriddenSCP.errorMessage:error: :form-group :overrideField"}}>
{{view view.serviceConfigProperty.widget configBinding="overriddenSCP" isPopoverEnabled="false"}}
</div>
<div class="clearfix"></div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/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 82fcc71..cea5083 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
@@ -16,7 +16,7 @@
* limitations under the License.
}}
-<div class="input-append">
- {{view App.ConfigTextField valueBinding="view.value" class="span9" placeholderBinding="view.placeholder" disabledBinding="view.disabled"}}
- <span {{bindAttr class=":add-on view.unit::hidden"}}>{{view.displayUnit}}</span>
+<div class="input-group">
+ {{view App.ConfigTextField valueBinding="view.value" classBinding=":col-md-9 view.unit: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/2a77e39c/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs b/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs
index 9fb4cf9..5202c8f 100644
--- a/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs
@@ -19,10 +19,12 @@
{{template "templates/common/configs/widgets/config_label"}}
<div class="pull-left">
{{#each item in view.content}}
- <label>
- {{view Ember.RadioButton nameBinding="view.elementId" valueBinding="item.value" selectionBinding="view.config.value"}}
- {{item.label}}
- </label>
+ <div class="radio">
+ <label>
+ {{view Ember.RadioButton nameBinding="view.elementId" valueBinding="item.value" selectionBinding="view.config.value"}}
+ {{item.label}}
+ </label>
+ </div>
{{/each}}
</div>
{{template "templates/common/configs/widgets/controls"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/widgets/service_config_password_field.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/service_config_password_field.hbs b/ambari-web/app/templates/common/configs/widgets/service_config_password_field.hbs
new file mode 100644
index 0000000..0ce63a7
--- /dev/null
+++ b/ambari-web/app/templates/common/configs/widgets/service_config_password_field.hbs
@@ -0,0 +1,26 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+
+<div class="row">
+ <div class="col-md-6">
+ {{view Em.TextField class="form-control" readOnlyBinding="view.readOnly" valueBinding="view.serviceConfig.value" type="password" placeholderBinding="view.placeholder"}}
+ </div>
+ <div class="col-md-6">
+ {{view Em.TextField class="form-control retyped-password" readOnlyBinding="view.readOnly" valueBinding="view.serviceConfig.retypedPassword" type="password" placeholderBinding="view.placeholderRetype"}}
+ </div>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/configs/widgets/test_db_connection_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/test_db_connection_widget.hbs b/ambari-web/app/templates/common/configs/widgets/test_db_connection_widget.hbs
index 78626c0..9e75f6b 100644
--- a/ambari-web/app/templates/common/configs/widgets/test_db_connection_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/test_db_connection_widget.hbs
@@ -16,12 +16,10 @@
* limitations under the License.
}}
-<div class="entry-row db-connection">
- <span class="control-label"></span>
-
- <div class="controls">
- <div class="control-group">
- <div class="span9">
+<div class="entry-row db-connection form-group">
+ <div class="control-group">
+ <div class="row">
+ <div class="col-md-10">
<span {{bindAttr class=":pull-left :btn :btn-primary view.isBtnDisabled:disabled"}} {{action connectToDatabase target="view"}}>{{view.btnCaption}}</span>
<div class="pull-left connection-result mll">
@@ -30,7 +28,7 @@
{{#if view.isConnecting}}
{{view App.SpinnerView classNames="mll pull-left"}}
{{/if}}
- <i {{bindAttr class=":pull-right view.isConnectionSuccess:icon-ok-sign:icon-warning-sign view.isRequestResolved::hide"}}></i>
+ <i {{bindAttr class=":pull-right view.isConnectionSuccess:glyphicon-ok-sign:glyphicon-warning-sign :glyphicon view.isRequestResolved::hide"}}></i>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/custom_date_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/custom_date_popup.hbs b/ambari-web/app/templates/common/custom_date_popup.hbs
index d076823..8a3d1c9 100644
--- a/ambari-web/app/templates/common/custom_date_popup.hbs
+++ b/ambari-web/app/templates/common/custom_date_popup.hbs
@@ -17,25 +17,31 @@
}}
<div class="jobs-custom-dates">
- <div {{bindAttr class=":control-group view.errors.isStartDateError:error"}}>
+ <div {{bindAttr class=":form-group view.errors.isStartDateError:has-error"}}>
<label>{{t jobs.customDateFilter.startTime}}</label>
- {{view Ember.TextField valueBinding="view.customDateFormFields.startDate" class="input-small datepicker no-autofocus"}}
- {{view Ember.Select contentBinding="view.hourOptions" selectionBinding="view.customDateFormFields.hoursForStart" class="input-mini"}}
- {{view Ember.Select contentBinding="view.minuteOptions" selectionBinding="view.customDateFormFields.minutesForStart" class="input-mini"}}
- {{view Ember.Select contentBinding="view.middayPeriodOptions" selectionBinding="view.customDateFormFields.middayPeriodForStart" class="input-mini"}}
- <span class="help-inline">{{view.errorMessages.startDate}}</span>
+ <div class="form-inline">
+ {{view Ember.TextField valueBinding="view.customDateFormFields.startDate" class="input-sm datepicker no-autofocus form-control"}}
+ {{view Ember.Select contentBinding="view.hourOptions" selectionBinding="view.customDateFormFields.hoursForStart" class="input-sm form-control"}}
+ {{view Ember.Select contentBinding="view.minuteOptions" selectionBinding="view.customDateFormFields.minutesForStart" class="input-sm form-control"}}
+ {{view Ember.Select contentBinding="view.middayPeriodOptions" selectionBinding="view.customDateFormFields.middayPeriodForStart" class="input-sm form-control"}}
+ </div>
+ <span class="help-block validation-block">{{view.errorMessages.startDate}}</span>
</div>
- <div class="control-group">
+ <div class="form-group">
<label>{{t common.duration}}</label>
- {{view view.durationSelect selectionBinding="view.customDateFormFields.duration"}}
+ <div class="form-inline">
+ {{view view.durationSelect selectionBinding="view.customDateFormFields.duration" class="form-control input-sm"}}
+ </div>
</div>
- <div {{bindAttr class=":control-group view.errors.isEndDateError:error view.isCustomEndDate::hidden"}}>
+ <div {{bindAttr class=":form-group :form-inline view.errors.isEndDateError:has-error view.isCustomEndDate::hidden"}}>
<label>{{t jobs.customDateFilter.endTime}}</label>
- {{view Ember.TextField valueBinding="view.customDateFormFields.endDate" class="input-small datepicker no-autofocus"}}
- {{view Ember.Select contentBinding="view.hourOptions" selectionBinding="view.customDateFormFields.hoursForEnd" class="input-mini"}}
- {{view Ember.Select contentBinding="view.minuteOptions" selectionBinding="view.customDateFormFields.minutesForEnd" class="input-mini"}}
- {{view Ember.Select contentBinding="view.middayPeriodOptions" selectionBinding="view.customDateFormFields.middayPeriodForEnd" class="input-mini"}}
- <span class="help-inline">{{view.errorMessages.endDate}}</span>
+ <div class="form-inline">
+ {{view Ember.TextField valueBinding="view.customDateFormFields.endDate" class="input-sm datepicker no-autofocus form-control"}}
+ {{view Ember.Select contentBinding="view.hourOptions" selectionBinding="view.customDateFormFields.hoursForEnd" class="input-sm form-control"}}
+ {{view Ember.Select contentBinding="view.minuteOptions" selectionBinding="view.customDateFormFields.minutesForEnd" class="input-sm form-control"}}
+ {{view Ember.Select contentBinding="view.middayPeriodOptions" selectionBinding="view.customDateFormFields.middayPeriodForEnd" class="input-sm form-control"}}
+ </div>
+ <span class="help-block validation-block">{{view.errorMessages.endDate}}</span>
</div>
<div class="timezone">
<strong>{{t common.timezone}}</strong>: {{App.router.userSettingsController.userSettings.timezone.label}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/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 b1ab0ba..665f38b 100644
--- a/ambari-web/app/templates/common/editable_list.hbs
+++ b/ambari-web/app/templates/common/editable_list.hbs
@@ -56,15 +56,15 @@
{{#if view.editMode}}
<div class="actions-panel">
<button class="btn btn-default btn-xs" {{action onSecondary target="view"}}>
- <span class="icon-remove"></span>
+ <span class="glyphicon glyphicon-remove"></span>
</button>
<button class="btn btn-primary btn-xs" {{action onPrimary target="view"}}>
- <span class="icon-ok"></span>
+ <span class="glyphicon glyphicon-ok"></span>
</button>
</div>
{{else}}
<div class="pencil-box" {{action enableEditMode target="view"}}>
- <span class="icon-pencil"></span>
+ <span class="glyphicon glyphicon-pencil"></span>
</div>
{{/if}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/filter_combo_cleanable.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/filter_combo_cleanable.hbs b/ambari-web/app/templates/common/filter_combo_cleanable.hbs
index b08faf4..18f3322 100644
--- a/ambari-web/app/templates/common/filter_combo_cleanable.hbs
+++ b/ambari-web/app/templates/common/filter_combo_cleanable.hbs
@@ -16,31 +16,36 @@
* limitations under the License.
}}
- {{view Ember.TextField valueBinding="view.filter" placeholderBinding="view.placeHolder"}}
- <div class="btn-group">
+<div class="btn-group">
+ <div class="input-group">
+
+ {{view Ember.TextField valueBinding="view.filter" placeholderBinding="view.placeHolder" classNames="form-control"}}
+ <div class="input-group-btn">
<div id="cleanerContainer" class="pull-left">
<a href="#" id="filterCleaner" {{action "clearFilter" target="view"}}
{{bindAttr class="view.filterNotEmpty::hidden :ui-icon :ui-icon-circle-close"}}></a>
</div>
- <button class="btn dropdown-toggle" data-toggle="dropdown">
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu">
- {{#each column in view.columns}}
- <li>
- <a href="#" {{action selectFilterColumn column target="view"}}>
- <i {{bindAttr class="column.selected:icon-ok-sign:icon-placeholder :text-success"}}></i>
- {{column.name}}
- </a>
- </li>
- {{/each}}
- {{#if view.showClearFilter}}
- <li class="divider"></li>
+ <button class="btn btn-default dropdown-toggle btn-icon" data-toggle="dropdown">
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ {{#each column in view.columns}}
<li>
- <a href="#" {{action clearFilterColumn target="view"}}>
- {{t tableView.filters.clearFilters}}
- </a>
+ <a href="#" {{action selectFilterColumn column target="view"}}>
+ <i {{bindAttr class="column.selected:glyphicon-ok-sign:glyphicon-placeholder :glyphicon :text-success"}}></i>
+ {{column.name}}
+ </a>
</li>
- {{/if}}
- </ul>
+ {{/each}}
+ {{#if view.showClearFilter}}
+ <li class="divider"></li>
+ <li>
+ <a href="#" {{action clearFilterColumn target="view"}}>
+ {{t tableView.filters.clearFilters}}
+ </a>
+ </li>
+ {{/if}}
+ </ul>
+ </div>
</div>
+</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/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 a968078..56057f2 100644
--- a/ambari-web/app/templates/common/filter_combobox.hbs
+++ b/ambari-web/app/templates/common/filter_combobox.hbs
@@ -16,19 +16,23 @@
* limitations under the License.
}}
- {{view Ember.TextField valueBinding="view.filter" placeholderBinding="view.placeHolder"}}
- <div class="btn-group">
- <button class="btn dropdown-toggle" data-toggle="dropdown">
+<div class="btn-group">
+ <div class="input-group">
+ {{view Ember.TextField valueBinding="view.filter" placeholderBinding="view.placeHolder"}}
+ <div class="input-group-btn">
+ <button class="btn btn-default dropdown-toggle btn-icon" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{{#each column in view.columns}}
<li>
<a href="#" {{action selectFilterColumn column target="view"}}>
- <i {{bindAttr class="column.selected:icon-ok-sign:icon-placeholder :text-success"}}></i>
+ <i {{bindAttr class="column.selected:glyphicon-ok-sign:glyphicon-placeholder :glyphicon :text-success"}}></i>
{{column.name}}
</a>
</li>
{{/each}}
</ul>
+ </div>
</div>
+</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/form/check_db_connection.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/form/check_db_connection.hbs b/ambari-web/app/templates/common/form/check_db_connection.hbs
index c6efacd..71bcdab 100644
--- a/ambari-web/app/templates/common/form/check_db_connection.hbs
+++ b/ambari-web/app/templates/common/form/check_db_connection.hbs
@@ -16,20 +16,16 @@
* limitations under the License.
}}
-<div class="entry-row db-connection">
- <span class="control-label"></span>
- <div class="controls">
- <div class="control-group">
- <div class="span9">
- <span {{bindAttr class=":pull-left :btn :btn-primary view.isBtnDisabled:disabled"}} {{action connectToDatabase target="view"}}>{{view.btnCaption}}</span>
- <div class="pull-left connection-result mll">
- <a {{bindAttr class="view.isConnectionSuccess:mute:action"}} {{action showLogsPopup target="view"}}>{{view.responseCaption}}</a>
- </div>
- {{#if view.isConnecting}}
- {{view App.SpinnerView classNames="mll pull-left"}}
- {{/if}}
- <i {{bindAttr class=":pull-right view.isConnectionSuccess:icon-ok-sign:icon-warning-sign view.isRequestResolved::hide"}}></i>
- </div>
+<div class="entry-row form-group db-connection">
+ <div class="col-md-3 control-label"></div>
+ <div class="col-md-9">
+ <span {{bindAttr class=":pull-left :btn :btn-primary view.isBtnDisabled:disabled"}} {{action connectToDatabase target="view"}}>{{view.btnCaption}}</span>
+ <div class="pull-left connection-result mll">
+ <a {{bindAttr class="view.isConnectionSuccess:mute:action"}} {{action showLogsPopup target="view"}}>{{view.responseCaption}}</a>
</div>
+ {{#if view.isConnecting}}
+ {{view App.SpinnerView classNames="mll pull-left"}}
+ {{/if}}
+ <i {{bindAttr class=":pull-right view.isConnectionSuccess:glyphicon-ok-sign:glyphicon-warning-sign :glyphicon view.isRequestResolved::hide"}}></i>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/form/checkbox.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/form/checkbox.hbs b/ambari-web/app/templates/common/form/checkbox.hbs
index c22e107..1e0aa61 100644
--- a/ambari-web/app/templates/common/form/checkbox.hbs
+++ b/ambari-web/app/templates/common/form/checkbox.hbs
@@ -16,9 +16,11 @@
* limitations under the License.
}}
-<div class="controls">
- <label class="checkbox" for="input{{unbound view.field.name}}">
- {{view view.field.viewClass valueBinding="view.field.value" }} {{unbound view.field.displayName}}
- </label>
- <span class="help-inline">{{view.field.errorMessage}}</span>
+<div>
+ <div class="checkbox">
+ <label for="input{{unbound view.field.name}}">
+ {{view view.field.viewClass valueBinding="view.field.value" }} {{unbound view.field.displayName}}
+ </label>
+ </div>
+ <span class="help-block">{{view.field.errorMessage}}</span>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/form/field.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/form/field.hbs b/ambari-web/app/templates/common/form/field.hbs
index d89ed70..8745f51 100644
--- a/ambari-web/app/templates/common/form/field.hbs
+++ b/ambari-web/app/templates/common/form/field.hbs
@@ -19,7 +19,9 @@
<label class="control-label"
for="input{{unbound view.field.name}}">{{unbound view.field.displayName}}</label>
-<div class="controls">
+<div>
{{view view.field.viewClass valueBinding="view.field.value" }}
- <span class="help-inline">{{view.field.errorMessage}}</span>
+ {{#if view.field.errorMessage}}
+ <span class="help-block validation-block">{{view.field.errorMessage}}</span>
+ {{/if}}
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/form/manage_credentilas_form.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/form/manage_credentilas_form.hbs b/ambari-web/app/templates/common/form/manage_credentilas_form.hbs
index 26ded49..88cdfb9 100644
--- a/ambari-web/app/templates/common/form/manage_credentilas_form.hbs
+++ b/ambari-web/app/templates/common/form/manage_credentilas_form.hbs
@@ -22,10 +22,10 @@
</p>
<div class="control-group">
<label class="control-label">{{t popup.invalid.KDC.admin.principal}}</label>
- <div class="controls">
+ <div>
{{view Ember.TextField valueBinding="view.principal" class="form-control"}}
{{#if view.principalError}}
- <p class="mtm text-error">
+ <p class="mtm text-danger">
{{view.principalError}}
</p>
{{/if}}
@@ -33,10 +33,10 @@
</div>
<div class="control-group">
<label class="control-label">{{t popup.invalid.KDC.admin.password}}</label>
- <div class="controls">
+ <div>
{{view Ember.TextField type="password" valueBinding="view.password" class="form-control"}}
{{#if view.passwordError}}
- <p class="mtm text-error">
+ <p class="mtm text-danger">
{{view.passwordError}}
</p>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/form/spinner_input.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/form/spinner_input.hbs b/ambari-web/app/templates/common/form/spinner_input.hbs
index 9ed9dd2..219313d 100644
--- a/ambari-web/app/templates/common/form/spinner_input.hbs
+++ b/ambari-web/app/templates/common/form/spinner_input.hbs
@@ -16,10 +16,18 @@
* limitations under the License.
}}
-<div class="input-prepend input-append">
- <button class="btn" {{bindAttr disabled="view.computedDisabled"}} {{action decrementValue target="view"}}><span class="icon icon-caret-left"></span></button>
- {{view Em.TextField valueBinding="view.content.value" disabledBinding="view.computedDisabled"}}
- <button class="btn" {{bindAttr disabled="view.computedDisabled"}} {{action incrementValue target="view"}}><span class="icon icon-caret-right"></span></button>
+<div class="input-group">
+ <span class="input-group-btn">
+ <button class="btn btn-default" {{bindAttr disabled="view.computedDisabled"}} {{action decrementValue target="view"}}>
+ <span class="icon-caret-left"></span>
+ </button>
+ </span>
+ {{view Em.TextField valueBinding="view.content.value" disabledBinding="view.computedDisabled" class="form-control"}}
+ <span class="input-group-btn">
+ <button class="btn btn-default" {{bindAttr disabled="view.computedDisabled"}} {{action incrementValue target="view"}}>
+ <span class="icon-caret-right"></span>
+ </button>
+ </span>
</div>
{{#if view.content.label}}
<span class="spinner-input-label">{{view.content.label}}</span>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/grid/filter.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/grid/filter.hbs b/ambari-web/app/templates/common/grid/filter.hbs
index 609c977..41ab1cb 100644
--- a/ambari-web/app/templates/common/grid/filter.hbs
+++ b/ambari-web/app/templates/common/grid/filter.hbs
@@ -18,8 +18,10 @@
{{#each filter in view.filters}}
<li>
- <label class="checkbox">
- {{view Em.Checkbox checkedBinding="filter.checked"}} {{filter.label}}
- </label>
+ <div class="checkbox">
+ <label>
+ {{view Em.Checkbox checkedBinding="filter.checked"}} {{filter.label}}
+ </label>
+ </div>
</li>
-{{/each}}
\ No newline at end of file
+{{/each}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/grid/header.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/grid/header.hbs b/ambari-web/app/templates/common/grid/header.hbs
index c4d51dc..ed51926 100644
--- a/ambari-web/app/templates/common/grid/header.hbs
+++ b/ambari-web/app/templates/common/grid/header.hbs
@@ -16,7 +16,7 @@
* limitations under the License.
}}
-{{view.label}}<i {{action toggleFilter target="view"}} class="icon-filter"></i>
+{{view.label}}<i {{action toggleFilter target="view"}} class="glyphicon glyphicon-filter"></i>
{{#if view.showFilter}}
{{view view.filter}}
<a {{action applyFilter target="view"}}>{{t apply}}</a>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/host_progress_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs b/ambari-web/app/templates/common/host_progress_popup.hbs
index 8658955..4fb5432 100644
--- a/ambari-web/app/templates/common/host_progress_popup.hbs
+++ b/ambari-web/app/templates/common/host_progress_popup.hbs
@@ -29,10 +29,11 @@
<div class="select-wrap">
{{t common.show}}:
{{view Ember.Select
- contentBinding="view.categories"
- optionValuePath="content.value"
- optionLabelPath="content.label"
- selectionBinding="view.serviceCategory"
+ contentBinding="view.categories"
+ optionValuePath="content.value"
+ optionLabelPath="content.label"
+ selectionBinding="view.serviceCategory"
+ class="form-control"
}}
</div>
</div>
@@ -54,13 +55,13 @@
</div>
<div class="time-summary start-time-text">{{servicesInfo.startTime}}</div>
<div class="time-summary duration-text">{{servicesInfo.duration}}</div>
- <div class="progress-bar span2">
- <div {{bindAttr class="servicesInfo.isInProgress:progress-striped servicesInfo.isInProgress:active servicesInfo.barColor :progress"}}>
- <div class="bar" {{bindAttr style="servicesInfo.barWidth"}}></div>
+ <div class="progress-wrapper col-md-2">
+ <div class="progress">
+ <div {{bindAttr class="servicesInfo.isInProgress:active servicesInfo.isInProgress:progress-bar-striped servicesInfo.barColor :progress-bar" style="servicesInfo.barWidth"}}></div>
</div>
</div>
<div class="host-progress-num">{{servicesInfo.progress}}%</div>
- <div class="show-details"><i class="icon-caret-right"></i></div>
+ <div class="show-details"><i class="glyphicon glyphicon-caret-right"></i></div>
</div>
</div>
{{/each}}
@@ -79,7 +80,7 @@
<div class="task-top-wrap">
{{#if controller.isBackgroundOperations}}
<a class="task-detail-back-to-hosts" href="javascript:void(null)" {{action backToServiceList}} >
- <i class="icon-arrow-left"></i> {{t common.operations}}
+ <i class="glyphicon glyphicon-arrow-left"></i> {{t common.operations}}
</a>
{{/if}}
<span class="task-detail-log-rolename">{{t common.hosts}}</span>
@@ -87,10 +88,11 @@
<div class="select-wrap">
{{t common.show}}:
{{view Ember.Select
- contentBinding="view.categories"
- optionValuePath="content.value"
- optionLabelPath="content.label"
- selectionBinding="view.hostCategory"
+ contentBinding="view.categories"
+ optionValuePath="content.value"
+ optionLabelPath="content.label"
+ selectionBinding="view.hostCategory"
+ class="form-control"
}}
</div>
</div>
@@ -124,13 +126,13 @@
{{hostInfo.displayName}}
</a>
</div>
- <div class="progress-bar span2">
- <div {{bindAttr class="hostInfo.isInProgress:progress-striped :active hostInfo.barColor :progress"}}>
- <div class="bar" {{bindAttr style="hostInfo.barWidth"}}></div>
+ <div class="progress-wrapper col-md-2">
+ <div class="progress">
+ <div {{bindAttr class="hostInfo.isInProgress:progress-bar-striped :active hostInfo.barColor :progress-bar" style="hostInfo.barWidth"}}></div>
</div>
</div>
<div class="host-progress-num">{{hostInfo.progress}}%</div>
- <div class="show-details"><i class="icon-caret-right"></i></div>
+ <div class="show-details"><i class="glyphicon glyphicon-caret-right"></i></div>
</div>
</div>
{{/each}}
@@ -147,16 +149,17 @@
<div {{bindAttr class="view.parentView.isTaskListHidden:hidden :task-list-main-warp"}}>
<div class="task-top-wrap">
<a class="task-detail-back-to-hosts" href="javascript:void(null)" {{action backToHostList}} ><i
- class="icon-arrow-left"></i> {{t common.hosts}}</a>
+ class="glyphicon glyphicon-arrow-left"></i> {{t common.hosts}}</a>
<div class="task-name-top task-detail-log-rolename">{{t common.tasks}}</div>
<div class="select-wrap tasks-list-select">
{{t common.show}}:
{{view Ember.Select
- contentBinding="view.categories"
- optionValuePath="content.value"
- optionLabelPath="content.label"
- selectionBinding="view.taskCategory"
+ contentBinding="view.categories"
+ optionValuePath="content.value"
+ optionLabelPath="content.label"
+ selectionBinding="view.taskCategory"
+ class="form-control"
}}
</div>
</div>
@@ -174,7 +177,7 @@
{{taskInfo.commandDetail}}
</a>
</div>
- <div class="show-details"><i class="icon-caret-right"></i></div>
+ <div class="show-details"><i class="glyphicon glyphicon-caret-right"></i></div>
</div>
</div>
{{/each}}
@@ -191,20 +194,20 @@
<div {{bindAttr class="view.parentView.isLogWrapHidden:hidden :task-detail-info view.hostComponentLogsExists:task-detail-info-tabbed"}}>
<div class="task-top-wrap">
<a class="task-detail-back" href="javascript:void(null)" {{action backToTaskList}} ><i
- class="icon-arrow-left"></i> {{t common.tasks}}</a>
+ class="glyphicon glyphicon-arrow-left"></i> {{t common.tasks}}</a>
<div {{bindAttr class="view.hostComponentLogsExists:task-detail-log-nav-actions"}}>
<i {{bindAttr class="view.openedTask.status :task-detail-status-ico view.openedTask.icon"}}></i>
<div class="task-detail-ico-wrap">
<a {{translateAttr title="common.fullLogPopup.clickToCopy"}} {{action "textTrigger" taskInfo target="view"}} class="task-detail-copy"><i
- class="icon-copy"></i> {{t common.copy}}</a>
+ class="glyphicon glyphicon-copy"></i> {{t common.copy}}</a>
<a {{translateAttr title="common.openNewWindow"}} {{action openTaskLogInDialog}} class="task-detail-open-dialog"><i
- class="icon-external-link"></i> {{t common.open}}</a>
+ class="glyphicon glyphicon-external-link"></i> {{t common.open}}</a>
{{#if App.supports.logSearch}}
{{#if view.isLogSearchInstalled}}
<a {{action navigateToHostLogs target="view"}} {{bindAttr class="view.isLogsLinkVisible::hidden"}} href="#">
- <i class="icon-file"></i> {{t common.host}} {{t common.logs}}
+ <i class="glyphicon glyphicon-file"></i> {{t common.host}} {{t common.logs}}
</a>
{{/if}}
{{/if}}
@@ -233,8 +236,8 @@
<h5>{{t services.hdfs.rebalance.title}}</h5>
<div class="progresspopup-rebalancehdfs">
- <div {{bindAttr class=":progress view.openedTask.isInProgress:progress-striped view.openedTask.barColor :active"}}>
- <div class="bar" {{bindAttr style="view.openedTask.completionProgressStyle"}}></div>
+ <div class="progress-bar">
+ <div {{bindAttr class=":progress view.openedTask.isInProgress:progress-bar-striped view.openedTask.barColor :active" style="view.openedTask.completionProgressStyle"}}></div>
</div>
</div>
<div class="clearfix">
@@ -262,7 +265,7 @@
<span class="text-bold muted">{{hostLog.fileName}}</span>
{{#view App.LogSearchUILinkView linkQueryParamsBinding="hostLog.linkTail" tagName="span"}}
<a {{bindAttr href="view.formatedLink" class=":pull-right view.isLodaded::disabled"}} target="_blank">
- <i class="icon-external-link"></i>
+ <i class="glyphicon glyphicon-external-link"></i>
{{t popup.logTail.openInLogSearch}}</a>
{{/view}}
</p>
@@ -288,11 +291,6 @@
<label>{{t common.show}}: {{view view.rowsPerPageSelectView selectionBinding="view.displayLength"}}</label>
</div>
<div class="info">{{view.paginationInfo}}</div>
- <div class="paging_two_button">
- {{view view.paginationFirst}}
- {{view view.paginationLeft}}
- {{view view.paginationRight}}
- {{view view.paginationLast}}
- </div>
+ {{view view.pagination4Btns}}
</div>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/host_progress_popup_footer.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/host_progress_popup_footer.hbs b/ambari-web/app/templates/common/host_progress_popup_footer.hbs
index a3160f7..51a8db4 100644
--- a/ambari-web/app/templates/common/host_progress_popup_footer.hbs
+++ b/ambari-web/app/templates/common/host_progress_popup_footer.hbs
@@ -17,13 +17,17 @@
}}
{{#isAuthorized "AMBARI.MANAGE_SETTINGS"}}
- <label id="footer-checkbox">{{view Ember.Checkbox classNames="checkbox" checkedBinding="view.parentView.isNotShowBgChecked"}}
- {{t app.settings.notShowBgOperations}}</label>
+ <div class="checkbox pull-left checkbox-row">
+ <label id="footer-checkbox">
+ {{view Ember.Checkbox checkedBinding="view.parentView.isNotShowBgChecked"}}
+ {{t app.settings.notShowBgOperations}}
+ </label>
+ </div>
{{/isAuthorized}}
{{#if view.parentView.primary}}
<button {{bindAttr
disabled="view.parentView.disablePrimary"
- class=":btn view.parentView.primaryClass"}}
+ class=":btn view.parentView.primaryClass :pull-right"}}
{{action onPrimary target="view.parentView"}}>
{{view.parentView.primary}}
</button>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/log_file_search.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/log_file_search.hbs b/ambari-web/app/templates/common/log_file_search.hbs
index a874df6..5f6bfe1 100644
--- a/ambari-web/app/templates/common/log_file_search.hbs
+++ b/ambari-web/app/templates/common/log_file_search.hbs
@@ -76,23 +76,23 @@
</div>
</div>
<div class="context-menu pull-left">
- <a href="#" {{action moveTableTop target="view"}} class="move-to-top icon-caret-up"></a>
- <a href="#" {{action moveTableBottom target="view"}} class="move-to-bottom icon-caret-down"></a>
- <a href="#" {{action navigateToLogUI target="view"}} class="icon-external-link"></a>
+ <a href="#" {{action moveTableTop target="view"}} class="move-to-top glyphicon glyphicon-caret-up"></a>
+ <a href="#" {{action moveTableBottom target="view"}} class="move-to-bottom glyphicon glyphicon-caret-down"></a>
+ <a href="#" {{action navigateToLogUI target="view"}} class="glyphicon glyphicon-external-link"></a>
</div>
<div class="clearfix"></div>
</div>
<div class="log-file-search-content container">
{{#each logData in view.content}}
- <div class="row-fluid log-data-item">
- <div class="span1 log-data-date">
+ <div class="row log-data-item">
+ <div class="col-md-1 log-data-date">
{{logData.date}}
<br />
<span class="log-data-level">
{{logData.level}}
</span>
</div>
- <div class="span11 log-data-message">{{logData.message}}</div>
+ <div class="col-md-11 log-data-message">{{logData.message}}</div>
<div class="clearfix"></div>
</div>
{{/each}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/log_tail.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/log_tail.hbs b/ambari-web/app/templates/common/log_tail.hbs
index db70e1d..421bb75 100644
--- a/ambari-web/app/templates/common/log_tail.hbs
+++ b/ambari-web/app/templates/common/log_tail.hbs
@@ -21,14 +21,14 @@
{{#if view.isDataReady}}
{{#if view.oldLogsIsFetching}}
<div class="log-tail-spinner-container text-center">
- <i class="icon-spinner icon-spin"></i>
+ {{view App.SpinnerView}}
</div>
{{/if}}
{{#each row in view.logRows}}
<div>{{row.logtimeFormatted}} {{row.level}} {{row.logMessage}}</div>
{{/each}}
{{else}}
- <div class="log-tail-spinner-container text-center"><i class="icon-spinner icon-spin"></i></div>
+ <div class="log-tail-spinner-container text-center">{{view App.SpinnerView}}</div>
{{/if}}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/metric.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/metric.hbs b/ambari-web/app/templates/common/metric.hbs
index b91fa1a..26de9f0 100644
--- a/ambari-web/app/templates/common/metric.hbs
+++ b/ambari-web/app/templates/common/metric.hbs
@@ -17,7 +17,7 @@
}}
<div class="span title">
- {{t common.metrics}} <i class="icon-question-sign"></i>
+ {{t common.metrics}} <i class="glyphicon glyphicon-question-sign"></i>
</div>
<ul class="display-inline-block nav nav-pills">
{{#each metric in view.metrics}}
@@ -31,27 +31,25 @@
</a>
{{#if view.showMore}}
- <div class="accordion" id="metricAccordion">
+ <div class="panel panel-default" id="metricAccordion">
{{#each view.moreMetrics}}
- <div class="accordion-group">
- <div class="accordion-heading">
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#metricAccordion"
+ <div class="panel-group">
+ <div class="panel-heading">
+ <a class="panel-toggle" data-toggle="collapse" data-parent="#metricAccordion"
href="#{{unbound code}}Collapse">
- <i class="icon-play"></i>{{unbound label}}
+ <i class="glyphicon glyphicon-play"></i>{{unbound label}}
</a>
</div>
- <div id="{{unbound code}}Collapse" class="accordion-body collapse">
- <div class="accordion-inner">
- {{#if items.length }}
- <ul class="items">
- {{#each metric in items}}
- {{view view.moreItemView metricBinding="metric" widgetBinding="view"}}
- {{/each}}
- </ul>
- {{else}}
+ <div id="{{unbound code}}Collapse" class="panel-body collapse">
+ {{#if items.length }}
+ <ul class="items">
+ {{#each metric in items}}
+ {{view view.moreItemView metricBinding="metric" widgetBinding="view"}}
+ {{/each}}
+ </ul>
+ {{else}}
{{t metric.notFound}}
- {{/if}}
- </div>
+ {{/if}}
</div>
</div>
{{/each}}