http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/definition_details.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs b/ambari-web/app/templates/main/alerts/definition_details.hbs index bfaad44..0632ea5 100644 --- a/ambari-web/app/templates/main/alerts/definition_details.hbs +++ b/ambari-web/app/templates/main/alerts/definition_details.hbs @@ -20,17 +20,17 @@ <div id="alert-definition-details"> - <div class="alert-definition-details-header row-fluid"> - <div class="span8"> + <div class="alert-definition-details-header row"> + <div class="col-md-8"> {{! Alert Definition Name }} - <div class="definition-name row-fluid"> + <div class="definition-name row"> {{#if controller.editing.label.isEditing}} - <div {{bindAttr class="controller.editing.label.isError:error :span5 :name-text-field :control-group"}}> + <div {{bindAttr class="controller.editing.label.isError:error :col-md-5 :name-text-field :form-group"}}> {{view Em.TextField valueBinding="controller.editing.label.value" maxlength="255"}} </div> <div class="edit-buttons"> <button {{action cancelEdit controller.editing.label target="controller"}} - class="btn cancel-button">{{t common.cancel}}</button> + class="btn btn-default cancel-button">{{t common.cancel}}</button> <button {{bindAttr disabled="controller.editing.label.isError"}} {{action saveEdit controller.editing.label target="controller"}} class="btn btn-primary save-button">{{t common.save}} </button> @@ -43,32 +43,32 @@ {{#unless controller.editing.label.isEditing}} {{#isAuthorized "SERVICE.TOGGLE_ALERTS"}} <a {{action edit controller.editing.label target="controller"}} class="edit-description-button"><i - class="icon-pencil"></i></a> + class="glyphicon glyphicon-pencil"></i></a> {{/isAuthorized}} {{/unless}} </div> {{! Alert Definition Name end }} <div class="error-msg"> {{controller.errorMessage}} </div> - <div><a href="javascript:void(null)" data-toggle="modal" {{action back}}><i - class="icon-arrow-left"></i> {{t common.back}}</a> + <div class="row"><a href="javascript:void(null)" {{action back}}><i + class="glyphicon glyphicon-arrow-left"></i> {{t common.back}}</a> </div> </div> - <div class="status span4"> + <div class="status col-md-4"> {{view App.AlertDefinitionSummary contentBinding="view.controller.content"}} </div> </div> - <div class="row-fluid" style="display: flex; align-items: stretch;"> + <div class="row" style="display: flex; align-items: stretch;"> {{! Left column }} {{! Alert Definition Configs }} - <div class="box span8"> - <div class="box-header"> - <div class="pull-left"> + <div class="box col-md-8"> + <div class="box-header row"> + <div class="pull-left col-md-7"> <h4>{{t common.configuration}}</h4> </div> - <div class="pull-right span5 row-fluid" style="padding:0 10px;"> + <div class="pull-right col-md-5"> {{#isAuthorized "SERVICE.TOGGLE_ALERTS"}} {{#unless App.router.mainAlertDefinitionConfigsController.canEdit}} <a {{action editConfigs target="App.router.mainAlertDefinitionConfigsController"}} @@ -83,7 +83,7 @@ {{#if App.router.mainAlertDefinitionConfigsController.canEdit}} <div class="edit-buttons"> <button {{action cancelEditConfigs target="App.router.mainAlertDefinitionConfigsController"}} - class="btn">{{t common.cancel}}</button> + class="btn btn-default">{{t common.cancel}}</button> <button {{bindAttr disabled="App.router.mainAlertDefinitionConfigsController.hasErrors"}} {{action saveConfigs target="App.router.mainAlertDefinitionConfigsController"}} class="btn btn-primary">{{t common.save}} </button> @@ -94,11 +94,11 @@ {{! Left column end }} {{! Right column }} - <div class="span4 right-column"> + <div class="col-md-4 right-column"> <div class="properties-list background-text"> - <div class="row-fluid"> - <div class="span6 property-name">{{t alerts.table.state}}:</div> - <div class="span6"> + <div class="row"> + <div class="col-md-5 property-name">{{t alerts.table.state}}:</div> + <div class="col-md-7"> {{#if controller.content.enabled}} {{#isAuthorized "SERVICE.TOGGLE_ALERTS"}} <a href="#" {{action "toggleState" controller.content target="controller"}} {{bindAttr class="controller.content.enabled:alert-definition-enable:alert-definition-disable"}}> @@ -125,28 +125,28 @@ </div> </div> {{#if controller.content.serviceDisplayName}} - <div class="row-fluid"> - <div class="span6 property-name">{{t common.service}}:</div> - <div class="span6"><span>{{controller.content.serviceDisplayName}}</span></div> + <div class="row"> + <div class="col-md-5 property-name">{{t common.service}}:</div> + <div class="col-md-7"><span>{{controller.content.serviceDisplayName}}</span></div> </div> {{/if}} {{#if controller.content.componentNameFormatted}} - <div class="row-fluid"> - <div class="span6 property-name">{{t common.component}}:</div> - <div class="span6">{{controller.content.componentNameFormatted}}</div> + <div class="row"> + <div class="col-md-5 property-name">{{t common.component}}:</div> + <div class="col-md-7">{{controller.content.componentNameFormatted}}</div> </div> {{/if}} - <div class="row-fluid"> - <div class="span6 property-name">{{t common.type}}:</div> - <div class="span6"> + <div class="row"> + <div class="col-md-5 property-name">{{t common.type}}:</div> + <div class="col-md-7"> <span {{bindAttr class=":type-icon controller.content.typeIconClass"}}></span> {{controller.content.type}} </div> </div> {{#if controller.groupsList.length}} - <div class="row-fluid"> - <div class="span6 property-name">{{t alerts.definition.details.groups}}:</div> - <div class="span6"> - <ul> + <div class="row"> + <div class="col-md-5 property-name">{{t alerts.definition.details.groups}}:</div> + <div class="col-md-7"> + <ul class="list-unstyled"> {{#each groupName in controller.groupsList}} <li>{{groupName}}</li> {{/each}} @@ -154,14 +154,14 @@ </div> </div> {{/if}} - <div class="row-fluid"> - <div class="span6 property-name">{{t alerts.table.header.lastTrigger}}:</div> - <div class="span6">{{controller.content.lastTriggeredFormatted}}</div> + <div class="row"> + <div class="col-md-5 property-name">{{t alerts.table.header.lastTrigger}}:</div> + <div class="col-md-7">{{controller.content.lastTriggeredFormatted}}</div> </div> {{#unless controller.content.isTypeAggregate}} - <div class="row-fluid"> - <div class="span6 property-name">{{t alerts.table.header.repeatTolerance}}:</div> - <div class="span6"> + <div class="row"> + <div class="col-md-5 property-name">{{t alerts.table.header.repeatTolerance}}:</div> + <div class="col-md-7"> {{#if controller.content.repeat_tolerance_enabled}} <span> {{controller.content.repeat_tolerance}} @@ -174,16 +174,16 @@ {{/if}} {{#isAuthorized "SERVICE.TOGGLE_ALERTS"}} <a {{action editRepeatTolerance target="controller"}} class="edit-description-button"> - <i class="icon-pencil"></i> + <i class="glyphicon glyphicon-pencil"></i> </a> {{/isAuthorized}} </div> </div> {{/unless}} {{#if controller.content.hasHelpUrl}} - <div class="row-fluid"> - <div class="span6 property-name">{{t alerts.table.header.helpUrl}}:</div> - <div class="span6"><label for=""><a {{bindAttr href="controller.content.helpUrl"}} target="_blank">{{t common.link}}</a></label></div> + <div class="row"> + <div class="col-md-5 property-name">{{t alerts.table.header.helpUrl}}:</div> + <div class="col-md-7"><label for=""><a {{bindAttr href="controller.content.helpUrl"}} target="_blank">{{t common.link}}</a></label></div> </div> {{/if}} </div> @@ -192,7 +192,7 @@ {{! Right column end }} {{! List of alerts }} - <div class="definition-details-block"> + <div class="definition-details-block row"> <span class="background-text"> <strong>{{t alerts.definition.details.instances}}</strong> </span> @@ -261,7 +261,7 @@ </table> <div class="page-bar"> - <div class="filtered-info span4"> + <div class="filtered-info col-md-4"> {{#if view.showFilteredContent}} <label>{{view.filteredContentInfo}} - <a {{action clearFilters target="view"}} href="#">{{t tableView.filters.clearAllFilters}}</a></label> @@ -271,12 +271,7 @@ <label>{{t common.show}}: {{view view.rowsPerPageSelectView selectionBinding="view.displayLength"}}</label> </div> <div class="info">{{view.paginationInfo}}</div> - <div class="paging_two_button"> - <a {{bindAttr class="view.paginationLeftClass"}}{{action previousPage target="view"}}><i - class="icon-arrow-left"></i></a> - <a {{bindAttr class="view.paginationRightClass"}}{{action nextPage target="view"}}><i - class="icon-arrow-right"></i></a> - </div> + {{view view.pagination2Btns}} </div> {{else}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs b/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs index 0c79b1c..9e4b07f 100644 --- a/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs +++ b/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs @@ -15,82 +15,88 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -<div class="alert alert-info margin-bottom-5">{{t alerts.actions.manage_alert_groups_popup.notice}}</div> + {{#if controller.isLoaded}} - <div class="row-fluid manage-configuration-group-content"> - <div class="span12"> - <div class="row-fluid"> - <div class="span4"> - <span> </span> - {{view Em.Select - contentBinding="alertGroups" - optionLabelPath="content.label" - selectionBinding="view.selectedAlertGroup" - multiple="multiple" - class="group-select select-group-box" - }} - <div class="btn-toolbar pull-right"> - <button rel="button-info" class="btn add-group-button" {{bindAttr data-original-title="view.addButtonTooltip"}} - {{action addAlertGroup target="controller"}}><i class="icon-plus"></i></button> - <a rel="button-info" class="btn remove-group-button" {{bindAttr data-original-title="view.removeButtonTooltip" disabled="controller.isRemoveButtonDisabled"}} - {{action confirmDelete target="controller"}}><i class="icon-minus"></i></a> - <div class="btn-group"> - <button class="btn dropdown-toggle actions-group-button" data-toggle="dropdown"> - <i class="icon-cog"></i> <span class="caret"></span> - </button> - <ul class="dropdown-menu"> - <li {{bindAttr class="controller.isRenameButtonDisabled:disabled"}}> - <a href="" rel="button-info-dropdown" {{bindAttr data-original-title="view.renameButtonTooltip"}} {{action renameAlertGroup target="controller"}}>{{t alerts.actions.manage_alert_groups_popup.rename}}</a> - </li> - <li {{bindAttr class="controller.isDuplicateButtonDisabled:disabled"}}> - <a href="" rel="button-info-dropdown" {{bindAttr data-original-title="view.duplicateButtonTooltip"}} {{action duplicateAlertGroup target="controller"}}>{{t alerts.actions.manage_alert_groups_popup.duplicate}}</a> - </li> - </ul> - </div> - </div> + <div class="row"> + <div class="col-md-12 col-lg-12"> + <p class="alert alert-info">{{t alerts.actions.manage_alert_groups_popup.notice}}</p> + </div> + </div> + <div class="row manage-configuration-group-content"> + {{! groups list }} + <div class="col-md-4 col-lg-4"> + <span> </span> + {{view Em.Select + contentBinding="alertGroups" + optionLabelPath="content.label" + selectionBinding="view.selectedAlertGroup" + multiple="multiple" + class="group-select select-group-box form-control" + }} + <div class="btn-toolbar pull-right"> + <button rel="button-info" class="btn btn-default add-group-button" {{bindAttr data-original-title="view.addButtonTooltip"}} + {{action addAlertGroup target="controller"}}><i class="glyphicon glyphicon-plus"></i></button> + <a rel="button-info" class="btn btn-default remove-group-button" {{bindAttr data-original-title="view.removeButtonTooltip" disabled="controller.isRemoveButtonDisabled"}} + {{action confirmDelete target="controller"}}><i class="glyphicon glyphicon-minus"></i></a> + <div class="btn-group"> + <button class="btn btn-default dropdown-toggle actions-group-button" data-toggle="dropdown"> + <i class="glyphicon glyphicon-cog"></i> <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li {{bindAttr class="controller.isRenameButtonDisabled:disabled"}}> + <a href="#" rel="button-info-dropdown" {{bindAttr data-original-title="view.renameButtonTooltip"}} {{action renameAlertGroup target="controller"}}>{{t alerts.actions.manage_alert_groups_popup.rename}}</a> + </li> + <li {{bindAttr class="controller.isDuplicateButtonDisabled:disabled"}}> + <a href="#" rel="button-info-dropdown" {{bindAttr data-original-title="view.duplicateButtonTooltip"}} {{action duplicateAlertGroup target="controller"}}>{{t alerts.actions.manage_alert_groups_popup.duplicate}}</a> + </li> + </ul> </div> - <div class="span8"> - <span> </span> - <div class="row-fluid"> - <div class="span12 pull-right"> - {{view Em.Select - contentBinding="selectedAlertGroup.definitions" - optionLabelPath="content.label" - multiple="multiple" - class="group-select select-definiton-box" - selectionBinding="selectedDefinitions" - }} - </div> - <div class="button-group pull-right"> - <a rel="button-info" {{bindAttr data-original-title="view.addDefinitionTooltip" class=":btn selectedAlertGroup.isAddDefinitionsDisabled:disabled :add-definition"}} {{action addDefinitions target="controller"}} ><i class="icon-plus"></i></a> - <a rel="button-info" {{bindAttr data-original-title="view.removeDefinitionTooltip" class=":btn isDeleteDefinitionsDisabled:disabled :remove-definition"}} {{action deleteDefinitions target="controller"}} ><i class="icon-minus"></i></a> - </div> - </div> - - <div class="clearfix"></div> - <div class="row-fluid notification-editable-list"> - <div class="span4 title"><span class="icon-envelope-alt"></span> {{t alerts.actions.manage_alert_groups_popup.notifications}}</div> - </div> - <div class="row-fluid notification-editable-list"> - <div class="span11"> - {{view App.EditableList itemsBinding="selectedAlertGroup.notifications" resourcesBinding="controller.alertNotifications" nameBinding="selectedAlertGroup.displayName"}} - </div> - </div> + </div> + </div> + {{! groups list end }} - </div> - <div class="clearfix"></div> - <div class="row-fluid"> - <div class="span12 text-error" id="manage-config-group-error-div"> - {{#if controller.errorMessage}} - {{controller.errorMessage}} - {{else}} - - {{/if}} - </div> - </div> + {{! definitions list }} + <div class="col-md-8 col-lg-8"> + <span> </span> + {{view Em.Select + contentBinding="selectedAlertGroup.definitions" + optionLabelPath="content.label" + multiple="multiple" + class="group-select pull-right select-definiton-box form-control" + selectionBinding="selectedDefinitions" + }} + <div class="button-toolbar"> + <div class="pull-right"> + <a rel="button-info" {{bindAttr data-original-title="view.addDefinitionTooltip" class=":btn :btn-default selectedAlertGroup.isAddDefinitionsDisabled:disabled :add-definition"}} {{action addDefinitions target="controller"}} ><i + class="glyphicon glyphicon-plus"></i></a> + <a rel="button-info" {{bindAttr data-original-title="view.removeDefinitionTooltip" class=":btn :btn-default isDeleteDefinitionsDisabled:disabled :remove-definition"}} {{action deleteDefinitions target="controller"}} ><i + class="glyphicon glyphicon-minus"></i></a> + </div> + <div class="clearfix"></div> + </div> + <div class="notification-editable-list"> + <span class="icon-envelope-alt"></span> {{t alerts.actions.manage_alert_groups_popup.notifications}} + {{view App.EditableList + itemsBinding="selectedAlertGroup.notifications" + resourcesBinding="controller.alertNotifications" + nameBinding="selectedAlertGroup.displayName" + }} </div> </div> + {{! definitions list end }} + </div> + + {{! error message }} + <div class="row"> + <div class="col-md-12 col-lg-12 text-danger" id="manage-config-group-error-div"> + {{#if controller.errorMessage}} + {{controller.errorMessage}} + {{else}} + + {{/if}} + </div> </div> +{{! error message end }} {{else}} {{view App.SpinnerView}} -{{/if}} +{{/if}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs b/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs index 49724bd..5599e09 100644 --- a/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs +++ b/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs @@ -17,30 +17,30 @@ }} <div class="alert alert-info margin-bottom-5">{{t alerts.actions.manageNotifications.info}}</div> {{#if controller.isLoaded}} - <div class="row-fluid manage-configuration-group-content" id="manage-alert-notification-content"> - <div class="span12"> - <div class="row-fluid"> - <div class="span4 notification-list"> + <div class="row manage-configuration-group-content" id="manage-alert-notification-content"> + <div class="col-md-12"> + <div class="row"> + <div class="col-md-4 notification-list"> <span> </span> {{view Em.Select contentBinding="alertNotifications" optionLabelPath="content.displayName" multiple="multiple" - class="group-select" + class="group-select form-control" selectionBinding="view.selectedAlertNotification" }} <div class="btn-toolbar pull-right"> - <button rel="button-info" class="btn add-notification-button" + <button rel="button-info" class="btn btn-default add-notification-button" {{translateAttr data-original-title="alerts.actions.manage_alert_notifications_popup.addButton"}} {{bindAttr disabled="view.isAddButtonDisabled"}} - {{action addAlertNotification target="controller"}}><i class="icon-plus"></i></button> - <button rel="button-info" class="btn remove-notification-button" + {{action addAlertNotification target="controller"}}><i class="glyphicon glyphicon-plus"></i></button> + <button rel="button-info" class="btn btn-default remove-notification-button" {{translateAttr data-original-title="alerts.actions.manage_alert_notifications_popup.removeButton"}} {{bindAttr disabled="view.isRemoveButtonDisabled"}} - {{action deleteAlertNotification target="controller"}}><i class="icon-minus"></i></button> - <div class="btn-group notification-actions-button"> - <button class="btn dropdown-toggle" data-toggle="dropdown" {{bindAttr disabled="view.isAddButtonDisabled"}}> - <i class="icon-cog"></i> <span class="caret"></span> + {{action deleteAlertNotification target="controller"}}><i class="glyphicon glyphicon-minus"></i></button> + <div class="btn-group notification-actions-button dropup"> + <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" {{bindAttr disabled="view.isAddButtonDisabled"}}> + <i class="glyphicon glyphicon-cog"></i> <span class="caret"></span> </button> <ul class="dropdown-menu"> <li {{bindAttr class="view.isEditButtonDisabled:disabled"}}> @@ -70,20 +70,20 @@ </div> </div> </div> - <div class="span8 notification-info"> + <div class="col-md-8 notification-info"> <span> </span> - <div class="row-fluid"> - <div class="span12 pull-right"> + <div class="row"> + <div class="col-md-12 pull-right"> {{#if alertNotifications.length}} {{#if selectedAlertNotification}} - <div class="row-fluid notification-name"> - <div class="span3 input-label">{{t common.name}}</div> - <div class="span9 input-value">{{selectedAlertNotification.name}}</div> + <div class="row notification-name"> + <div class="col-md-3 input-label">{{t common.name}}</div> + <div class="col-md-9 input-value">{{selectedAlertNotification.name}}</div> </div> - <div class="row-fluid notification-groups"> - <div class="span3 input-label">{{t common.groups}}</div> - <div class="span9 input-value"> + <div class="row notification-groups"> + <div class="col-md-3 input-label">{{t common.groups}}</div> + <div class="col-md-9 input-value"> {{#if selectedAlertNotification.global}} {{t common.all}} {{else}} @@ -95,28 +95,28 @@ {{/if}} </div> </div> - <div class="row-fluid notification-severity"> - <div class="span3 input-label">{{t common.severity}}</div> - <div class="span9 input-value">{{view.severities}}</div> + <div class="row notification-severity"> + <div class="col-md-3 input-label">{{t common.severity}}</div> + <div class="col-md-9 input-value">{{view.severities}}</div> </div> - <div class="row-fluid notification-method"> - <div class="span3 input-label">{{t alerts.actions.manage_alert_notifications_popup.method}}</div> - <div class="span9 input-value">{{selectedAlertNotification.type}}</div> + <div class="row notification-method"> + <div class="col-md-3 input-label">{{t alerts.actions.manage_alert_notifications_popup.method}}</div> + <div class="col-md-9 input-value">{{selectedAlertNotification.type}}</div> </div> {{#if view.showEmailDetails}} - <div class="row-fluid notification-email"> - <div class="span3 input-label">{{t alerts.actions.manage_alert_notifications_popup.email}}</div> - <div class="span9 input-value">{{view.email}}</div> + <div class="row notification-email"> + <div class="col-md-3 input-label">{{t alerts.actions.manage_alert_notifications_popup.email}}</div> + <div class="col-md-9 input-value">{{view.email}}</div> </div> {{/if}} {{#if view.showSNMPDetails}} {{/if}} - <div class="row-fluid notification-description"> - <div class="span3 input-label">{{t common.description}}</div> + <div class="row notification-description"> + <div class="col-md-3 input-label">{{t common.description}}</div> {{#if selectedAlertNotification.description}} - <div class="span9 input-value">{{selectedAlertNotification.description}}</div> + <div class="col-md-9 input-value">{{selectedAlertNotification.description}}</div> {{else}} - <div class="span9 input-value">{{t alerts.actions.manage_alert_notifications_popup.noDescription}}</div> + <div class="col-md-9 input-value">{{t alerts.actions.manage_alert_notifications_popup.noDescription}}</div> {{/if}} </div> {{/if}} @@ -129,8 +129,8 @@ </div> </div> <div class="clearfix"></div> - <div class="row-fluid"> - <div class="span12 text-error" id="manage-alert-notifications-error"> + <div class="col-md-12 row"> + <div class="col-md-12 text-danger" id="manage-alert-notifications-error"> {{#if controller.errorMessage}} {{controller.errorMessage}} {{else}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/charts/heatmap.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/charts/heatmap.hbs b/ambari-web/app/templates/main/charts/heatmap.hbs index 43f3709..f1f1e92 100644 --- a/ambari-web/app/templates/main/charts/heatmap.hbs +++ b/ambari-web/app/templates/main/charts/heatmap.hbs @@ -19,8 +19,8 @@ <div class="heatmap"> {{#if isLoaded}} <div class="container-fluid"> - <div class="row-fluid"> - <div class="span2 legend-column background-text"> + <div class="row"> + <div class="col-md-2 legend-column background-text"> {{view view.dropdownView}} @@ -36,9 +36,9 @@ {{/each}} </table> {{t common.maximum}}: - <div id="inputMaximum" class="control-group"> - {{view Ember.TextField type="text" maxlength="8" valueBinding="controller.inputMaximum" class="span6"}} - {{controller.selectedMetric.units}} + <div id="inputMaximum" class="control-group maximum-input"> + {{view Ember.TextField type="text" maxlength="8" valueBinding="controller.inputMaximum" class="form-control"}} + <span>{{controller.selectedMetric.units}}</span> </div> {{/if}} </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs b/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs index a2cc193..c555655 100644 --- a/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs +++ b/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs @@ -17,8 +17,8 @@ }} <div class="btn-group"> - <button class="btn heatmap-select-metric-btn">{{t charts.heatmap.selectMetric}}</button> - <button class="btn dropdown-toggle heatmap-toggle-metrics-btn" data-toggle="dropdown"> + <button class="btn btn-default heatmap-select-metric-btn">{{t charts.heatmap.selectMetric}}</button> + <button class="btn btn-default dropdown-toggle heatmap-toggle-metrics-btn btn-icon" data-toggle="dropdown"> <span class="caret"></span> </button> <ul class="dropdown-menu"> @@ -35,4 +35,4 @@ </li> {{/each}} </ul> -</div> \ No newline at end of file +</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/charts/linear_time.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/charts/linear_time.hbs b/ambari-web/app/templates/main/charts/linear_time.hbs index 7011465..2a5fc35 100644 --- a/ambari-web/app/templates/main/charts/linear_time.hbs +++ b/ambari-web/app/templates/main/charts/linear_time.hbs @@ -31,8 +31,8 @@ {{view.title}} </div> {{#if view.isReady}} - <a {{bindAttr class="view.isExportButtonHidden:hidden :corner-icon :span1"}} href="#" {{action toggleFormatsList target="view"}}> - <i class="icon-save"></i> + <a {{bindAttr class="view.isExportButtonHidden:hidden :corner-icon :col-md-1"}} href="#" {{action toggleFormatsList target="view"}}> + <i class="glyphicon glyphicon-save"></i> </a> <div class="export-graph-list-top"></div> {{view view.exportMetricsMenuView}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard.hbs b/ambari-web/app/templates/main/dashboard.hbs index f020162..06e3a13 100644 --- a/ambari-web/app/templates/main/dashboard.hbs +++ b/ambari-web/app/templates/main/dashboard.hbs @@ -16,12 +16,12 @@ * limitations under the License. }} -<div class="row-fluid"> - <div class="services-menu well span2 service-menu-width" style="padding: 8px 0"> +<div class="row"> + <div class="services-menu well col-md-2 service-menu-width" style="padding: 8px 0"> {{view App.MainServiceMenuView}} {{view App.AllServicesActionView}} </div> - <div class="summary-width span10" id="dashboard-widgets-container"> + <div class="summary-width col-md-10" id="dashboard-widgets-container"> <ul class="nav nav-tabs background-text"> {{#each category in view.categories}} {{#view view.NavItemView itemBinding="category.name" }} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard/config_history.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/config_history.hbs b/ambari-web/app/templates/main/dashboard/config_history.hbs index 13ba4a9..ced85ac 100644 --- a/ambari-web/app/templates/main/dashboard/config_history.hbs +++ b/ambari-web/app/templates/main/dashboard/config_history.hbs @@ -49,7 +49,7 @@ {{item.displayName}} </a> {{/if}} - <i {{bindAttr class=":icon-refresh :restart-required-service item.isRestartRequired::hidden"}} + <i {{bindAttr class=":glyphicon :glyphicon-refresh :restart-required-service item.isRestartRequired::hidden"}} rel="Tooltip" {{translateAttr data-original-title="dashboard.configHistory.table.restart.tooltip"}}></i> </td> <td>{{item.configGroupName}} @@ -90,7 +90,7 @@ </table> <div class="page-bar"> - <div class="filtered-info span4"> + <div class="filtered-info col-md-4"> {{#if view.showFilteredContent}} <label>{{view.filteredContentInfo}} - <a {{action clearFilters target="view"}} href="#">{{t tableView.filters.clearAllFilters}}</a></label> @@ -100,9 +100,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.paginationLeft}} - {{view view.paginationRight}} - </div> + {{view view.pagination2Btns}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs b/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs index 30cc5be..d261fb0 100644 --- a/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs +++ b/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs @@ -22,37 +22,41 @@ </div> </div> - <div class="row-fluid" id= "min-height-limit"> + <div class="row" id= "min-height-limit"> {{#if view.configPropertyObj.isIE9}} {{#if view.configPropertyObj.isGreenOrangeRed}} - <div class="progress span9"> + <div class="progress col-md-9"> <div class="bar bar-success" style="width: 33%;"></div> <div class="bar bar-warning" style="width: 33%;"></div> <div class="bar bar-danger" style="width: 34%;"></div> </div> {{else}} - <div class="progress span9"> + <div class="progress col-md-9"> <div class="bar bar-danger" style="width: 33%;"></div> <div class="bar bar-warning" style="width: 33%;"></div> <div class="bar bar-success" style="width: 34%;"></div> </div> {{/if}} {{else}} - <div class="span9" id="slider-range"></div> + <div class="col-md-9" id="slider-range"></div> {{/if}} </div> - <div class="row-fluid"> - <div id="slider-value1" class="value-on-slider span2">0</div> - <div id="slider-value2" {{bindAttr class="view.configPropertyObj.isThresh1Error:slider-error :value-on-slider :span4"}}> + <div class="row"> + <div id="slider-value1" class="value-on-slider col-md-2">0</div> + <div id="slider-value2" {{bindAttr class="view.configPropertyObj.isThresh1Error:slider-error :value-on-slider :col-md-4 view.configPropertyObj.isThresh1Error:has-error"}}> {{view Ember.TextField valueBinding="view.configPropertyObj.thresh1"}} - <span class="help-inline">{{view.configPropertyObj.errorMessage1}}</span> + {{#if view.configPropertyObj.errorMessage1}} + <span class="help-block validation-block">{{view.configPropertyObj.errorMessage1}}</span> + {{/if}} </div> - <div id="slider-value3" {{bindAttr class="view.configPropertyObj.isThresh2Error:slider-error :value-on-slider :span4"}}> - {{view Ember.TextField valueBinding="view.configPropertyObj.thresh2" }} - <span class="help-inline">{{view.configPropertyObj.errorMessage2}}</span> + <div id="slider-value3" {{bindAttr class="view.configPropertyObj.isThresh2Error:slider-error :value-on-slider :col-md-4 view.configPropertyObj.isThresh2Error:has-error"}}> + {{view Ember.TextField valueBinding="view.configPropertyObj.thresh2"}} + {{#if view.configPropertyObj.errorMessage1}} + <span class="help-block validation-block">{{view.configPropertyObj.errorMessage2}}</span> + {{/if}} </div> - <div id="slider-value4" class="value-on-slider span2">{{view.configPropertyObj.maxValue}}</div> + <div id="slider-value4" class="value-on-slider col-md-2">{{view.configPropertyObj.maxValue}}</div> </div> </form> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs b/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs index d83d048..e65f0da 100644 --- a/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs +++ b/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs @@ -23,31 +23,33 @@ </div> </div> - <div class="row-fluid" id= "min-height-limit"> + <div class="row" id= "min-height-limit"> {{#if view.configPropertyObj.isIE9}} {{#if view.configPropertyObj.isGreenRed}} - <div class="progress span9"> + <div class="progress col-md-9"> <div class="bar bar-success" style="width: 33%;"></div> <div class="bar bar-danger" style="width: 34%;"></div> </div> {{else}} - <div class="progress span9"> + <div class="progress col-md-9"> <div class="bar bar-danger" style="width: 33%;"></div> <div class="bar bar-success" style="width: 34%;"></div> </div> {{/if}} {{else}} - <div class="span9" id="slider-range"></div> + <div class="col-md-9" id="slider-range"></div> {{/if}} </div> - <div class="row-fluid"> - <div id="slider-value1" class="value-on-slider span2" style="margin-left: 20px">0</div> - <div id="slider-value2" style="margin-left: 100px"{{bindAttr class="view.configPropertyObj.isThresh1Error:slider-error :value-on-slider :span4"}}> + <div class="row"> + <div id="slider-value1" class="value-on-slider col-md-2" style="margin-left: 20px">0</div> + <div id="slider-value2" style="margin-left: 100px"{{bindAttr class="view.configPropertyObj.isThresh1Error:slider-error :value-on-slider :col-md-4 view.configPropertyObj.isThresh1Error:has-error"}}> {{view Ember.TextField valueBinding="view.configPropertyObj.thresh1"}} - <span class="help-inline">{{view.configPropertyObj.errorMessage1}}</span> + {{#if view.configPropertyObj.errorMessage1}} + <span class="help-block validation-block">{{view.configPropertyObj.errorMessage1}}</span> + {{/if}} </div> - <div id="slider-value3" style="margin-left: 150px" class="value-on-slider span2">{{view.configPropertyObj.maxValue}}</div> + <div id="slider-value3" style="margin-left: 150px" class="value-on-slider col-md-2">{{view.configPropertyObj.maxValue}}</div> </div> </form> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs b/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs index dac9c22..71a4980 100644 --- a/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs +++ b/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs @@ -22,15 +22,17 @@ <ul> {{#each widget in view.hiddenWidgets}} <li> - <label class="checkbox"> - {{view view.widgetCheckbox checkedBinding="widget.checked"}} {{unbound widget.displayName}} - </label> + <div class="checkbox"> + <label> + {{view view.widgetCheckbox checkedBinding="widget.checked"}} {{unbound widget.displayName}} + </label> + </div> </li> {{/each}} </ul> </li> <li> - <button class="btn" {{action "closeFilter" target="view"}}>{{t common.cancel}}</button> + <button class="btn btn-default" {{action "closeFilter" target="view"}}>{{t common.cancel}}</button> <button class="btn btn-primary" {{action "applyFilter" target="view"}}>{{t common.apply}}</button> </li> {{else}} @@ -40,7 +42,7 @@ </ul> </li> <li> - <button class="btn" {{action "closeFilter" target="view"}}>{{t common.cancel}}</button> + <button class="btn btn-default" {{action "closeFilter" target="view"}}>{{t common.cancel}}</button> </li> {{/if}} </ul> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard/widgets.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/widgets.hbs b/ambari-web/app/templates/main/dashboard/widgets.hbs index 57ab38d..a778033 100644 --- a/ambari-web/app/templates/main/dashboard/widgets.hbs +++ b/ambari-web/app/templates/main/dashboard/widgets.hbs @@ -17,34 +17,36 @@ }} {{#if view.isDataLoaded}} - <div id="widgets-options-menu" class="dropdown btn-group pull-left"> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> - <span>{{t dashboard.widgets.actions.title}}</span> - <span class="caret"></span> - </a> - <ul class="dropdown-menu"> - <li class="dropdown-submenu add-widgets-text"> - <a href="javascript:void(null);"><i class="icon-plus"></i> {{t common.add}}</a> - {{view view.plusButtonFilterView}} - </li> - <li class="dropdown-submenu"> - <a href="javascript:void(null);"><i class="icon-cog"></i> {{t common.edit}}</a> - <ul class="dropdown-menu"> - <li> - <a href="#" {{action "resetAllWidgets" target="view"}}> - <i class="icon-refresh"></i> {{t dashboard.button.reset}} - </a> - </li> - </ul> - </li> - </ul> + <div class="btn-toolbar" role="toolbar"> + <div id="widgets-options-menu" class="dropdown btn-group pull-left"> + <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"> + <span>{{t dashboard.widgets.actions.title}}</span> + <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li class="add-widgets-text dropdown-submenu"> + <a href="javascript:void(null);"><i class="glyphicon glyphicon-plus"></i> {{t common.add}}</a> + {{view view.plusButtonFilterView}} + </li> + <li class="dropdown-submenu"> + <a href="javascript:void(null);"><i class="glyphicon glyphicon-cog"></i> {{t common.edit}}</a> + <ul class="dropdown-menu"> + <li> + <a href="#" {{action "resetAllWidgets" target="view"}}> + <i class="glyphicon glyphicon-refresh"></i> {{t dashboard.button.reset}} + </a> + </li> + </ul> + </li> + </ul> + </div> + {{view view.timeRangeListView}} + <div class="clearfix"></div> </div> - {{view view.timeRangeListView}} - <div class="clearfix"></div> <div class="dashboard-widgets-box"> <div id="dashboard-widgets" class="widgets-container"> - <div class="thumbnails row-fluid" id="sortable"> + <div class="thumbnails" id="sortable"> {{#if view.visibleWidgets.length}} {{#each widgetClass in view.visibleWidgets}} <div {{bindAttr class="widgetClass.class"}}> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs b/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs index 8919c41..f22b9f7 100644 --- a/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs +++ b/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs @@ -17,16 +17,16 @@ }} <div class="cluster-metrics"> - <ul> - <li class="thumbnail row"> - <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}> - <i class="icon-remove-sign icon-large"></i> + <ul class="list-unstyled"> + <li class="img-thumbnail row"> + <a {{bindAttr class=":corner-icon :col-md-1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}> + <i class="glyphicon-remove-sign glyphicon glyphicon-large"></i> </a> - <div class="caption span10">{{view.title}}</div> + <div class="caption col-md-10">{{view.title}}</div> {{#if view.isDataLoaded}} {{#if view.childViews.lastObject.hasData}} - <a {{bindAttr class="view.isExportButtonHidden:hidden :corner-icon :span1"}} href="#" {{action toggleFormatsList target="view"}}> - <i class="icon-save"></i> + <a {{bindAttr class="view.isExportButtonHidden:hidden :corner-icon :col-md-1"}} href="#" {{action toggleFormatsList target="view"}}> + <i class="glyphicon glyphicon-save"></i> </a> {{view view.exportMetricsMenuView}} {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs b/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs index cb97978..37225e1 100644 --- a/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs +++ b/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs @@ -17,12 +17,12 @@ }} <div class="links"> - <ul> - <li class="thumbnail row"> - <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} - href="#" {{action deleteWidget target="view"}}><i class="icon-remove-sign icon-large"></i></a> + <ul class="list-unstyled"> + <li class="img-thumbnail row"> + <a {{bindAttr class=":corner-icon :col-md-1 view.parentView.isMoving:hidden"}} + href="#" {{action deleteWidget target="view"}}><i class="glyphicon-remove-sign glyphicon glyphicon-large"></i></a> - <div class="caption span10"> {{view.title}}</div> + <div class="caption col-md-10"> {{view.title}}</div> {{#if view.isDataLoaded}} <div class="widget-content"> <table> @@ -60,10 +60,10 @@ {{#if view.model.quickLinks.length}} {{#view App.QuickViewLinks contentBinding="view.model"}} <div class="btn-group"> - <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#"> + <button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" href="#"> {{t common.more}} <span class="caret"></span> - </a> + </button> <ul class="dropdown-menu"> {{#if view.isLoaded}} {{#if view.quickLinksArray}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs b/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs index 96f64ba..f73e2bb 100644 --- a/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs +++ b/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs @@ -17,12 +17,12 @@ }} <div class="links"> - <ul> - <li class="thumbnail row"> - <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}> - <i class="icon-remove-sign icon-large"></i> + <ul class="list-unstyled"> + <li class="img-thumbnail row"> + <a {{bindAttr class=":corner-icon :col-md-1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}> + <i class="glyphicon-remove-sign glyphicon glyphicon-large"></i> </a> - <div class="caption span10"> {{view.title}}</div> + <div class="caption col-md-10"> {{view.title}}</div> <div class="widget-content" > {{#if view.isHAEnabled }} @@ -81,10 +81,10 @@ {{#if view.model.quickLinks.length}} {{#view App.QuickViewLinks contentBinding="view.model"}} <div class="btn-group"> - <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#"> + <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"> {{t common.more}} <span class="caret"></span> - </a> + </button> <ul class="dropdown-menu"> {{#if view.isLoaded}} {{#if view.quickLinksArray}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs b/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs index 1ba2e57..fdeafd1 100644 --- a/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs +++ b/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs @@ -17,17 +17,17 @@ }} <div class="has-hidden-info"> - <ul> - <li class="thumbnail row"> - <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} + <ul class="list-unstyled"> + <li class="img-thumbnail row"> + <a {{bindAttr class=":corner-icon :col-md-1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}> - <i class="icon-remove-sign icon-large"></i> + <i class="glyphicon-remove-sign glyphicon glyphicon-large"></i> </a> - <div class="caption span10">{{view.title}}</div> + <div class="caption col-md-10">{{view.title}}</div> {{#if view.isDataLoaded}} - <a class="corner-icon span1" href="#" {{action editWidget target="view"}}> - <i class="icon-edit"></i> + <a class="corner-icon col-md-1" href="#" {{action editWidget target="view"}}> + <i class="glyphicon glyphicon-edit"></i> </a> <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass" }}> @@ -52,4 +52,4 @@ {{/if}} </li> </ul> -</div> \ No newline at end of file +</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs b/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs index b181aee..80967b9 100644 --- a/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs +++ b/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs @@ -17,17 +17,17 @@ }} <div class="has-hidden-info"> - <ul> - <li class="thumbnail row"> - <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} + <ul class="list-unstyled"> + <li class="img-thumbnail row"> + <a {{bindAttr class=":corner-icon :col-md-1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}> - <i class="icon-remove-sign icon-large"></i> + <i class="glyphicon-remove-sign glyphicon glyphicon-large"></i> </a> - <div class="caption span10"> {{view.title}}</div> + <div class="caption col-md-10"> {{view.title}}</div> {{#if view.isDataLoaded}} - <a class="corner-icon span1" href="#" {{action editWidget target="view"}}> - <i class="icon-edit"></i> + <a class="corner-icon col-md-1" href="#" {{action editWidget target="view"}}> + <i class="glyphicon glyphicon-edit"></i> </a> <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass" }}> @@ -45,4 +45,4 @@ {{/if}} </li> </ul> -</div> \ No newline at end of file +</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs b/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs index 6ee51fe..5a66ba5 100644 --- a/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs +++ b/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs @@ -17,14 +17,14 @@ }} <div class="has-hidden-info"> - <ul> - <li class="thumbnail row"> - <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} + <ul class="list-unstyled"> + <li class="img-thumbnail row"> + <a {{bindAttr class=":corner-icon :col-md-1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}> - <i class="icon-remove-sign icon-large"></i> + <i class="glyphicon-remove-sign glyphicon glyphicon-large"></i> </a> - <div class="caption span11"> {{view.title}} </div> + <div class="caption col-md-11"> {{view.title}} </div> {{#if view.isDataLoaded}} <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass"}}> <table align="center"> @@ -50,4 +50,4 @@ {{/if}} </li> </ul> -</div> \ No newline at end of file +</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/dashboard/widgets/yarn_links.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/widgets/yarn_links.hbs b/ambari-web/app/templates/main/dashboard/widgets/yarn_links.hbs index 884f322..eabb6dc 100644 --- a/ambari-web/app/templates/main/dashboard/widgets/yarn_links.hbs +++ b/ambari-web/app/templates/main/dashboard/widgets/yarn_links.hbs @@ -17,14 +17,14 @@ }} <div class="links"> - <ul> - <li class="thumbnail row"> - <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} + <ul class="list-unstyled"> + <li class="img-thumbnail row"> + <a {{bindAttr class=":corner-icon :col-md-1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}> - <i class="icon-remove-sign icon-large"></i> + <i class="glyphicon-remove-sign glyphicon glyphicon-large"></i> </a> - <div class="caption span10"> {{view.title}}</div> + <div class="caption col-md-10"> {{view.title}}</div> {{#if view.isDataLoaded}} <div class="widget-content"> <table> @@ -48,10 +48,10 @@ {{#if view.model.quickLinks.length}} {{#view App.QuickViewLinks contentBinding="view.model"}} <div class="btn-group"> - <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#"> + <button class="btn btn-xs dropdown-toggle" data-toggle="dropdown" href="#"> {{t common.more}} <span class="caret"></span> - </a> + </button> <ul class="dropdown-menu"> {{#if view.isLoaded}} {{#if view.quickLinksArray}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host.hbs b/ambari-web/app/templates/main/host.hbs index 38f1b9a..94dcfe2 100644 --- a/ambari-web/app/templates/main/host.hbs +++ b/ambari-web/app/templates/main/host.hbs @@ -71,22 +71,22 @@ </td> <td class="restart"> {{#if host.componentsWithStaleConfigsCount}} - <span class="muted icon-refresh" rel="ComponentsTooltip" {{bindAttr title="view.restartRequiredComponentsMessage"}}></span> + <span class="muted glyphicon glyphicon-refresh" rel="ComponentsTooltip" {{bindAttr title="view.restartRequiredComponentsMessage"}}></span> {{/if}} </td> <td class="passive-state"> <span rel="ComponentsTooltip" {{bindAttr data-original-title="view.componentsInPassiveStateMessage" class="host.componentsInPassiveStateCount:icon-medkit"}}></span> </td> <td class="host-ip">{{host.ip}}</td> - <td rel="UsageTooltip" {{bindAttr data-original-title="host.rack"}} class="rack-id"> - {{host.rack}} + <td class="rack-id"> + <span rel="UsageTooltip" {{bindAttr data-original-title="host.rack"}}>{{host.rack}}</span> </td> <td class="cores-formatted">{{host.coresFormatted}}</td> <td class="memory-formatted">{{host.memoryFormatted}}</td> <td class="disk-info"> - <div class="progress progress-info" {{bindAttr data-original-title="host.diskInfoBar"}} rel="UsageTooltip"> - <div class="bar" {{bindAttr style="view.usageStyle"}}></div> + <div class="progress" {{bindAttr data-original-title="host.diskInfoBar"}} rel="UsageTooltip"> + <div class="progress-bar progress-bar-info" {{bindAttr style="view.usageStyle"}}></div> </div> </td> @@ -119,23 +119,21 @@ </div> <div class="page-bar"> - <div class="selected-hosts-info span4"> + <div class="selected-hosts-info col-md-4"> {{#if view.showSelectedFilter}} <div> <a {{action filterSelected target="view"}} href="#"> {{view.selectedHosts.length}} {{pluralize view.selectedHostsCount singular="t:hosts.filters.selectedHostInfo" plural="t:hosts.filters.selectedHostsInfo"}} </a> - </div> - <a {{action clearSelection target="view"}} href="#">{{t hosts.filters.clearSelection}}</a> + - <a {{action clearSelection target="view"}} href="#">{{t hosts.filters.clearSelection}}</a> + </div> {{/if}} </div> <div class="items-on-page"> <label>{{t common.show}}: {{view view.rowsPerPageSelectView selectionBinding="view.displayLength"}}</label> </div> <div class="info">{{view.paginationInfo}}</div> - <div class="paging_two_button"> - <a {{bindAttr class="view.paginationLeftClass"}}{{action previousPage target="view"}}><i class="icon-arrow-left"></i></a> - <a {{bindAttr class="view.paginationRightClass"}}{{action nextPage target="view"}}><i class="icon-arrow-right"></i></a> - </div> + {{view view.pagination2Btns}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/add.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/add.hbs b/ambari-web/app/templates/main/host/add.hbs index 77110d9..dcaf884 100644 --- a/ambari-web/app/templates/main/host/add.hbs +++ b/ambari-web/app/templates/main/host/add.hbs @@ -18,12 +18,8 @@ <div class="wizard"> <div class="container"> - <div class="container-fluid"> - - <!--<a class="btn back" {{action backToHostsList}}>\u2190 Back to Hosts</a>--> - - <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"> @@ -38,7 +34,7 @@ </ul> </div> </div> - <div class="wizard-content well span9"> + <div class="wizard-content well col-md-9"> {{#if view.isLoaded}} {{outlet}} {{else}} @@ -46,6 +42,5 @@ {{/if}} </div> </div> - </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/addHost/step4.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/addHost/step4.hbs b/ambari-web/app/templates/main/host/addHost/step4.hbs index 132d10b..56b16d7 100644 --- a/ambari-web/app/templates/main/host/addHost/step4.hbs +++ b/ambari-web/app/templates/main/host/addHost/step4.hbs @@ -33,11 +33,14 @@ <tr {{bindAttr id="service.serviceId"}}> <td>{{service.displayName}}</td> <td> - {{ - view Ember.Select - contentBinding="service.configGroupsNames" - selectionBinding="service.selectedConfigGroup" - }} + <div class="col-md-6"> + {{ + view Ember.Select + contentBinding="service.configGroupsNames" + selectionBinding="service.selectedConfigGroup" + classNames="form-control" + }} + </div> </td> </tr> {{/each}} @@ -45,7 +48,7 @@ </table> </div> <div class="btn-area"> - <button class="btn" {{bindAttr disabled="App.router.btnClickInProgress"}} {{action back}}> + <button class="btn btn-default" {{bindAttr disabled="App.router.btnClickInProgress"}} {{action back}}> ← {{t common.back}} {{#if App.router.backBtnClickInProgress}} {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/bulk_operation_confirm_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/bulk_operation_confirm_popup.hbs b/ambari-web/app/templates/main/host/bulk_operation_confirm_popup.hbs index 1d0cab3..e9f55a9 100644 --- a/ambari-web/app/templates/main/host/bulk_operation_confirm_popup.hbs +++ b/ambari-web/app/templates/main/host/bulk_operation_confirm_popup.hbs @@ -19,7 +19,7 @@ <p>{{{view.message}}}</p> <div class="task-top-wrap"> <div class="task-detail-ico-wrap"> - <a href="#" title="Click to Copy" {{action "textTrigger"}} class="task-detail-copy"><i class="icon-copy"></i> {{t common.copy}}</a> + <a href="#" title="Click to Copy" {{action "textTrigger"}} class="task-detail-copy"><i class="glyphicon glyphicon-copy"></i> {{t common.copy}}</a> </div> </div> <div class="task-detail-log-info"> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/bulk_operation_menu.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/bulk_operation_menu.hbs b/ambari-web/app/templates/main/host/bulk_operation_menu.hbs index 543deb0..29bedf8 100644 --- a/ambari-web/app/templates/main/host/bulk_operation_menu.hbs +++ b/ambari-web/app/templates/main/host/bulk_operation_menu.hbs @@ -17,10 +17,10 @@ }} <div class="dropdown bulk-menu"> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">{{t common.actions}} <span class="caret"></span></a> + <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">{{t common.actions}} <span class="caret"></span></button> <ul class="dropdown-menu"> {{#isAuthorized "HOST.ADD_DELETE_HOSTS"}} - <li><a href="#" {{action addHost}}><i class="icon-plus icon-white"></i> {{t hosts.host.add}}</a></li> + <li><a href="#" {{action addHost}}><i class="glyphicon glyphicon-plus glyphicon-white"></i> {{t hosts.host.add}}</a></li> <li class="divider"></li> {{/isAuthorized}} <li class="dropdown-submenu"> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/combo_search_box.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/combo_search_box.hbs b/ambari-web/app/templates/main/host/combo_search_box.hbs index 6b118a9..38b1d97 100644 --- a/ambari-web/app/templates/main/host/combo_search_box.hbs +++ b/ambari-web/app/templates/main/host/combo_search_box.hbs @@ -18,7 +18,7 @@ {{#if App.supports.hostComboSearchBox}} <br/> {{#if view.errMsg}} -<div class="alert alert-error"> +<div class="alert alert-danger"> {{view.errMsg}} </div> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/configs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/configs.hbs b/ambari-web/app/templates/main/host/configs.hbs index f9d85ce..a6a7532 100644 --- a/ambari-web/app/templates/main/host/configs.hbs +++ b/ambari-web/app/templates/main/host/configs.hbs @@ -17,11 +17,11 @@ }} {{#if view.isConfigAvailable}} - <div class="row-fluid"> - <div class="well span2 services-host-menu"> + <div class="row host-configs"> + <div class="well col-md-2 services-host-menu"> {{view App.MainHostServiceMenuView}} </div> - <div class="span10"> + <div class="col-md-10"> {{outlet service_config_outlet}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/decommission.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/decommission.hbs b/ambari-web/app/templates/main/host/decommission.hbs index 03d5937..11f34ec 100644 --- a/ambari-web/app/templates/main/host/decommission.hbs +++ b/ambari-web/app/templates/main/host/decommission.hbs @@ -17,9 +17,6 @@ }} -<li rel='decommissionTooltip' {{bindAttr data-original-title="view.parentView.decommissionTooltipMessage" class="view.parentView.noActionAvailable"}}> - <a href="javascript:void(null)" data-toggle="modal" {{bindAttr class="view.parentView.isComponentDecommissionDisable:disabled"}}> - {{view.text}} - </a> -</li> - +<a href="javascript:void(null)" rel="decommissionTooltip" {{bindAttr data-original-title="view.parentView.decommissionTooltipMessage" class="view.parentView.noActionAvailable view.parentView.isComponentDecommissionDisable:disabled"}} data-toggle="modal"> + {{view.text}} +</a> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/delete_hosts_dry_run_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/delete_hosts_dry_run_popup.hbs b/ambari-web/app/templates/main/host/delete_hosts_dry_run_popup.hbs index 7424459..44ebf69 100644 --- a/ambari-web/app/templates/main/host/delete_hosts_dry_run_popup.hbs +++ b/ambari-web/app/templates/main/host/delete_hosts_dry_run_popup.hbs @@ -17,18 +17,16 @@ }} <p>{{{view.message}}}</p> {{#each host in view.undeletableHosts}} - <div class="accordion"> - <div class="accordion-heading" {{action "onToggleHost" host target="view"}}> - <i {{bindAttr class=":pull-left :accordion-toggle host.isCollapsed:icon-caret-right:icon-caret-down"}}></i> - <a class="accordion-toggle"> + <div class="panel panel-default"> + <div class="panel-heading" {{action "onToggleHost" host target="view"}}> + <i {{bindAttr class=":pull-left :panel-toggle host.isCollapsed:icon-caret-right:icon-caret-down"}}></i> + <a class="panel-toggle"> <p>{{host.error.key}}</p> </a> </div> - <div class="accordion-body collapse in" {{bindAttr style="host.isBodyVisible"}}> - <div class="accordion-inner"> - <p>{{host.error.message}}</p> - </div> + <div class="panel-body collapse in" {{bindAttr style="host.isBodyVisible"}}> + <p>{{host.error.message}}</p> </div> </div> {{/each}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/delete_hosts_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/delete_hosts_popup.hbs b/ambari-web/app/templates/main/host/delete_hosts_popup.hbs index d45dab8..ba7c884c 100644 --- a/ambari-web/app/templates/main/host/delete_hosts_popup.hbs +++ b/ambari-web/app/templates/main/host/delete_hosts_popup.hbs @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -<p><i class="icon-warning-sign"></i> {{t hosts.bulkOperation.deleteHosts.confirmation.body}}</p> +<p><i class="glyphicon glyphicon-warning-sign"></i> {{t hosts.bulkOperation.deleteHosts.confirmation.body}}</p> {{#each host in view.hosts}} <div><i>{{{host.deleted.key}}}</i></div> {{/each}} <br /> -<div class='alert'>{{{t common.important.strong}}} +<div class='alert alert-warning'>{{{t common.important.strong}}} {{t hosts.bulkOperation.deleteHosts.confirmation.body.msg1}} </div> -<div class='alert'> +<div class='alert alert-warning'> {{t hosts.bulkOperation.deleteHosts.confirmation.body.msg2}} <span style="color: red;">{{t hosts.bulkOperation.deleteHosts.confirmation.body.msg3}}</span> </div> -<div class='alert'>{{{t common.important.strong}}} {{t hosts.bulkOperation.deleteHosts.confirmation.body.msg4}}</div> \ No newline at end of file +<div class='alert alert-warning'>{{{t common.important.strong}}} {{t hosts.bulkOperation.deleteHosts.confirmation.body.msg4}}</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/delete_hosts_result_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/delete_hosts_result_popup.hbs b/ambari-web/app/templates/main/host/delete_hosts_result_popup.hbs index 9e9c772..eb6f89c 100644 --- a/ambari-web/app/templates/main/host/delete_hosts_result_popup.hbs +++ b/ambari-web/app/templates/main/host/delete_hosts_result_popup.hbs @@ -26,18 +26,16 @@ {{#if view.undeletableHosts}} <p>{{{view.message}}}</p> {{#each undeletableHost in view.undeletableHosts}} - <div class="accordion"> - <div class="accordion-heading" {{action "onToggleHost" undeletableHost target="view"}}> - <i {{bindAttr class=":pull-left :accordion-toggle undeletableHost.isCollapsed:icon-caret-right:icon-caret-down"}}></i> - <a class="accordion-toggle"> + <div class="panel panel-default"> + <div class="panel-heading" {{action "onToggleHost" undeletableHost target="view"}}> + <i {{bindAttr class=":pull-left :panel-toggle undeletableHost.isCollapsed:icon-caret-right:icon-caret-down"}}></i> + <a class="panel-toggle"> <p>{{undeletableHost.error.key}}</p> </a> </div> - <div class="accordion-body collapse in" {{bindAttr style="undeletableHost.isBodyVisible"}}> - <div class="accordion-inner"> - <p>{{undeletableHost.error.message}}</p> - </div> + <div class="panel-body collapse in" {{bindAttr style="undeletableHost.isBodyVisible"}}> + <p>{{undeletableHost.error.message}}</p> </div> </div> {{/each}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/details.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/details.hbs b/ambari-web/app/templates/main/host/details.hbs index f709612..630f0da 100644 --- a/ambari-web/app/templates/main/host/details.hbs +++ b/ambari-web/app/templates/main/host/details.hbs @@ -27,16 +27,16 @@ {{/unless}} </div> <div><a href="javascript:void(null)" id="host-details-back-btn" data-toggle="modal" {{action back}}><i - class="icon-arrow-left"></i> {{t common.back}}</a></div> + class="glyphicon glyphicon-arrow-left"></i> {{t common.back}}</a></div> </div> <div class="content"> {{view App.MainHostMenuView hostBinding="view.content"}} <div class="service-button"> <div class="btn-group display-inline-block"> - <a href="javascript:void(null)" {{bindAttr class=":btn :dropdown-toggle"}} id="host-details-action-btn" data-toggle="dropdown"> + <button href="javascript:void(null)" {{bindAttr class=":btn :btn-default :dropdown-toggle"}} id="host-details-action-btn" data-toggle="dropdown"> {{t hosts.host.details.hostActions}} <span class="caret"></span> - </a> + </button> <ul class="dropdown-menu pull-right"> <!-- dropdown menu links --> {{#each option in view.maintenance}} @@ -47,7 +47,7 @@ {{/each}} {{#if view.clients}} <li class="dropdown-submenu submenu-left"> - <a><i class="icon-download-alt"></i> {{t services.service.actions.downloadClientConfigs}}</a> + <a><i class="glyphicon glyphicon-download-alt"></i> {{t services.service.actions.downloadClientConfigs}}</a> <div class="dropdown-menu-wrap"> <ul class="dropdown-menu"> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/details/deleteComponentPopup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/details/deleteComponentPopup.hbs b/ambari-web/app/templates/main/host/details/deleteComponentPopup.hbs index 4fd5c52..afbe4e8 100644 --- a/ambari-web/app/templates/main/host/details/deleteComponentPopup.hbs +++ b/ambari-web/app/templates/main/host/details/deleteComponentPopup.hbs @@ -18,23 +18,23 @@ <p>{{{deleteComponentMsg}}}</p> {{#if lastComponent}} - <div class="alert-error row-fluid"> + <div class="alert alert-danger row"> <div class='tinyspan tinyoffset'>{{view Ember.Checkbox checkedBinding="isChecked"}}</div> - <div class='span10'>{{{lastComponentError}}}</div> + <div class='col-md-10'>{{{lastComponentError}}}</div> </div> {{/if}} {{#if isZkServer}} - <div class='alert'>{{{deleteZkServerMsg}}}</div> + <div class='alert alert-warning'>{{{deleteZkServerMsg}}}</div> {{/if}} {{#if isHiveMetastore}} - <div class='alert'>{{{deleteHiveMetastoreMsg}}}</div> + <div class='alert alert-warning'>{{{deleteHiveMetastoreMsg}}}</div> {{/if}} {{#if isWebHCatServer}} - <div class='alert'>{{{deleteWebHCatServerMsg}}}</div> + <div class='alert alert-warning'>{{{deleteWebHCatServerMsg}}}</div> {{/if}} {{#if isNimbus}} - <div class='alert'>{{{deleteNimbusMsg}}}</div> + <div class='alert alert-warning'>{{{deleteNimbusMsg}}}</div> {{/if}} {{#if isRangerKMSServer}} - <div class='alert'>{{{deleteRangerKMSServereMsg}}}</div> + <div class='alert alert-warning'>{{{deleteRangerKMSServereMsg}}}</div> {{/if}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs b/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs index fa4845e..f54d4ec 100644 --- a/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs +++ b/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs @@ -18,27 +18,27 @@ {{#if unknownComponents}} {{t hosts.delete.popup.unknownComponents}} <br /><br /> - <div class='row-fluid'> - <div class='tinyoffset span10'> + <div class='row'> + <div class='tinyoffset col-md-10'> <i>{{unknownComponents}}</i> </div> </div> <br /> {{/if}} -<p><i class="icon-warning-sign"></i> {{{deletePopupBody}}}</p> +<p><i class="glyphicon glyphicon-warning-sign"></i> {{{deletePopupBody}}}</p> {{#if lastComponent}} - <div class="alert-error row-fluid"> + <div class="alert alert-danger row"> <div class='tinyspan tinyoffset'>{{view Ember.Checkbox checkedBinding="isChecked"}}</div> - <div class='span10'>{{view lastComponentError}}</div> + <div class='col-md-10'>{{view lastComponentError}}</div> </div> {{/if}} <br /> {{#if toDecommissionComponents.length}} - <div class='alert'> + <div class='alert alert-warning'> {{view decommissionWarning}} </div> {{/if}} -<div class='alert'>{{{t common.important.strong}}} +<div class='alert alert-warning'>{{{t common.important.strong}}} {{#if unknownComponents}} {{t hosts.delete.popup.body.msg.unknownComponents}} {{/if}} @@ -46,7 +46,7 @@ </div> {{#unless unknownComponents}} - <div class='alert'> + <div class='alert alert-warning'> <!-- Agent is still online, so host record will be re-inserted on next heartbeat. --> {{t hosts.delete.popup.body.msg5}} <span style="color: red;">{{t hosts.delete.popup.body.msg6}}</span> @@ -54,4 +54,4 @@ {{/unless}} -<div class='alert'>{{{t common.important.strong}}} {{t hosts.delete.popup.body.msg3}}</div> +<div class='alert alert-warning'>{{{t common.important.strong}}} {{t hosts.delete.popup.body.msg3}}</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/details/host_component.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/details/host_component.hbs b/ambari-web/app/templates/main/host/details/host_component.hbs index e25eed5..9797a03 100644 --- a/ambari-web/app/templates/main/host/details/host_component.hbs +++ b/ambari-web/app/templates/main/host/details/host_component.hbs @@ -16,12 +16,12 @@ * limitations under the License. }} -<div class="span7 component-label host-component-block"> +<div class="col-md-7 component-label host-component-block"> <div class="health-icon-block"> {{#if view.isUpgradeFailed}} {{#isAuthorized "HOST.ADD_DELETE_COMPONENTS"}} <a href="#" {{action "upgradeComponent" view.content target="controller"}} > - <i title="Component upgrade failed" class="components-health icon-arrow-up"></i> + <i title="Component upgrade failed" class="components-health glyphicon glyphicon-arrow-up"></i> </a> {{/isAuthorized}} {{else}} @@ -39,7 +39,7 @@ </div> <div class="refresh-icon-block"> {{#if component.staleConfigs}} - <span class="text-warning icon-refresh"></span> + <span class="text-warning glyphicon glyphicon-refresh"></span> {{/if}} </div> <div class="medkit-icon-block"> @@ -48,13 +48,13 @@ {{/unless}} </div> </div> -<div class="span5 pull-right"> +<div class="col-md-5 pull-right"> {{#isAuthorized "SERVICE.DECOMMISSION_RECOMMISSION"}} <div class="btn-group pull-right"> - <a {{ bindAttr class="view.disabled :btn :dropdown-toggle"}} data-toggle="dropdown"> + <button {{ bindAttr class="view.disabled :btn :btn-default :dropdown-toggle"}} data-toggle="dropdown"> {{view.componentTextStatus}} - <span class="caret pull-right"></span> - </a> + <span class="caret pull-right button-caret-margin"></span> + </button> <ul class="dropdown-menu"> {{#if view.isComponentDecommissionAvailable}} {{view view.decommissionView}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs b/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs index 46129aa..e83e76a 100644 --- a/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs +++ b/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs @@ -18,10 +18,10 @@ <div class="dialog-delete-component"> <div class="warning"> - <i class="icon-warning-sign"></i> <strong>{{componentsBody}}</strong> + <i class="glyphicon glyphicon-warning-sign"></i> <strong>{{componentsBody}}</strong> </div> - <div class="row-fluid"> - <div class="tinyoffset span10 warning-list"> + <div class="row"> + <div class="tinyoffset col-md-10 warning-list"> {{componentsStr}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/host_alerts.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/host_alerts.hbs b/ambari-web/app/templates/main/host/host_alerts.hbs index 658f1b0..8232efe 100644 --- a/ambari-web/app/templates/main/host/host_alerts.hbs +++ b/ambari-web/app/templates/main/host/host_alerts.hbs @@ -75,23 +75,18 @@ {{/if}} <div class="page-bar"> - <div class="filtered-info span4"> + <div class="filtered-info col-md-4"> {{#if view.showFilteredContent}} <label>{{view.filteredContentInfo}} - <a {{action clearFilters target="view"}} href="#">{{t tableView.filters.clearAllFilters}}</a></label> {{/if}} </div> - <div class="selected-hosts-info span4"> + <div class="selected-hosts-info col-md-4"> </div> <div class="items-on-page"> <label>{{t common.show}}: {{view view.rowsPerPageSelectView selectionBinding="view.displayLength"}}</label> </div> <div class="info">{{view.paginationInfo}}</div> - <div class="paging_two_button"> - <a {{bindAttr class="view.paginationLeftClass"}}{{action previousPage target="view"}}><i - class="icon-arrow-left"></i></a> - <a {{bindAttr class="view.paginationRightClass"}}{{action nextPage target="view"}}><i - class="icon-arrow-right"></i></a> - </div> + {{view view.pagination2Btns}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/log_metrics.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/log_metrics.hbs b/ambari-web/app/templates/main/host/log_metrics.hbs index 22a39be..cdc29be 100644 --- a/ambari-web/app/templates/main/host/log_metrics.hbs +++ b/ambari-web/app/templates/main/host/log_metrics.hbs @@ -16,9 +16,9 @@ * limitations under the License. }} -<div class="row-fluid log-metrics-charts mtl"> +<div class="row log-metrics-charts mtl"> {{#each item in view.logsData}} - <div class="span6 text-center mtl"> + <div class="col-md-6 text-center mtl"> {{view view.chartView contentBinding="item"}} <a href="#" {{action transitionByService item target="view"}}>{{item.service.displayName}}</a> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/logs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/logs.hbs b/ambari-web/app/templates/main/host/logs.hbs index c7f695b..3489cee 100644 --- a/ambari-web/app/templates/main/host/logs.hbs +++ b/ambari-web/app/templates/main/host/logs.hbs @@ -41,7 +41,7 @@ <a {{action openLogFile row file.filePath target="view.parentView"}} href="#" rel="log-file-name-tooltip" {{bindAttr data-original-title="file.filePath"}}>{{file.fileName}}</a> {{#view App.LogSearchUILinkView linkQueryParamsBinding="file.linkTail" tagName="span"}} <a {{bindAttr href="view.formatedLink"}} target="_blank" rel="log-file-name-tooltip" {{translateAttr title="popup.logTail.openInLogSearch"}} class="pull-right external-link"> - <i class="icon-external-link"></i> + <i class="glyphicon glyphicon-external-link"></i> {{t popup.logTail.openInLogSearch}} </a> {{/view}} @@ -55,7 +55,7 @@ </table> <div class="page-bar"> - <div class="filtered-info span4"> + <div class="filtered-info col-md-4"> {{#if view.showFilteredContent}} <label>{{view.filteredContentInfo}} - <a {{action clearFilters target="view"}} href="#">{{t tableView.filters.clearAllFilters}}</a></label> @@ -65,8 +65,5 @@ <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.paginationLeft}} - {{view view.paginationRight}} - </div> + {{view view.pagination2Btns}} </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/rack_id_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/rack_id_popup.hbs b/ambari-web/app/templates/main/host/rack_id_popup.hbs index b129690..fbad317 100644 --- a/ambari-web/app/templates/main/host/rack_id_popup.hbs +++ b/ambari-web/app/templates/main/host/rack_id_popup.hbs @@ -17,9 +17,11 @@ }} <div id="host-rack-id-popup"> - <div {{bindAttr class=":control-group :inline view.isValid::error"}}> + <div {{bindAttr class=":form-group :list-inline view.isValid::has-error"}}> <span>{{t hostPopup.RackId}}: </span> {{view Em.TextField valueBinding="view.parentView.rackId" class="input-xlarge"}} - <span class="help-inline">{{view.errorMessage}}</span> + {{#if view.errorMessage}} + <span class="help-block validation-block">{{view.errorMessage}}</span> + {{/if}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/stack_versions.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/stack_versions.hbs b/ambari-web/app/templates/main/host/stack_versions.hbs index c9ab67f..1cf02fe 100644 --- a/ambari-web/app/templates/main/host/stack_versions.hbs +++ b/ambari-web/app/templates/main/host/stack_versions.hbs @@ -41,7 +41,7 @@ <span class="label label-success">{{t common.current}}</span> {{else}} {{#if version.isInstalling}} - <a href="#" {{action showInstallProgress version target="view"}}><i class="icon-cog in_progress"></i> {{version.displayStatus}}</a> + <a href="#" {{action showInstallProgress version target="view"}}><i class="glyphicon glyphicon-cog in_progress"></i> {{version.displayStatus}}</a> {{else}} {{version.displayStatus}} {{#if version.isOutOfSync}} @@ -52,7 +52,7 @@ </td> <td class="install-repo-version align-center"> {{#isAuthorized "AMBARI.MANAGE_STACK_VERSIONS"}} - <button class="btn" {{action installVersionConfirmation version target="controller"}} {{bindAttr disabled="version.installDisabled"}}><i class="icon-off"></i> {{t common.install}}</button> + <button class="btn btn-default" {{action installVersionConfirmation version target="controller"}} {{bindAttr disabled="version.installDisabled"}}><i class="glyphicon glyphicon-off"></i> {{t common.install}}</button> {{/isAuthorized}} </td> </tr> @@ -68,7 +68,7 @@ </table> <div class="page-bar"> - <div class="filtered-info span4"> + <div class="filtered-info col-md-4"> {{#if view.showFilteredContent}} <label>{{view.filteredContentInfo}} - <a {{action clearFilters target="view"}} href="#">{{t tableView.filters.clearAllFilters}}</a></label> @@ -78,8 +78,5 @@ <label>{{t common.show}}: {{view view.rowsPerPageSelectView selectionBinding="view.parentView.displayLength"}}</label> </div> <div class="info">{{view.paginationInfo}}</div> - <div class="paging_two_button"> - {{view view.paginationLeft}} - {{view view.paginationRight}} - </div> + {{view view.pagination2Btns}} </div>
