You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/10/16 13:30:10 UTC
[20/30] 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/modal_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popup.hbs b/ambari-web/app/templates/common/modal_popup.hbs
index 1d67a41..67801f1 100644
--- a/ambari-web/app/templates/common/modal_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popup.hbs
@@ -17,46 +17,55 @@
}}
-<div class="modal-backdrop"></div>
+<div class="modal-backdrop in"></div>
<div {{bindAttr class=":modal view.showFooter:with-footer:no-footer"}} id="modal" tabindex="-1" role="dialog" aria-labelledby="modal-label" aria-hidden="true">
- <div class="modal-header">
- {{#if view.showCloseButton}}
- <a class="close" {{action onClose target="view"}}>x</a>
- {{/if}}
- <h3 id="modal-label">
- {{#if view.headerClass}}
- {{view view.headerClass}}
- {{else}}
- {{view.header}}
- {{/if}}
- </h3>
- </div>
- <div {{bindAttr class=":modal-body view.isHideBodyScroll:hidden-scroll"}}>
- {{#if view.bodyClass}}
- {{view view.bodyClass}}
- {{else}}
- {{#if view.encodeBody}}
- {{view.body}}
- {{else}}
- {{{view.body}}}
- {{/if}}
- {{/if}}
- </div>
- {{#if view.showFooter}}
- {{#if view.footerClass}}
- {{view view.footerClass}}
- {{else}}
- <div class="modal-footer">
- {{#if view.third}}
- <button {{bindAttr disabled="view.disableThird" class=":btn view.thirdClass"}} {{action onThird target="view"}}>{{view.third}}</button>
- {{/if}}
- {{#if view.secondary}}
- <button {{bindAttr disabled="view.disableSecondary" class=":btn view.secondaryClass"}} {{action onSecondary target="view"}}>{{view.secondary}}</button>
+ <div {{bindAttr class="view.modalDialogClassesStr :modal-dialog"}}>
+ <div class="modal-content">
+ {{! Modal header }}
+ <div class="modal-header">
+ {{#if view.showCloseButton}}
+ <a class="close" {{action onClose target="view"}}>x</a>
{{/if}}
- {{#if view.primary}}
- <button {{bindAttr disabled="view.disablePrimary" class=":btn view.primaryClass"}} {{action onPrimary target="view"}}>{{view.primary}}</button>
+ <h4 id="modal-label">
+ {{#if view.headerClass}}
+ {{view view.headerClass}}
+ {{else}}
+ {{view.header}}
+ {{/if}}
+ </h4>
+ </div>
+
+ {{! Modal Body }}
+ <div {{bindAttr class=":modal-body view.isHideBodyScroll:hidden-scroll"}}>
+ {{#if view.bodyClass}}
+ {{view view.bodyClass}}
+ {{else}}
+ {{#if view.encodeBody}}
+ {{view.body}}
+ {{else}}
+ {{{view.body}}}
+ {{/if}}
{{/if}}
</div>
- {{/if}}
- {{/if}}
+
+ {{! Modal footer }}
+ {{#if view.showFooter}}
+ {{#if view.footerClass}}
+ {{view view.footerClass}}
+ {{else}}
+ <div class="modal-footer">
+ {{#if view.third}}
+ <button {{bindAttr disabled="view.disableThird" class=":btn :btn-default view.thirdClass"}} {{action onThird target="view"}}>{{view.third}}</button>
+ {{/if}}
+ {{#if view.secondary}}
+ <button {{bindAttr disabled="view.disableSecondary" class=":btn :btn-default view.secondaryClass"}} {{action onSecondary target="view"}}>{{view.secondary}}</button>
+ {{/if}}
+ {{#if view.primary}}
+ <button {{bindAttr disabled="view.disablePrimary" class=":btn :btn-default view.primaryClass"}} {{action onPrimary target="view"}}>{{view.primary}}</button>
+ {{/if}}
+ </div>
+ {{/if}}
+ {{/if}}
+ </div>
+ </div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs b/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs
index 2382de7..fcab416 100644
--- a/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs
@@ -62,12 +62,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}}
{{else}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs b/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs
index 766c6e6..88d8eaf 100644
--- a/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs
+++ b/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs
@@ -17,7 +17,7 @@
}}
<div id="pre-upgrade-check">
{{#if view.isAllPassed}}
- <i class="icon-ok"></i> <span>{{t admin.stackVersions.version.upgrade.upgradeOptions.preCheck.allPassed.msg}}</span>
+ <i class="glyphicon glyphicon-ok"></i> <span>{{t admin.stackVersions.version.upgrade.upgradeOptions.preCheck.allPassed.msg}}</span>
{{/if}}
{{#if view.fails.length}}
{{#if view.failTitle}}
@@ -30,7 +30,7 @@
{{/if}}
<div class="limited-height-2">
{{#each item in view.fails}}
- <i class="icon-remove"></i> <span>{{item.UpgradeChecks.check}}</span>
+ <i class="glyphicon glyphicon-remove"></i> <span>{{item.UpgradeChecks.check}}</span>
<pre>{{t popup.clusterCheck.reason}}{{item.UpgradeChecks.reason}}<br/>{{t popup.clusterCheck.failedOn}}{{item.UpgradeChecks.failed_on}}</pre>
{{/each}}
</div>
@@ -48,7 +48,7 @@
{{/if}}
<div class="limited-height-2">
{{#each item in view.bypass}}
- <i class="icon-remove"></i> <span>{{item.UpgradeChecks.check}}</span>
+ <i class="glyphicon glyphicon-remove"></i> <span>{{item.UpgradeChecks.check}}</span>
<pre>{{t popup.clusterCheck.reason}}{{item.UpgradeChecks.reason}}<br/>{{t popup.clusterCheck.failedOn}}{{item.UpgradeChecks.failed_on}}</pre>
{{/each}}
</div>
@@ -65,7 +65,7 @@
{{/if}}
<div class="limited-height-2">
{{#each item in view.warnings}}
- <i class="icon-warning-sign"></i> <span>{{item.UpgradeChecks.check}}</span>
+ <i class="glyphicon glyphicon-warning-sign"></i> <span>{{item.UpgradeChecks.check}}</span>
<pre>{{t popup.clusterCheck.reason}}{{item.UpgradeChecks.reason}}<br/>{{t popup.clusterCheck.failedOn}}{{item.UpgradeChecks.failed_on}}</pre>
{{/each}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/confirmation_feedback.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/confirmation_feedback.hbs b/ambari-web/app/templates/common/modal_popups/confirmation_feedback.hbs
index d99d2a3..c813bb1 100644
--- a/ambari-web/app/templates/common/modal_popups/confirmation_feedback.hbs
+++ b/ambari-web/app/templates/common/modal_popups/confirmation_feedback.hbs
@@ -20,11 +20,15 @@
</div>
{{#if view.parentView.additionalWarningMsg}}
<br />
- <div class='alert'>
+ <div class='alert alert-warning'>
{{view.parentView.additionalWarningMsg}}
</div>
{{/if}}
{{#if view.parentView.putInMaintenance}}
- <label class="checkbox">{{view Ember.Checkbox checkedBinding="view.parentView.runMmOperation"}} {{view.parentView.turnOnMmMsg}}</label>
+ <div class="checkbox">
+ <label>
+ {{view Ember.Checkbox checkedBinding="view.parentView.runMmOperation"}}
+ {{view.parentView.turnOnMmMsg}}
+ </label>
+ </div>
{{/if}}
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs b/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
index 6a2d93b..fe78c2d 100644
--- a/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
+++ b/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
@@ -29,10 +29,10 @@
<th>{{t common.configGroup}}</th>
<th>{{t common.fileName}}</th>
<th class="row-fliud">
- <div class="span6">
+ <div class="col-md-6">
{{t popup.dependent.configs.table.currentValue}}
</div>
- <div class="span6">
+ <div class="col-md-6">
{{t popup.dependent.configs.table.recommendedValue}}
</div>
</th>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs b/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs
index 0115fe5..3ae2e3e 100644
--- a/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs
@@ -28,7 +28,7 @@
{{/each}}
</table>
{{else}}
- <ul class="unstyled">
+ <ul class="list-unstyled">
{{#each item in view.items}}
<li>{{item}}</li>
{{/each}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs b/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs
index 722e578..87fff79 100644
--- a/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs
@@ -22,24 +22,20 @@
<form class="form-horizontal">
<div class="control-group">
<label class="control-label">{{t popup.invalid.KDC.admin.principal}}</label>
- <div class="controls">
- {{view Ember.TextField valueBinding="view.parentView.principal" class="form-control"}}
- </div>
+ {{view Ember.TextField valueBinding="view.parentView.principal" class="form-control"}}
</div>
<div class="control-group">
<label class="control-label">{{t popup.invalid.KDC.admin.password}}</label>
- <div class="controls">
- {{view Ember.TextField type="password" valueBinding="view.parentView.password" class="form-control"}}
- </div>
+ {{view Ember.TextField type="password" valueBinding="view.parentView.password" class="form-control"}}
</div>
<div class="control-group">
<span class="control-label"></span>
- <div class="controls ">
+ <div>
<label>
{{view Ember.Checkbox checkedBinding="view.parentView.storeCredentials" disabledBinding="view.parentView.checkboxDisabled" classNames="pull-left"}}
<span {{bindAttr class=":mls view.parentView.checkboxDisabled:muted"}}>
{{t admin.kerberos.credentials.store.label}}
- <a class="icon-question-sign icon-blue" rel="tooltip" href="javascript:void(null);" data-toggle="tooltip" {{bindAttr data-original-title="view.parentView.hintMessage"}}></a>
+ <a class="glyphicon-question-sign glyphicon glyphicon-blue" rel="tooltip" href="javascript:void(null);" data-toggle="tooltip" {{bindAttr data-original-title="view.parentView.hintMessage"}}></a>
</span>
</label>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs b/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs
index 65a5f99..4014aac 100644
--- a/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs
@@ -22,15 +22,15 @@
<span class="muted">{{view.content.filePath}}</span>
<div class="pull-right action-bar">
<a href="#" {{action toggleCopy target="view"}}>
- <i class="icon-copy"></i>
+ <i class="glyphicon glyphicon-copy"></i>
{{t common.copy}}
</a>
<a href="#" {{action openInNewTab target="view"}}>
- <i class="icon-external-link"></i>
+ <i class="glyphicon glyphicon-external-link"></i>
{{t common.open}}
</a>
<a class="open-in-log-search" {{bindAttr href="view.logSearchUrl"}} target="_blank">
- <i class="icon-external-link"></i>
+ <i class="glyphicon glyphicon-external-link"></i>
{{t popup.logTail.openInLogSearch}}
</a>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/logs_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/logs_popup.hbs b/ambari-web/app/templates/common/modal_popups/logs_popup.hbs
index 5d2551b..bb62e35 100644
--- a/ambari-web/app/templates/common/modal_popups/logs_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/logs_popup.hbs
@@ -19,9 +19,9 @@
<div id="logs-popup">
<div class="controls-block pull-right">
<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>
</div>
<div class="clearfix"></div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/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 43f71e2..c1ef0e8 100644
--- a/ambari-web/app/templates/common/modal_popups/prompt_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/prompt_popup.hbs
@@ -17,15 +17,17 @@
}}
<div class="prompt-popup">
<form>
- <div {{bindAttr class=":control-group view.parentView.isInvalid:error"}}>
- <label class="control-label">{{view.text}}</label>
+ <div {{bindAttr class=":form-group view.parentView.isInvalid:has-error"}}>
+ {{#if view.text}}
+ <label class="control-label">{{view.text}}</label>
+ {{/if}}
<h4>{{view.title}}</h4>
<p>{{view.description}}</p>
- <div class="controls">
+ <div>
<strong>{{view.label}} </strong>
{{view Em.TextField class="prompt-input" valueBinding="view.parentView.inputValue"}}
{{#if view.parentView.isChanged}}
- <a href="#" data-toggle="tooltip" class="btn-small"
+ <a href="#" data-toggle="tooltip" class="btn-sm"
{{action "doRestoreDefaultValue" this target="view.parentView"}}
{{translateAttr data-original-title="common.reset.default"}}>
<i class="icon-undo"></i>
@@ -33,7 +35,7 @@
{{/if}}
</div>
{{#if view.parentView.isInvalid}}
- <span class="help-inline">{{view.parentView.errorMessage}}</span>
+ <span class="help-block validation-block">{{view.parentView.errorMessage}}</span>
{{/if}}
</div>
</form>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/widget_browser_footer.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/widget_browser_footer.hbs b/ambari-web/app/templates/common/modal_popups/widget_browser_footer.hbs
index 7e4abb4..397369d 100644
--- a/ambari-web/app/templates/common/modal_popups/widget_browser_footer.hbs
+++ b/ambari-web/app/templates/common/modal_popups/widget_browser_footer.hbs
@@ -18,10 +18,13 @@
<div class="modal-footer">
{{#isAuthorized "SERVICE.MODIFY_CONFIGS"}}
- <label id="footer-checkbox">
- {{view Ember.Checkbox classNames="checkbox" checkedBinding="view.parentView.isShowMineOnly"}}
- {{t dashboard.widgets.browser.footer.checkbox}}
- </label>
+ <div class="checkbox pull-left">
+ <label id="footer-checkbox">
+ {{view Ember.Checkbox classNames="checkbox" checkedBinding="view.parentView.isShowMineOnly"}}
+ {{t dashboard.widgets.browser.footer.checkbox}}
+ </label>
+ </div>
+ <div class="clearfix"></div>
{{/isAuthorized}}
<button class="btn btn-success" {{action onPrimary target="view"}}>{{t common.close}}</button>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs b/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs
index 6b452a2..3f76a0a 100644
--- a/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs
@@ -23,7 +23,7 @@
<!--Create new widget button-->
<div class="btn-group pull-right" id="create-widget-button">
<button type="button" class="btn btn-primary" {{action "createWidget" target="view"}} >
- <i class="icon-plus"></i> {{t dashboard.widgets.create}}
+ <i class="glyphicon glyphicon-plus"></i> {{t dashboard.widgets.create}}
</button>
</div>
{{/isAuthorized}}
@@ -41,17 +41,17 @@
{{#if view.isWidgetEmptyList}}
<div class="no-widgets-text">{{t dashboard.widgets.browser.noWidgets}}</div>
{{else}}
- <div class="widgets-info-container row-fluid">
+ <div class="widgets-info-container row">
{{#each widget in view.filteredContent}}
- <div class="span6 row-fluid widget-info-section">
- <div class="icon span4">
+ <div class="col-md-6 row widget-info-section">
+ <div class="icon col-md-4">
<a class="widget-icon-image" target="_blank"><img {{bindAttr src="widget.iconPath"}}></a>
</div>
- <div class="label-description span8">
+ <div class="label-description col-md-8">
<p class="label-text">{{widget.widgetName}}</p>
<p class="is-shared-icon pull-right">
{{#if widget.isShared}}
- <i class="icon-group" rel="shared-icon-tooltip"
+ <i class="glyphicon glyphicon-group" rel="shared-icon-tooltip"
{{translateAttr data-original-title="dashboard.widgets.browser.shareIcon.tooltip"}}></i>
{{/if}}
</p>
@@ -61,7 +61,7 @@
<div class="widget-section-actions btn-group pull-right">
{{#if widget.added}}
<button type="button" class="btn added-btn" {{action "hideWidget" widget target="controller"}} >
- <i class="icon-ok"></i> {{t dashboard.widgets.browser.action.added}}
+ <i class="glyphicon glyphicon-ok"></i> {{t dashboard.widgets.browser.action.added}}
</button>
{{else}}
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/progress.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/progress.hbs b/ambari-web/app/templates/common/progress.hbs
index 1de6d78..90a85a9 100644
--- a/ambari-web/app/templates/common/progress.hbs
+++ b/ambari-web/app/templates/common/progress.hbs
@@ -33,32 +33,32 @@
<i {{bindAttr class="view.icon view.iconColor"}}></i>
<a {{action "showHostProgressPopup" task target="controller"}} >{{task.title}}</a>
</div>
- <div {{bindAttr class="view.showProgressBar::hide :row :span5 :pull-left" }}>
- <div {{bindAttr class=":progress-bar controller.isRollback::span8 controller.isRollback:span3"}}>
- <div class="progress-striped active progress-info progress">
- <div class="bar" {{bindAttr style="view.barWidth"}}></div>
+ <div {{bindAttr class="view.showProgressBar::hide :row :col-md-5 :pull-left" }}>
+ <div {{bindAttr class=":progress-wrapper controller.isRollback::col-md-8 controller.isRollback:col-md-3"}}>
+ <div class="progress">
+ <div class="progress-bar-striped active progress-bar-info progress-bar" {{bindAttr style="view.barWidth"}}></div>
</div>
</div>
- <div {{bindAttr class=":span1 view.hidePercent:noDisplay"}}>{{task.progress}}%</div>
+ <div {{bindAttr class=":col-md-1 view.hidePercent:noDisplay"}}>{{task.progress}}%</div>
</div>
<div>
{{#if task.showRetry}}
<a {{action retryTask target="controller"}} class="btn btn-primary retry"
rel="tooltip"
data-trigger="click" {{bindAttr title="view.showDBTooltip:testDBRetryTooltip"}}>
- <i class="icon-repeat icon-white"></i>
+ <i class="glyphicon glyphicon-repeat glyphicon-white"></i>
{{t common.retry}}
</a>
{{/if}}
{{#if task.showRollback}}
<a {{action rollback target="controller"}} class="btn btn-primary retry">
- <i class="icon-repeat icon-white"></i>
+ <i class="glyphicon glyphicon-repeat glyphicon-white"></i>
{{t common.rollBack}}
</a>
{{/if}}
{{#if task.showSkip}}
<a {{action skipTask target="controller"}} class="btn btn-primary retry">
- <i class="icon-step-forward icon-white"></i>
+ <i class="glyphicon-step-forward glyphicon glyphicon-white"></i>
{{t common.skip}}
</a>
{{/if}}
@@ -71,7 +71,7 @@
{{/if}}
<div class="btn-area">
{{#if view.showBackButton}}
- <button class="btn pull-left" {{bindAttr disabled="controller.isBackButtonDisabled"}} {{action back target="controller"}}>← {{t common.back}}</button>
+ <button class="btn btn-default pull-left" {{bindAttr disabled="controller.isBackButtonDisabled"}} {{action back target="controller"}}>← {{t common.back}}</button>
{{/if}}
<button class="btn btn-success pull-right" {{bindAttr disabled="controller.isSubmitDisabled"}} {{action done target="controller"}}>{{{view.submitButtonText}}}</button>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/rolling_restart_view.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/rolling_restart_view.hbs b/ambari-web/app/templates/common/rolling_restart_view.hbs
index 92dff500..c090ee3 100644
--- a/ambari-web/app/templates/common/rolling_restart_view.hbs
+++ b/ambari-web/app/templates/common/rolling_restart_view.hbs
@@ -36,17 +36,17 @@
<table>
<tr>
<td>{{t common.restart}}</td>
- <td>{{view Ember.TextField valueBinding="view.batchSize" class="span1"}}</td>
- <td>{{view.batchSizeMessage}}</td>
+ <td>{{view Ember.TextField valueBinding="view.batchSize" class="form-control input-sm"}}</td>
+ <td><span>{{view.batchSizeMessage}}</span></td>
</tr>
<tr>
<td>{{t rollingrestart.dialog.msg.timegap.prefix}}</td>
- <td>{{view Ember.TextField valueBinding="view.interBatchWaitTimeSeconds" class="span1"}}</td>
+ <td>{{view Ember.TextField valueBinding="view.interBatchWaitTimeSeconds" class="form-control input-sm"}}</td>
<td>{{t rollingrestart.dialog.msg.timegap.suffix}}</td>
</tr>
<tr>
<td>{{t rollingrestart.dialog.msg.toleration.prefix}}</td>
- <td>{{view Ember.TextField valueBinding="view.tolerateSize" class="span1"}}</td>
+ <td>{{view Ember.TextField valueBinding="view.tolerateSize" class="form-control input-sm"}}</td>
<td>{{t rollingrestart.dialog.msg.toleration.suffix}}</td>
</tr>
<tr>
@@ -71,7 +71,7 @@
{{view App.SpinnerView}}
{{/if}}
{{#if view.errors}}
- <div class="alert alert-error">
+ <div class="alert alert-danger">
<ul>
{{#each error in view.errors}}
<li>{{error}}</li>
@@ -80,7 +80,7 @@
</div>
{{/if}}
{{#if view.warnings}}
- <div class="alert alert-warn">
+ <div class="alert alert-warning">
<ul>
{{#each warning in view.warnings}}
<li>{{warning}}</li>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/selectable_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/selectable_popup.hbs b/ambari-web/app/templates/common/selectable_popup.hbs
index c95e3fa..270461a 100644
--- a/ambari-web/app/templates/common/selectable_popup.hbs
+++ b/ambari-web/app/templates/common/selectable_popup.hbs
@@ -19,13 +19,13 @@
<div>
<div class="task-top-wrap">
<div class="task-detail-ico-wrap">
- <a href="#" {{translateAttr title="common.fullLogPopup.clickToCopy"}} {{action "textTrigger"}} class="task-detail-copy"><i class="icon-copy"></i> {{t common.copy}}</a>
+ <a href="#" {{translateAttr title="common.fullLogPopup.clickToCopy"}} {{action "textTrigger"}} class="task-detail-copy"><i class="glyphicon glyphicon-copy"></i> {{t common.copy}}</a>
</div>
</div>
<div class="task-detail-log-info">
<div class="content-area" >
<div {{bindAttr class="view.textareaVisible::hidden :task-detail-log-clipboard-wrap"}}>
- <textarea class="task-detail-log-clipboard"></textarea>
+ <textarea class="task-detail-log-clipboard form-control"></textarea>
</div>
<div {{bindAttr class="view.textareaVisible:hidden :task-detail-log-maintext"}}>
{{content}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/settings.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/settings.hbs b/ambari-web/app/templates/common/settings.hbs
index 953d5ff..6c2a95c 100644
--- a/ambari-web/app/templates/common/settings.hbs
+++ b/ambari-web/app/templates/common/settings.hbs
@@ -20,10 +20,12 @@
<div class="setting-wrapper">
<h4>{{t app.settings.categories.general}}</h4>
<hr />
- <label>
- {{view Ember.Checkbox checkedBinding="view.isNotShowBgChecked" class="checkbox"}}
- {{t app.settings.notshowBgOperationsPopup}}
- </label>
+ <div class="checkbox">
+ <label>
+ {{view Ember.Checkbox checkedBinding="view.isNotShowBgChecked" class="checkbox"}}
+ {{t app.settings.notshowBgOperationsPopup}}
+ </label>
+ </div>
</div>
<div class="setting-wrapper">
<h4>{{t app.settings.categories.locale}}</h4>
@@ -35,7 +37,7 @@
optionLabelPath="content.label"
optionValuePath="content.value"
selectionBinding="view.parentView.selectedTimezone"
- class="group-select select-group-box"
+ class="group-select select-group-box form-control"
}}
</label>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/time_range.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/time_range.hbs b/ambari-web/app/templates/common/time_range.hbs
index d925caf..d1885bc 100644
--- a/ambari-web/app/templates/common/time_range.hbs
+++ b/ambari-web/app/templates/common/time_range.hbs
@@ -17,7 +17,7 @@
}}
<div class="span title">
- {{t common.timeRange}} <i class="icon-question-sign"></i>
+ {{t common.timeRange}} <i class="glyphicon glyphicon-question-sign"></i>
</div>
<ul class="display-inline-block nav nav-pills">
{{#each preset in view.presets}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/widget/gauge_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/widget/gauge_widget.hbs b/ambari-web/app/templates/common/widget/gauge_widget.hbs
index 16a03ee..83d4a49 100644
--- a/ambari-web/app/templates/common/widget/gauge_widget.hbs
+++ b/ambari-web/app/templates/common/widget/gauge_widget.hbs
@@ -16,19 +16,19 @@
* limitations under the License.
}}
-<div class="gauge-widget thumbnail">
+<div class="gauge-widget img-thumbnail">
{{#if view.isLoaded}}
- <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
- <i class="icon-remove-sign icon-large"></i>
+ <a {{bindAttr class=":corner-icon :col-md-1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
+ <i class="glyphicon-remove-sign glyphicon glyphicon-large"></i>
</a>
- <div class="caption title span11">{{view.content.widgetName}}</div>
+ <div class="caption title col-md-11">{{view.content.widgetName}}</div>
<div class="widget-icons">
{{#if controller.isAmbariMetricsInstalled}}
<a class="corner-icon pull-right" href="#" {{action editWidget target="view"}}>
- <i class="icon-edit"></i>
+ <i class="glyphicon glyphicon-edit"></i>
</a>
<a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}>
- <i class="icon-copy"></i>
+ <i class="glyphicon glyphicon-copy"></i>
</a>
{{/if}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/widget/graph_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/widget/graph_widget.hbs b/ambari-web/app/templates/common/widget/graph_widget.hbs
index e92678a..9784a83 100644
--- a/ambari-web/app/templates/common/widget/graph_widget.hbs
+++ b/ambari-web/app/templates/common/widget/graph_widget.hbs
@@ -16,22 +16,22 @@
* limitations under the License.
}}
-<div class="graph-widget thumbnail">
+<div class="graph-widget img-thumbnail">
{{#if view.isLoaded}}
- <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
- <i class="icon-remove-sign icon-large"></i>
+ <a {{bindAttr class=":corner-icon :col-md-1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
+ <i class="glyphicon-remove-sign glyphicon glyphicon-large"></i>
</a>
- <div class="caption title span11">{{view.content.widgetName}}</div>
+ <div class="caption title col-md-11">{{view.content.widgetName}}</div>
<div class="widget-icons">
<a {{bindAttr class="view.isExportButtonHidden:hidden :corner-icon :pull-right"}} href="#" {{action toggleFormatsList target="view"}}>
- <i class="icon-save"></i>
+ <i class="glyphicon glyphicon-save"></i>
</a>
{{#if controller.isAmbariMetricsInstalled}}
<a class="corner-icon pull-right" href="#" {{action editWidget target="view"}}>
- <i class="icon-edit"></i>
+ <i class="glyphicon glyphicon-edit"></i>
</a>
<a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}>
- <i class="icon-copy"></i>
+ <i class="glyphicon glyphicon-copy"></i>
</a>
{{/if}}
{{view view.exportMetricsMenuView}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/widget/heatmap_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/widget/heatmap_widget.hbs b/ambari-web/app/templates/common/widget/heatmap_widget.hbs
index 17e7ee9..02b30c7 100644
--- a/ambari-web/app/templates/common/widget/heatmap_widget.hbs
+++ b/ambari-web/app/templates/common/widget/heatmap_widget.hbs
@@ -17,17 +17,17 @@
}}
<div class="heatmap-widget">
- <div class="span10 heatmap-content">
+ <div class="heatmap-content">
<h4 id="heatmap-metric-loading">
<span class="background-text" id="heatmap-metric-title">
{{view.content.widgetName}}
{{#unless view.isLoaded}}
- <i class='icon-spinner icon-spin icon-small'></i>
+ {{view App.SpinnerView}}
{{/unless}}
</span>
</h4>
- <div class="row-fluid">
+ <div class="row">
{{#each rack in view.racks}}
<div {{bindAttr class="controller.rackClass"}}>
{{view App.MainChartsHeatmapRackView rackBinding="rack" }}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/widget/number_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/widget/number_widget.hbs b/ambari-web/app/templates/common/widget/number_widget.hbs
index 8932a7d..42d6aa0 100644
--- a/ambari-web/app/templates/common/widget/number_widget.hbs
+++ b/ambari-web/app/templates/common/widget/number_widget.hbs
@@ -16,19 +16,19 @@
* limitations under the License.
}}
-<div class="number-widget thumbnail">
+<div class="number-widget img-thumbnail">
{{#if view.isLoaded}}
- <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
- <i class="icon-remove-sign icon-large"></i>
+ <a {{bindAttr class=":corner-icon :col-md-1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
+ <i class="glyphicon-remove-sign glyphicon glyphicon-large"></i>
</a>
- <div class="caption title span11">{{view.content.widgetName}}</div>
+ <div class="caption title col-md-11">{{view.content.widgetName}}</div>
<div class="widget-icons">
{{#if controller.isAmbariMetricsInstalled}}
<a class="corner-icon pull-right" href="#" {{action editWidget target="view"}}>
- <i class="icon-edit"></i>
+ <i class="glyphicon glyphicon-edit"></i>
</a>
<a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}>
- <i class="icon-copy"></i>
+ <i class="glyphicon glyphicon-copy"></i>
</a>
{{/if}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/widget/template_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/widget/template_widget.hbs b/ambari-web/app/templates/common/widget/template_widget.hbs
index 7b174de..aeebdcf 100644
--- a/ambari-web/app/templates/common/widget/template_widget.hbs
+++ b/ambari-web/app/templates/common/widget/template_widget.hbs
@@ -16,19 +16,19 @@
* limitations under the License.
}}
-<div class="template-widget thumbnail">
+<div class="template-widget img-thumbnail">
{{#if view.isLoaded}}
- <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
- <i class="icon-remove-sign icon-large"></i>
+ <a {{bindAttr class=":corner-icon :col-md-1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
+ <i class="glyphicon-remove-sign glyphicon glyphicon-large"></i>
</a>
- <div class="caption title span11">{{view.content.widgetName}}</div>
+ <div class="caption title col-md-11">{{view.content.widgetName}}</div>
<div class="widget-icons">
{{#if controller.isAmbariMetricsInstalled}}
<a class="corner-icon pull-right" href="#" {{action editWidget target="view"}}>
- <i class="icon-edit"></i>
+ <i class="glyphicon glyphicon-edit"></i>
</a>
<a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}>
- <i class="icon-copy"></i>
+ <i class="glyphicon glyphicon-copy"></i>
</a>
{{/if}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/experimental.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/experimental.hbs b/ambari-web/app/templates/experimental.hbs
index 5fec5ca..862fa16 100644
--- a/ambari-web/app/templates/experimental.hbs
+++ b/ambari-web/app/templates/experimental.hbs
@@ -16,7 +16,7 @@
* limitations under the License.
}}
-<div class="alert alert-error">
+<div class="alert alert-danger">
<h2>Ambari's Experimental Functionality</h2>
<p>
<span class="label label-important">Important</span> <strong>Changes made here are neither tested nor supported by Ambari</strong>
@@ -49,15 +49,15 @@
</tbody>
</table>
<div class="control-group" style="margin-bottom: 70px;">
- <div class="controls pull-right">
- <button class="btn" {{action doCancel target="controller"}}>{{t form.cancel}}</button>
+ <div class="pull-right">
+ <button class="btn btn-default" {{action doCancel target="controller"}}>{{t form.cancel}}</button>
<button class="btn btn-primary" {{action doSave target="controller"}}>{{t common.save}}</button>
</div>
</div>
<hr>
<div class="control-group" style="margin-bottom: 100px;">
{{#isAuthorized "CLUSTER.MANAGE_USER_PERSISTED_DATA"}}
- <div class="controls pull-left" style="margin-bottom: 100px;">
+ <div class="pull-left" style="margin-bottom: 100px;">
<button class="btn btn-danger" {{action doResetUIStates target="controller"}}>{{t reset.ui.states}}</button>
<p class="pull-right" style="margin-left: 10px; padding-top: 5px;">
Reset UI state locally and on the server
@@ -66,12 +66,12 @@
{{/isAuthorized}}
</div>
{{else}}
- <div class="alert alert-error">
+ <div class="alert alert-danger">
No application supports found. Please login to Ambari and revisit this page.
</div>
{{/if}}
{{else}}
- <div class="alert alert-error">
+ <div class="alert alert-danger">
No application found. Please login to Ambari and revisit this page.
</div>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/installer.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/installer.hbs b/ambari-web/app/templates/installer.hbs
index 56ec202..4089fb1 100644
--- a/ambari-web/app/templates/installer.hbs
+++ b/ambari-web/app/templates/installer.hbs
@@ -23,9 +23,9 @@
{{else}}
<div class="wizard">
<div class="container">
- <div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-3">
<!--Sidebar content-->
<div class="well">
<ul class="nav nav-pills nav-stacked">
@@ -44,7 +44,7 @@
</ul>
</div>
</div>
- <div class="wizard-content well span9">
+ <div class="wizard-content well col-md-9">
{{outlet}}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/login.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/login.hbs b/ambari-web/app/templates/login.hbs
index ceb56c0..b3037ea 100644
--- a/ambari-web/app/templates/login.hbs
+++ b/ambari-web/app/templates/login.hbs
@@ -17,17 +17,23 @@
}}
{{#unless isServerClientVersionMismatch}}
-<div class="well login span4">
+<div class="well login col-md-4">
<h2>{{t login.header}}</h2>
{{#if errorMessage}}
- <div class="alert alert-error">
+ <div class="alert alert-danger">
{{errorMessage}}
</div>
{{/if}}
- <label>{{t login.username}}</label>
- {{view view.loginTextField valueBinding="loginName" class="span4" disabledBinding="isSubmitDisabled"}}
- <label>{{t common.password}}</label>
- {{view view.passTextField type="password" valueBinding="password" class="span4" disabledBinding="isSubmitDisabled"}}
+ <form>
+ <div class="form-group">
+ <label>{{t login.username}}</label>
+ {{view view.loginTextField valueBinding="loginName" class="form-control" disabledBinding="isSubmitDisabled"}}
+ </div>
+ <div class="form-group">
+ <label>{{t common.password}}</label>
+ {{view view.passTextField type="password" valueBinding="password" class="form-control" disabledBinding="isSubmitDisabled"}}
+ </div>
<button class="btn btn-success login-btn" {{bindAttr disabled="isSubmitDisabled"}} {{action "submit" target="controller"}}>{{t login.loginButton}}</button>
+ </form>
</div>
-{{/unless}}
\ No newline at end of file
+{{/unless}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main.hbs b/ambari-web/app/templates/main.hbs
index fd2ac55..b54b7b6 100644
--- a/ambari-web/app/templates/main.hbs
+++ b/ambari-web/app/templates/main.hbs
@@ -23,8 +23,8 @@
{{else}}
{{#unless isClusterDataLoaded}}
<h2>{{t app.loadingPlaceholder}} </h2>
- <div class="progress progress-striped active">
- <div class="bar" {{bindAttr style="controller.clusterDataLoadedPercent"}}></div>
+ <div class="progress">
+ <div class="progress-bar progress-bar-striped active" {{bindAttr style="controller.clusterDataLoadedPercent"}}></div>
</div>
{{/unless}}
{{#if isClusterDataLoaded}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin.hbs b/ambari-web/app/templates/main/admin.hbs
index 3e456e9..17cf426 100644
--- a/ambari-web/app/templates/main/admin.hbs
+++ b/ambari-web/app/templates/main/admin.hbs
@@ -16,8 +16,8 @@
* limitations under the License.
}}
-<div class="row-fluid">
- <div id="main-admin-menu" class="well span2">
+<div class="row">
+ <div id="main-admin-menu" class="well col-md-2">
<ul class="nav nav-list">
{{#each category in view.categories}}
{{#view view.NavItemView itemBinding="category.name" elementIdBinding="category.name"}}
@@ -26,8 +26,8 @@
{{/each}}
</ul>
</div>
- <div class="span10">
- <div class="row-fluid">
+ <div class="col-md-10">
+ <div class="row col-md-12">
{{outlet}}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/hawq/activateStandby/step2.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/hawq/activateStandby/step2.hbs b/ambari-web/app/templates/main/admin/highAvailability/hawq/activateStandby/step2.hbs
index 02083f4..984df84 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/hawq/activateStandby/step2.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/hawq/activateStandby/step2.hbs
@@ -27,12 +27,12 @@
<tr>
<td>{{t admin.activateHawqStandby.wizard.step2.hawqMaster}}</td>
<td>{{controller.content.hawqHosts.hawqMaster}}</td>
- <td><span class="to-be-disabled-red"><i class="icon-minus"></i> {{t admin.highAvailability.wizard.step3.toBeDeleted}}</span></td>
+ <td><span class="to-be-disabled-red"><i class="glyphicon glyphicon-minus"></i> {{t admin.highAvailability.wizard.step3.toBeDeleted}}</span></td>
</tr>
<tr>
<td>{{t admin.activateHawqStandby.wizard.step2.hawqStandby}}</td>
<td>{{controller.content.hawqHosts.hawqStandby}}</td>
- <td><span class="to-be-installed-green"><i class="icon-arrow-up"></i> {{t admin.activateHawqStandby.wizard.step2.toBeActivated}}</span></td>
+ <td><span class="to-be-installed-green"><i class="glyphicon glyphicon-arrow-up"></i> {{t admin.activateHawqStandby.wizard.step2.toBeActivated}}</span></td>
</tr>
</table>
</div>
@@ -48,6 +48,6 @@
{{/if}}
<div class="btn-area">
- <a class="btn" {{action back}}>← {{t common.back}}</a>
+ <a class="btn btn-default" {{action back}}>← {{t common.back}}</a>
<a class="btn btn-success pull-right" {{action submit target="controller"}} {{bindAttr disabled="controller.isSubmitDisabled"}}>{{t common.next}} →</a>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/hawq/activateStandby/wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/hawq/activateStandby/wizard.hbs b/ambari-web/app/templates/main/admin/highAvailability/hawq/activateStandby/wizard.hbs
index 3518122..0ff7d5d 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/hawq/activateStandby/wizard.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/hawq/activateStandby/wizard.hbs
@@ -18,9 +18,8 @@
<div id="hawq-ha-wizard" class="wizard">
<div class="container">
- <div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<!--Sidebar content-->
<div class="well">
<ul class="nav nav-pills nav-stacked">
@@ -31,7 +30,7 @@
</ul>
</div>
</div>
- <div class="wizard-content well span9">
+ <div class="wizard-content well col-md-9">
{{#if view.isLoaded}}
{{outlet}}
{{else}}
@@ -39,6 +38,5 @@
{{/if}}
</div>
</div>
- </div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/hawq/addStandby/step3.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/hawq/addStandby/step3.hbs b/ambari-web/app/templates/main/admin/highAvailability/hawq/addStandby/step3.hbs
index ac1fabf..02ed51b 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/hawq/addStandby/step3.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/hawq/addStandby/step3.hbs
@@ -36,7 +36,7 @@
<b>{{t admin.addHawqStandby.wizard.step3.newHawqStandby}}</b>:
</td>
<td>{{controller.content.hawqHosts.newHawqStandby}}</td>
- <td><span class="to-be-installed-green"><i class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></td>
+ <td><span class="to-be-installed-green"><i class="glyphicon glyphicon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></td>
</tr>
</table>
</div>
@@ -53,6 +53,6 @@
{{/if}}
<div class="btn-area">
- <a class="btn" {{action back}}>← {{t common.back}}</a>
+ <a class="btn btn-default" {{action back}}>← {{t common.back}}</a>
<a class="btn btn-success pull-right" {{action submit target="controller"}} {{bindAttr disabled="controller.isSubmitDisabled"}}>{{t common.next}} →</a>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/hawq/addStandby/wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/hawq/addStandby/wizard.hbs b/ambari-web/app/templates/main/admin/highAvailability/hawq/addStandby/wizard.hbs
index a859d37..8996604 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/hawq/addStandby/wizard.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/hawq/addStandby/wizard.hbs
@@ -18,9 +18,8 @@
<div id="hawq-ha-wizard" class="wizard">
<div class="container">
- <div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<!--Sidebar content-->
<div class="well">
<ul class="nav nav-pills nav-stacked">
@@ -32,7 +31,7 @@
</ul>
</div>
</div>
- <div class="wizard-content well span9">
+ <div class="wizard-content well col-md-9">
{{#if view.isLoaded}}
{{outlet}}
{{else}}
@@ -40,6 +39,5 @@
{{/if}}
</div>
</div>
- </div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/hawq/removeStandby/step2.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/hawq/removeStandby/step2.hbs b/ambari-web/app/templates/main/admin/highAvailability/hawq/removeStandby/step2.hbs
index b795887..014c25a 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/hawq/removeStandby/step2.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/hawq/removeStandby/step2.hbs
@@ -27,7 +27,7 @@
<tr>
<td>{{t admin.removeHawqStandby.wizard.step2.hawqStandby}}</td>
<td>{{controller.content.hawqHosts.hawqStandby}}</td>
- <td><span class="to-be-disabled-red"><i class="icon-minus"></i> {{t admin.highAvailability.wizard.step3.toBeDeleted}}</span></td>
+ <td><span class="to-be-disabled-red"><i class="glyphicon glyphicon-minus"></i> {{t admin.highAvailability.wizard.step3.toBeDeleted}}</span></td>
</tr>
</table>
</div>
@@ -38,6 +38,6 @@
</div>
<div class="btn-area">
- <a class="btn" {{action back}}>← {{t common.back}}</a>
+ <a class="btn btn-default" {{action back}}>← {{t common.back}}</a>
<a class="btn btn-success pull-right" {{action submit target="controller"}} {{bindAttr disabled="controller.isSubmitDisabled"}}>{{t common.next}} →</a>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/hawq/removeStandby/wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/hawq/removeStandby/wizard.hbs b/ambari-web/app/templates/main/admin/highAvailability/hawq/removeStandby/wizard.hbs
index 18c589a..1c89d6c 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/hawq/removeStandby/wizard.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/hawq/removeStandby/wizard.hbs
@@ -18,9 +18,8 @@
<div id="hawq-ha-wizard" class="wizard">
<div class="container">
- <div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<!--Sidebar content-->
<div class="well">
<ul class="nav nav-pills nav-stacked">
@@ -31,7 +30,7 @@
</ul>
</div>
</div>
- <div class="wizard-content well span9">
+ <div class="wizard-content well col-md-9">
{{#if view.isLoaded}}
{{outlet}}
{{else}}
@@ -39,6 +38,5 @@
{{/if}}
</div>
</div>
- </div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/nameNode/rollbackHA/rollback_wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/nameNode/rollbackHA/rollback_wizard.hbs b/ambari-web/app/templates/main/admin/highAvailability/nameNode/rollbackHA/rollback_wizard.hbs
index 1f10cc7..edde4f1 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/rollbackHA/rollback_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/rollbackHA/rollback_wizard.hbs
@@ -18,9 +18,9 @@
<div class="wizard">
<div class="container">
- <div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-3">
<!--Sidebar content-->
<div class="well">
<ul class="nav nav-pills nav-stacked">
@@ -31,7 +31,7 @@
</ul>
</div>
</div>
- <div class="wizard-content well span9">
+ <div class="wizard-content well col-md-9">
{{outlet}}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/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 0b46b12..d2c1be1 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs
@@ -20,7 +20,7 @@
<div class="alert alert-info">
{{t admin.highAvailability.wizard.step1.body}}
- <div class="alert alert-warn">
+ <div class="alert alert-warning">
{{t admin.highAvailability.wizard.step1.alert}}
{{#if controller.isHawqInstalled}}
{{{t admin.highAvailability.wizard.step1.hawq.alert}}}
@@ -28,12 +28,12 @@
</div>
</div>
- <div {{bindAttr class=":control-group view.showInputError:error :form-horizontal :nameserviceid-input"}}>
+ <div {{bindAttr class=":form-group view.showInputError:error view.showInputError:has-error :form-horizontal :nameserviceid-input"}}>
<label class="control-label">{{t admin.highAvailability.wizard.step1.nameserviceid}}:</label>
- <div class="controls">
- {{view Ember.TextField valueBinding="content.nameServiceId"}}
- <span {{bindAttr class=":help-inline view.showInputError::hidden"}}>
+ <div>
+ {{view Ember.TextField valueBinding="content.nameServiceId" classNames="input-sm"}}
+ <span {{bindAttr class=":help-block :validation-block :col-sm-9 :pull-right view.showInputError::hidden"}}>
{{t admin.highAvailability.wizard.step1.nameserviceid.error}}
</span>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs
index ef2621d..0536898 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs
@@ -34,28 +34,28 @@
<tr>
<td>{{t admin.highAvailability.wizard.step3.secNameNode}}</td>
<td>{{view.secondaryNameNode}}</td>
- <td><span class="to-be-disabled-red"><i class="icon-minus"></i> {{t admin.highAvailability.wizard.step3.toBeDeleted}}</span></td>
+ <td><span class="to-be-disabled-red"><i class="glyphicon glyphicon-minus"></i> {{t admin.highAvailability.wizard.step3.toBeDeleted}}</span></td>
</tr>
<tr>
<td>{{t admin.highAvailability.wizard.step3.addNameNode}}</td>
<td>{{view.addNameNode}}</td>
- <td><span class="to-be-installed-green"><i class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></td>
+ <td><span class="to-be-installed-green"><i class="glyphicon glyphicon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></td>
</tr>
<tr>
<td>{{t admin.highAvailability.wizard.step3.journalNode}}</td>
<td>
- <ul>
+ <ul class="list-unstyled">
{{#each item in view.journalNodes}}
<li>{{item.hostName}}</li>
{{/each}}
</ul>
</td>
<td>
- <ul>
- {{#each item in view.journalNodes}}
- <li><span class="to-be-installed-green"><i
- class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></li>
- {{/each}}
+ <ul class="list-unstyled">
+ {{#each item in view.journalNodes}}
+ <li><span class="to-be-installed-green"><i
+ class="glyphicon glyphicon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></li>
+ {{/each}}
</ul>
</td>
</tr>
@@ -74,7 +74,7 @@
</div>
<div class="btn-area">
- <a class="btn" {{action back}}>← {{t common.back}}</a>
+ <a class="btn btn-default" {{action back}}>← {{t common.back}}</a>
<a class="btn btn-success pull-right" {{bindAttr disabled="controller.isNextDisabled"}} {{action next}}>{{t common.next}} →</a>
{{#if App.router.nextBtnClickInProgress}}
{{view App.SpinnerView tagName="span" classNames="pull-right"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/nameNode/step4.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step4.hbs b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step4.hbs
index 43b7058..b864a39 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step4.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step4.hbs
@@ -18,7 +18,7 @@
<div id="ha-step4">
<h2>{{t admin.highAvailability.wizard.step4.bodyHeader}}</h2>
{{#unless controller.isNameNodeStarted}}
- <div class="alert alert-error">
+ <div class="alert alert-danger">
{{t admin.highAvailability.wizard.step4.error.nameNode}}
</div>
{{/unless}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/nameNode/wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/nameNode/wizard.hbs b/ambari-web/app/templates/main/admin/highAvailability/nameNode/wizard.hbs
index ea6b99f..991691d 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/wizard.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/wizard.hbs
@@ -18,9 +18,8 @@
<div class="wizard">
<div class="container">
- <div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<!--Sidebar content-->
<div class="well">
<ul class="nav nav-pills nav-stacked">
@@ -37,10 +36,9 @@
</ul>
</div>
</div>
- <div class="wizard-content well span9">
+ <div class="wizard-content well col-md-9">
{{outlet}}
</div>
</div>
- </div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/step1.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/step1.hbs b/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/step1.hbs
index b92d1c6..ac248d0 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/step1.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/step1.hbs
@@ -23,13 +23,15 @@ right ownership. The ASF licenses this file
{{t admin.ra_highAvailability.wizard.step1.body}}
</div>
<form class="form-horizontal">
- <div {{bindAttr class=":control-group showloadBalancerURLError:error"}}>
+ <div {{bindAttr class=":form-group showloadBalancerURLError:error showloadBalancerURLError:has-error :col-md-12"}}>
<label class="control-label">{{t admin.ra_highAvailability.wizard.step1.load_balancer_url}}:</label>
- <div class="controls">
- {{view Em.TextField valueBinding="content.loadBalancerURL"}}
+ <div class="row">
+ <div class="col-md-3">
+ {{view Em.TextField valueBinding="content.loadBalancerURL" classNames="input-sm form-control"}}
+ </div>
{{#if showloadBalancerURLError}}
- <span class="help-inline">{{t admin.ra_highAvailability.wizard.step1.invalid_url}}</span>
+ <span class="help-block validation-block col-sm-9 help-inline">{{t admin.ra_highAvailability.wizard.step1.invalid_url}}</span>
{{/if}}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/step3.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/step3.hbs b/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/step3.hbs
index 32ea830..c229662 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/step3.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/step3.hbs
@@ -37,7 +37,7 @@
<b>{{t admin.ra_highAvailability.wizard.step3.additionalRA}}</b>:
</td>
<td>{{host}}</td>
- <td><span class="to-be-installed-green"><i class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></td>
+ <td><span class="to-be-installed-green"><i class="glyphicon glyphicon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></td>
</tr>
{{/each}}
</table>
@@ -47,6 +47,6 @@
{{{t admin.rm_highAvailability.wizard.step3.configs_changes}}}
</div>
<div class="btn-area">
- <a class="btn" {{action back}}>← {{t common.back}}</a>
+ <a class="btn btn-default" {{action back}}>← {{t common.back}}</a>
<a class="btn btn-success pull-right" {{action next}}>{{t common.next}} →</a>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/wizard.hbs b/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/wizard.hbs
index 228cb89..2e4824d 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/wizard.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/rangerAdmin/wizard.hbs
@@ -18,9 +18,8 @@
<div id="ra-ha-wizard" class="wizard">
<div class="container">
- <div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<!--Sidebar content-->
<div class="well">
<ul class="nav nav-pills nav-stacked">
@@ -32,10 +31,9 @@
</ul>
</div>
</div>
- <div class="wizard-content well span9">
+ <div class="wizard-content well col-md-9">
{{outlet}}
</div>
</div>
- </div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step3.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step3.hbs b/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step3.hbs
index 302e003..de5ed63 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step3.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step3.hbs
@@ -36,7 +36,7 @@
<b>{{t admin.rm_highAvailability.wizard.step3.additionalRM}}</b>:
</td>
<td>{{controller.content.rmHosts.additionalRM}}</td>
- <td><span class="to-be-installed-green"><i class="icon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></td>
+ <td><span class="to-be-installed-green"><i class="glyphicon glyphicon-plus"></i> {{t admin.highAvailability.wizard.step3.toBeInstalled}}</span></td>
</tr>
</table>
</div>
@@ -54,6 +54,6 @@
{{/if}}
<div class="btn-area">
- <a class="btn" {{action back}}>← {{t common.back}}</a>
+ <a class="btn btn-default" {{action back}}>← {{t common.back}}</a>
<a class="btn btn-success pull-right" {{action submit target="controller"}} {{bindAttr disabled="controller.isSubmitDisabled"}}>{{t common.next}} →</a>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/highAvailability/resourceManager/wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/resourceManager/wizard.hbs b/ambari-web/app/templates/main/admin/highAvailability/resourceManager/wizard.hbs
index a524282..33168c5 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/resourceManager/wizard.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/resourceManager/wizard.hbs
@@ -18,9 +18,8 @@
<div id="rm-ha-wizard" class="wizard">
<div class="container">
- <div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<!--Sidebar content-->
<div class="well">
<ul class="nav nav-pills nav-stacked">
@@ -32,7 +31,7 @@
</ul>
</div>
</div>
- <div class="wizard-content well span9">
+ <div class="wizard-content well col-md-9">
{{#if view.isLoaded}}
{{outlet}}
{{else}}
@@ -40,6 +39,5 @@
{{/if}}
</div>
</div>
- </div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/kerberos.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs b/ambari-web/app/templates/main/admin/kerberos.hbs
index 1e3be1a..5e2f27b 100644
--- a/ambari-web/app/templates/main/admin/kerberos.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos.hbs
@@ -23,7 +23,7 @@
<button class="btn btn-padding btn-warning admin-disable-security-btn" {{bindAttr disabled="isKerberosButtonsDisabled"}} {{action notifySecurityOffPopup target="controller"}}>{{t admin.kerberos.button.disable}} </button>
{{#unless isManualKerberos}}
<button class="btn btn-success" id="regenerate-keytabs" {{bindAttr disabled="isKerberosButtonsDisabled"}} {{action regenerateKeytabs target="controller"}}>
- <i class="icon-repeat"></i> {{t admin.kerberos.button.regenerateKeytabs}}</button>
+ <i class="glyphicon glyphicon-repeat"></i> {{t admin.kerberos.button.regenerateKeytabs}}</button>
{{#if App.isCredentialStorePersistent}}
<button class="btn btn-primary" {{action showManageKDCCredentialsPopup target="controller"}}>{{t admin.kerberos.credentials.store.menu.label}}</button>
{{/if}}
@@ -44,7 +44,7 @@
{{#if isEditMode}}
<div class="btn-area pull-right">
<button id="cancel-kerberos-reconfigure-identities" {{action makeConfigsUneditable target="controller"}}
- class="btn">{{t common.cancel}}</button>
+ class="btn btn-default">{{t common.cancel}}</button>
<button id="save-kerberos-reconfigure-identities"
class="btn btn-success" {{bindAttr disabled="isSaveButtonDisabled"}}
{{action submit target="controller"}}>{{t common.save}}</button>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/kerberos/disable.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/kerberos/disable.hbs b/ambari-web/app/templates/main/admin/kerberos/disable.hbs
index e464348..843e3b9 100644
--- a/ambari-web/app/templates/main/admin/kerberos/disable.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/disable.hbs
@@ -17,7 +17,7 @@
}}
<div class="wizard">
- <div class="row-fluid">
+ <div class="row col-sm-12">
{{template "templates/common/progress"}}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/kerberos/notify_security_off_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/kerberos/notify_security_off_popup.hbs b/ambari-web/app/templates/main/admin/kerberos/notify_security_off_popup.hbs
index a68102a..0fc2174 100644
--- a/ambari-web/app/templates/main/admin/kerberos/notify_security_off_popup.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/notify_security_off_popup.hbs
@@ -16,6 +16,6 @@
* limitations under the License.
}}
-<div class="alert">
+<div class="alert alert-warning">
{{t admin.security.disable.popup.body}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/kerberos/step1.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/kerberos/step1.hbs b/ambari-web/app/templates/main/admin/kerberos/step1.hbs
index 5051d43..1fe70be 100644
--- a/ambari-web/app/templates/main/admin/kerberos/step1.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/step1.hbs
@@ -23,16 +23,18 @@
{{t admin.kerberos.wizard.step1.info.body}}
</p>
- <div class="alert">
+ <div class="alert alert-warning">
{{t admin.kerberos.wizard.step1.alert.body}}
</div>
<div id="kerberos-step1-options-body">
{{t admin.kerberos.wizard.step1.body.text}}
{{#each option in options}}
- <label class="checkbox kerberos-step1-option-radiobutton">
- {{view Ember.RadioButton name="option.displayName" selectionBinding="selectedItem" valueBinding="option.value"}} {{option.displayName}}
- </label>
+ <div class="checkbox">
+ <label class="kerberos-step1-option-radiobutton">
+ {{view Ember.RadioButton name="option.displayName" selectionBinding="selectedItem" valueBinding="option.value"}} {{option.displayName}}
+ </label>
+ </div>
{{/each}}
<br/>
</div>
@@ -40,7 +42,9 @@
<h5>{{selectedOption.displayName}}:</h5>
<b>{{t admin.kerberos.wizard.step1.prerequisites.label}}</b> <br/> <br/>
{{#each condition in selectedOption.preConditions}}
- <label class="checkbox kerberos-step1-prerequiste-checkboxes"> {{view Ember.Checkbox checkedBinding="condition.checked"}} {{condition.displayText}} </label>
+ <div class="checkbox">
+ <label class="kerberos-step1-prerequiste-checkboxes"> {{view Ember.Checkbox checkedBinding="condition.checked"}} {{condition.displayText}} </label>
+ </div>
{{/each}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/kerberos/step2.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/kerberos/step2.hbs b/ambari-web/app/templates/main/admin/kerberos/step2.hbs
index 000593e..47632a8 100644
--- a/ambari-web/app/templates/main/admin/kerberos/step2.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/step2.hbs
@@ -30,7 +30,7 @@
{{/if}}
<div class="btn-area">
- <a id="back-kerberos-step2" class="btn" {{bindAttr disabled="isBackBtnDisabled"}} {{action back}}>← {{t common.back}}</a>
+ <a id="back-kerberos-step2" class="btn btn-default" {{bindAttr disabled="isBackBtnDisabled"}} {{action back}}>← {{t common.back}}</a>
<a id="submit-kerberos-step2" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}}
{{action submit target="controller"}}>{{t common.next}} →</a>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/kerberos/step3.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/kerberos/step3.hbs b/ambari-web/app/templates/main/admin/kerberos/step3.hbs
index c9e0446..4fd35a0 100644
--- a/ambari-web/app/templates/main/admin/kerberos/step3.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/step3.hbs
@@ -35,33 +35,33 @@
<i {{bindAttr class="view.icon view.iconColor"}}></i>
<a {{action "showHostProgressPopup" task target="controller"}} >{{task.title}}</a>
</div>
- <div {{bindAttr class="view.showProgressBar::hide :row :span5 :pull-left" }}>
- <div {{bindAttr class=":progress-bar controller.isRollback::span8 controller.isRollback:span3"}}>
- <div class="progress-striped active progress-info progress">
- <div class="bar" {{bindAttr style="view.barWidth"}}></div>
+ <div {{bindAttr class="view.showProgressBar::hide :row :col-md-5 :pull-left" }}>
+ <div {{bindAttr class=":progress-wrapper controller.isRollback::col-md-8 controller.isRollback:col-md-3"}}>
+ <div class="progress">
+ <div class="progress-bar-striped active progress-bar-info progress-bar" {{bindAttr style="view.barWidth"}}></div>
</div>
</div>
- <div {{bindAttr class=":span1 view.hidePercent:noDisplay"}}>{{task.progress}}%</div>
+ <div {{bindAttr class=":col-md-1 view.hidePercent:noDisplay"}}>{{task.progress}}%</div>
</div>
<div>
{{#if task.showRetry}}
<a {{action retryTask target="controller"}} class="btn btn-primary retry"
rel="tooltip"
data-trigger="click" {{bindAttr title="view.showDBTooltip:testDBRetryTooltip"}}>
- <i class="icon-repeat icon-white"></i>
+ <i class="glyphicon glyphicon-repeat glyphicon-white"></i>
{{t common.retry}}
</a>
{{/if}}
{{#if task.showRollback}}
<a {{action rollback target="controller"}} class="btn btn-primary retry">
- <i class="icon-repeat icon-white"></i>
+ <i class="glyphicon glyphicon-repeat glyphicon-white"></i>
{{t common.rollBack}}
</a>
{{/if}}
{{#if task.showSkip}}
<a {{action skipTask target="controller"}} class="btn btn-primary retry">
- <i class="icon-step-forward icon-white"></i>
+ <i class="glyphicon-step-forward glyphicon glyphicon-white"></i>
{{t common.skip}}
</a>
{{/if}}
@@ -87,7 +87,7 @@
{{/if}}
<div class="btn-area">
{{#if view.showBackButton}}
- <button class="btn pull-left" {{bindAttr disabled="controller.isBackButtonDisabled"}} {{action back target="controller"}}>← {{t common.back}}</button>
+ <button class="btn btn-default pull-left" {{bindAttr disabled="controller.isBackButtonDisabled"}} {{action back target="controller"}}>← {{t common.back}}</button>
{{/if}}
<button class="btn btn-success pull-right" {{bindAttr disabled="controller.isSubmitDisabled"}} {{action done target="controller"}}>{{{view.submitButtonText}}}</button>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/kerberos/step4.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/kerberos/step4.hbs b/ambari-web/app/templates/main/admin/kerberos/step4.hbs
index 6d71c0c..1c5d281 100644
--- a/ambari-web/app/templates/main/admin/kerberos/step4.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/step4.hbs
@@ -26,7 +26,7 @@
{{view App.ServicesConfigView}}
<div class="btn-area">
- <button id="back-kerberos-step4" class="btn" {{action back}}>← {{t common.back}}</button>
+ <button id="back-kerberos-step4" class="btn btn-default" {{action back}}>← {{t common.back}}</button>
<button id="submit-kerberos-step4" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}}
{{action submit target="controller"}}>{{t common.next}} →</button>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/kerberos/step5.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/kerberos/step5.hbs b/ambari-web/app/templates/main/admin/kerberos/step5.hbs
index bd3d27d..1e5af83 100644
--- a/ambari-web/app/templates/main/admin/kerberos/step5.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/step5.hbs
@@ -45,11 +45,11 @@
<div class="additional btn-area clearfix">
<button class="btn btn-primary pull-right mls" {{action downloadCSV}}>{{t admin.kerberos.wizard.step5.downloadCSV}}</button>
- <button class="btn pull-right" {{action exitWizard}}>{{t admin.kerberos.wizard.step5.exitWizard}}</button>
+ <button class="btn btn-default pull-right" {{action exitWizard}}>{{t admin.kerberos.wizard.step5.exitWizard}}</button>
</div>
<div class="btn-area">
- <button id="back-kerberos-step5" class="btn" {{action back}}>← {{t common.back}}</button>
+ <button id="back-kerberos-step5" class="btn btn-default" {{action back}}>← {{t common.back}}</button>
<button id="submit-kerberos-step5" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}}
{{action submit target="controller"}}>{{t common.next}} →</button>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/kerberos/wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/kerberos/wizard.hbs b/ambari-web/app/templates/main/admin/kerberos/wizard.hbs
index 1c0655b..a6cd55b 100644
--- a/ambari-web/app/templates/main/admin/kerberos/wizard.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/wizard.hbs
@@ -18,13 +18,12 @@
<div class="wizard">
<div class="container">
- <div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<!--Sidebar content-->
<div class="well">
<ul class="nav nav-pills nav-stacked">
- <li class="nav-header"> <i class="icon-lock"></i> {{t admin.kerberos.wizard.header}}</li>
+ <li class="nav-header"> <i class="glyphicon glyphicon-lock"></i> {{t admin.kerberos.wizard.header}}</li>
<li {{bindAttr class="isStep1:active view.isStep1Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep1 target="controller"}}>{{t admin.kerberos.wizard.step1.header}}</a></li>
<li {{bindAttr class="isStep2:active view.isStep2Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep2 target="controller"}}>{{t admin.kerberos.wizard.step2.header}}</a></li>
<li {{bindAttr class="isStep3:active view.isStep3Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep3 target="controller"}}>{{t admin.kerberos.wizard.step3.header}}</a></li>
@@ -36,10 +35,9 @@
</ul>
</div>
</div>
- <div class="wizard-content well span9">
+ <div class="wizard-content well col-md-9">
{{outlet}}
</div>
</div>
- </div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/serviceAccounts.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/serviceAccounts.hbs b/ambari-web/app/templates/main/admin/serviceAccounts.hbs
index ab0a0a6..3e103dd 100644
--- a/ambari-web/app/templates/main/admin/serviceAccounts.hbs
+++ b/ambari-web/app/templates/main/admin/serviceAccounts.hbs
@@ -21,7 +21,7 @@
</div>
{{#if controller.dataIsLoaded}}
{{#if controller.users}}
- <div class="span6">
+ <div class="col-md-6">
<table class="table table-bordered table-striped">
<thead>
<tr>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/service_auto_start.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/service_auto_start.hbs b/ambari-web/app/templates/main/admin/service_auto_start.hbs
index 9dc4dfb..ef07371 100644
--- a/ambari-web/app/templates/main/admin/service_auto_start.hbs
+++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs
@@ -24,23 +24,25 @@
{{t admin.serviceAutoStart.header.text}}
</div>
<br/>
- <div class="cluster-switcher row-fluid">
- <div class="span2">
+ <div class="cluster-switcher row">
+ <div class="col-md-2">
<strong>{{t admin.serviceAutoStart.body.text}}</strong>
</div>
- <div class="span4">
+ <div class="col-md-4">
{{view Ember.Checkbox checkedBinding="view.switcherValue"}}
</div>
- <div class="pull-right operations-button pull-right">
- <button class="btn" {{action doReload target="controller"}} {{bindAttr disabled="controller.isSaveDisabled"}}>{{t common.discard}}</button>
+ <div class="col-md-6">
+ <div class="pull-right operations-button">
+ <button class="btn btn-default" {{action doReload target="controller"}} {{bindAttr disabled="controller.isSaveDisabled"}}>{{t common.discard}}</button>
<button class="btn btn-success" {{action showSavePopup target="controller"}} {{bindAttr disabled="controller.isSaveDisabled"}}>{{t common.save}}</button>
+ </div>
</div>
</div>
{{#if view.switcherValue}}
<hr>
- <div class="row-fluid mlm"><h5 class="span2">{{t common.service}}</h5><h5 class="span4">{{t common.component}}</h5><h5 class="span4">{{t common.status}}</h5></div>
- <div class="tabs-left">
- <ul class="nav nav-tabs span2">
+ <div class="row mlm"><h5 class="col-md-3">{{t common.service}}</h5><h5 class="col-md-3">{{t common.component}}</h5><h5 class="col-md-3">{{t common.status}}</h5></div>
+ <div class="row">
+ <ul class="nav nav-tabs nav-stacked col-md-3">
{{#each tab in controller.tabs}}
<li {{bindAttr class="tab.isActive:active"}}>
<a href="#" data-toggle="tab" {{bindAttr data-target="tab.headingClass"}}>
@@ -50,20 +52,20 @@
</li>
{{/each}}
</ul>
- <div class="tab-content">
+ <div class="tab-content col-md-9">
{{#each tab in controller.tabs}}
- <div {{bindAttr class=":tab-pane tab.isActive:active tab.service_name :row-fluid :mtm"}}>
+ <div {{bindAttr class=":tab-pane tab.isActive:active tab.service_name :row :mtm"}}>
{{#each component in tab.componentRecovery}}
- <div class="row-fluid mbm">
- <div class="span4">
+ <div class="row mbm">
+ <div class="col-md-4">
{{component.display_name}}
</div>
- <div class="span8">
+ <div class="col-md-8">
{{view App.MainAdminServiceAutoStartComponentView recoveryEnabledBinding="component.recovery_enabled" componentBinding="component" tabBinding="tab"}}
</div>
</div>
{{/each}}
- <div class="offset4">
+ <div class="col-md-offset-4">
<a href="#" class="enable-all-link" {{action enableAll tab target="controller"}}>{{t common.enableAll}}</a> |
<a href="#" {{action disableAll tab target="controller"}}>{{t common.disableAll}}</a>
</div>
@@ -72,4 +74,4 @@
</div>
</div>
{{/if}}
-</div>
\ No newline at end of file
+</div>