http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/host/summary.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/summary.hbs b/ambari-web/app/templates/main/host/summary.hbs index 7cf3314..1ec0ac6 100644 --- a/ambari-web/app/templates/main/host/summary.hbs +++ b/ambari-web/app/templates/main/host/summary.hbs @@ -16,173 +16,186 @@ * limitations under the License. }} -<div class="row-fluid host-block"> - <div class="span12"> - <div class="span6"> +<div class="row host-block"> + <div class="col-md-6"> {{!components}} - <div class="box"> - <div class="box-header"> - <div class="pull-left"> - <h4>{{t common.components}}</h4> - </div> - <div class="pull-right span5 row-fluid" style="padding:0 10px;"> + <div class="box"> + <div class="box-header"> + <div class="pull-left"> + <h4>{{t common.components}}</h4> + </div> + <div class="pull-right col-md-5 row" style="padding:0 10px;"> {{#isAuthorized "HOST.ADD_DELETE_COMPONENTS"}} - <div class="btn-group pull-right"> - <button id="add_component" data-toggle="dropdown" {{bindAttr class="view.addComponentDisabled:disabled :btn :dropdown-toggle"}}> - <span class="icon-plus"></span> {{t add}} + <div class="btn-group pull-right col-md-6"> + <button id="add_component" + data-toggle="dropdown" {{bindAttr class="view.addComponentDisabled:disabled :btn :btn-default :dropdown-toggle"}}> + <span class="glyphicon glyphicon-plus"></span> {{t add}} </button> <ul class="dropdown-menu"> - {{#each component in view.addableComponents}} - <li> - <a href="javascript:void(null)" data-toggle="modal" {{action addComponentWithCheck component target="controller"}}> - {{component.displayName}} - </a> - </li> - {{/each}} + {{#each component in view.addableComponents}} + <li> + <a href="javascript:void(null)" + data-toggle="modal" {{action addComponentWithCheck component target="controller"}}> + {{component.displayName}} + </a> + </li> + {{/each}} </ul> </div> {{/isAuthorized}} - </div> </div> - <div class="host-components"> - {{#if view.sortedComponents.length}} + </div> + <div class="host-components"> + {{#if view.sortedComponents.length}} - {{#isAuthorized "SERVICE.MODIFY_CONFIGS, SERVICE.START_STOP, HOST.ADD_DELETE_COMPONENTS, HOST.TOGGLE_MAINTENANCE"}} - {{#if view.content.componentsWithStaleConfigsCount}} - <div class="alert alert-warning clearfix"> - <i class="icon-refresh"></i> {{view.needToRestartMessage}} - <button {{bindAttr class=":btn :restart-components :pull-right :btn-warning"}} {{action restartAllStaleConfigComponents target="controller"}}> - {{t hosts.host.details.needToRestart.button}} - </button> - </div> - {{/if}} - {{/isAuthorized}} + {{#isAuthorized "SERVICE.MODIFY_CONFIGS, SERVICE.START_STOP, HOST.ADD_DELETE_COMPONENTS, HOST.TOGGLE_MAINTENANCE"}} + {{#if view.content.componentsWithStaleConfigsCount}} + <div class="alert alert-warning clearfix restart-required"> + <i class="glyphicon glyphicon-refresh"></i> {{view.needToRestartMessage}} + <button {{bindAttr class=":btn :restart-components :pull-right :btn-warning"}} {{action restartAllStaleConfigComponents target="controller"}}> + {{t hosts.host.details.needToRestart.button}} + </button> + </div> + {{/if}} + {{/isAuthorized}} - {{#each component in view.sortedComponents}} - <div class="row-fluid"> - {{view component.viewClass contentBinding="component"}} - </div> - {{/each}} - {{/if}} + {{#each component in view.sortedComponents}} + <div class="row"> + {{view component.viewClass contentBinding="component"}} + </div> + {{/each}} + {{/if}} {{!clients and add component button}} - <div class="clients row-fluid"> - <div class="span7 row client-list"> + <div class="clients row"> + <div class="col-md-7 row client-list"> {{#if view.clients.length}} - <div class="span3 align-right">{{t common.clients}} /</div> - <div class="span7"> - {{#each component in view.clients}} - <span {{bindAttr class="component.staleConfigs:component-restart-required-name"}}> {{component.displayName}} </span> {{#if component.isInstallFailed}} <span class="health-status-installed icon-warning-sign"></span>{{/if}}{{#if component.staleConfigs}} <span class="text-warning icon-refresh"></span>{{/if}}{{#if component.service.isInPassive}} <span class="icon-medkit"></span>{{/if}}{{#unless component.isLast}},{{/unless}} - {{/each}} + <div class="col-md-3 align-right">{{t common.clients}} /</div> + <div class="col-md-7"> + {{#each component in view.clients}} + <span {{bindAttr class="component.staleConfigs:component-restart-required-name"}}> {{component.displayName}} </span> {{#if component.isInstallFailed}} + <span + class="health-status-installed icon-warning-sign"></span>{{/if}}{{#if component.staleConfigs}} + <span + class="text-warning glyphicon glyphicon-refresh"></span>{{/if}}{{#if component.service.isInPassive}} + <span class="icon-medkit"></span>{{/if}}{{#unless component.isLast}} + ,{{/unless}} + {{/each}} </div> {{/if}} - </div> - <div class="span5 row pull-right"> + </div> + <div class="col-md-5 pull-right"> {{#isAuthorized "SERVICE.MODIFY_CONFIGS, SERVICE.START_STOP, HOST.ADD_DELETE_COMPONENTS, HOST.TOGGLE_MAINTENANCE"}} - {{#if view.clients.length}} - <div class="btn-group pull-right"> - <button id="add_component" data-toggle="dropdown" {{bindAttr class=":btn :dropdown-toggle controller.content.isNotHeartBeating:disabled"}}> - {{t common.installed}} - <span class="caret pull-right"></span> - </button> - <ul class="dropdown-menu"> - <li> - <a href="javascript:void(null)" data-toggle="modal" {{action refreshConfigs view.clients target="controller"}}> - {{t hosts.host.details.refreshConfigs}} - </a> - </li> - <li> - <a href="javascript:void(null)" {{bindAttr class="view.areClientsNotInstalled::disabled" }} data-toggle="modal" {{action installClients target="view"}}> - {{t host.host.details.installClients}} - </a> - </li> - {{#if view.anyClientFailedToInstall}} + {{#if view.clients.length}} + <div class="btn-group pull-right"> + <button id="add_component" + data-toggle="dropdown" {{bindAttr class=":btn :btn-default :dropdown-toggle controller.content.isNotHeartBeating:disabled"}}> + {{t common.installed}} + <span class="caret pull-right button-caret-margin"></span> + </button> + <ul class="dropdown-menu"> <li> - <a href="javascript:void(null)" {{action reinstallClients target="view"}}> - {{t host.host.details.reinstallClients}} + <a href="javascript:void(null)" + data-toggle="modal" {{action refreshConfigs view.clients target="controller"}}> + {{t hosts.host.details.refreshConfigs}} </a> </li> - {{/if}} - {{#each option in view.clientsWithCustomCommands}} - <li class="dropdown-submenu submenu-left"> - <a href="javascript:void(null)" > - <i class="icon-play-circle"></i> - {{option.label}} + <li> + <a href="javascript:void(null)" {{bindAttr class="view.areClientsNotInstalled::disabled" }} + data-toggle="modal" {{action installClients target="view"}}> + {{t host.host.details.installClients}} </a> - <div class="dropdown-menu-wrap"> - <ul class="dropdown-menu"> - {{#each command in option.commands}} - <li> - <a href="javascript:void(null)" {{action "executeCustomCommand" command target="controller" href=true}}>{{command.label}}</a> - </li> - {{/each}} - </ul> - </div> </li> - {{/each}} - </ul> - </div> - {{/if}} + {{#if view.anyClientFailedToInstall}} + <li> + <a href="javascript:void(null)" {{action reinstallClients target="view"}}> + {{t host.host.details.reinstallClients}} + </a> + </li> + {{/if}} + {{#each option in view.clientsWithCustomCommands}} + <li class="dropdown-submenu submenu-left"> + <a href="javascript:void(null)"> + <i class="glyphicon glyphicon-play-circle"></i> + {{option.label}} + </a> + + <div class="dropdown-menu-wrap"> + <ul class="dropdown-menu"> + {{#each command in option.commands}} + <li> + <a + href="javascript:void(null)" {{action "executeCustomCommand" command target="controller" href=true}}>{{command.label}}</a> + </li> + {{/each}} + </ul> + </div> + </li> + {{/each}} + </ul> + </div> + {{/if}} {{/isAuthorized}} - </div> </div> </div> </div> - <div class="host-configuration"> - <div class="box"> - <div class="box-header"> - <h4>{{t hosts.host.summary.header}}</h4> - </div> - <div class="host-summary-content"> - <dl class="dl-horizontal host-details-summary-list"> + </div> + <div class="host-configuration"> + <div class="box"> + <div class="box-header"> + <h4>{{t hosts.host.summary.header}}</h4> + </div> + <div class="host-summary-content"> + <dl class="dl-horizontal host-details-summary-list"> - <dt class="summary-hostname-label">{{t hosts.host.summary.hostname}}:</dt> - <dd class="summary-hostname-value"> {{view.content.hostName}}</dd> + <dt class="summary-hostname-label">{{t hosts.host.summary.hostname}}:</dt> + <dd class="summary-hostname-value"> {{view.content.hostName}}</dd> - <dt class="summary-ipaddress-label">{{t common.ipAddress}}:</dt> - <dd class="summary-ipaddress-value"> {{view.content.ip}}</dd> + <dt class="summary-ipaddress-label">{{t common.ipAddress}}:</dt> + <dd class="summary-ipaddress-value"> {{view.content.ip}}</dd> - <dt class="summary-rack-label">{{t common.rack}}:</dt> - <dd class="summary-rack-value"> {{view.content.rack}} - {{#isAuthorized "HOST.TOGGLE_MAINTENANCE"}} - <a class="set-rack-id" {{action setRackId view.content target="controller"}}><i class="icon-pencil"></i></a> - {{/isAuthorized}} - </dd> + <dt class="summary-rack-label">{{t common.rack}}:</dt> + <dd class="summary-rack-value"> {{view.content.rack}} + {{#isAuthorized "HOST.TOGGLE_MAINTENANCE"}} + <a class="set-rack-id" {{action setRackId view.content target="controller"}}><i + class="glyphicon glyphicon-pencil"></i></a> + {{/isAuthorized}} + </dd> - <dt class="summary-os-label">{{t common.os}}:</dt> - <dd class="summary-os-value"> {{view.content.osType}} ({{view.content.osArch}})</dd> + <dt class="summary-os-label">{{t common.os}}:</dt> + <dd class="summary-os-value"> {{view.content.osType}} ({{view.content.osArch}})</dd> - <dt class="summary-cores-label">{{t common.cores.cpu}}:</dt> - <dd class="summary-cores-value"> {{view.content.coresFormatted}}</dd> + <dt class="summary-cores-label">{{t common.cores.cpu}}:</dt> + <dd class="summary-cores-value"> {{view.content.coresFormatted}}</dd> - <dt class="summary-disk-label">{{t common.disk}}:</dt> - <dd class="summary-disk-value"> {{view.content.diskInfoBar}}</dd> + <dt class="summary-disk-label">{{t common.disk}}:</dt> + <dd class="summary-disk-value"> {{view.content.diskInfoBar}}</dd> - <dt class="summary-memory-label">{{t common.memory}}:</dt> - <dd class="summary-memory-value"> {{view.content.memoryFormatted}}</dd> + <dt class="summary-memory-label">{{t common.memory}}:</dt> + <dd class="summary-memory-value"> {{view.content.memoryFormatted}}</dd> - <dt class="summary-load-avg-label">{{t common.loadAvg}}:</dt> - <dd class="summary-load-avg-value"> {{view.content.loadAvg}}</dd> + <dt class="summary-load-avg-label">{{t common.loadAvg}}:</dt> + <dd class="summary-load-avg-value"> {{view.content.loadAvg}}</dd> - <dt class="summary-agent-heart-label">{{t hosts.host.summary.agentHeartbeat}}:</dt> - <dd class="summary-agent-heart-value"> {{view.timeSinceHeartBeat}}</dd> + <dt class="summary-agent-heart-label">{{t hosts.host.summary.agentHeartbeat}}:</dt> + <dd class="summary-agent-heart-value"> {{view.timeSinceHeartBeat}}</dd> - <dt class="summary-cur-ver-label">{{t hosts.host.summary.currentVersion}}:</dt> - <dd class="summary-cur-ver-value"> {{view.content.currentVersion}}</dd> - </dl> - </div> - </div> + <dt class="summary-cur-ver-label">{{t hosts.host.summary.currentVersion}}:</dt> + <dd class="summary-cur-ver-value"> {{view.content.currentVersion}}</dd> + </dl> </div> + </div> </div> - <div class="span6"> + </div> + <div class="col-md-6"> {{!metrics}} {{#unless view.isNoHostMetricsService}} <div class="box"> <div class="box-header"> <h4>{{t hosts.host.summary.hostMetrics}}</h4> - {{view view.timeRangeListView}} + {{view view.timeRangeListView}} </div> <div> - {{view App.MainHostMetricsView contentBinding="view.content"}} + {{view App.MainHostMetricsView contentBinding="view.content"}} </div> </div> {{/unless}} @@ -194,10 +207,9 @@ <h4>{{t hosts.host.summary.hostLogMetrics}}</h4> </div> <div> - {{view App.MainHostLogMetrics contentBinding="view.content"}} + {{view App.MainHostLogMetrics contentBinding="view.content"}} </div> </div> {{/if}} - </div> </div> </div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/menu_item.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/menu_item.hbs b/ambari-web/app/templates/main/menu_item.hbs index 0f8d6a9..0021445 100644 --- a/ambari-web/app/templates/main/menu_item.hbs +++ b/ambari-web/app/templates/main/menu_item.hbs @@ -26,16 +26,16 @@ {{view App.TopNavServiceMenuView}} {{/if}} {{#if view.isAdminItem}} - <ul class="top-nav-dropdown-menu"> + <ul class="top-nav-dropdown-menu dropdown-menu"> {{#each category in view.dropdownCategories}} - {{#view view.AdminDropdownItemView itemBinding="category.name" }} + {{#view view.AdminDropdownItemView itemBinding="category.name"}} <a href="#" {{action "goToCategory" category.url target="view"}}>{{category.label}}</a> {{/view}} {{/each}} </ul> {{/if}} {{#if view.isViewsItem}} - <ul class="top-nav-dropdown-menu"> + <ul class="top-nav-dropdown-menu dropdown-menu"> {{#if view.content.views.length}} {{#each category in view.content.views}} <li><a href="#" {{action "setView" category target="App.router.mainViewsController"}}>{{category.label}}</a></li> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service.hbs b/ambari-web/app/templates/main/service.hbs index 3a4f786..6cfb591 100644 --- a/ambari-web/app/templates/main/service.hbs +++ b/ambari-web/app/templates/main/service.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="span10 summary-width"> + <div class="col-md-10 summary-width"> {{outlet}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/add.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/add.hbs b/ambari-web/app/templates/main/service/add.hbs index 4a4da2e..b6eb22a 100644 --- a/ambari-web/app/templates/main/service/add.hbs +++ b/ambari-web/app/templates/main/service/add.hbs @@ -18,12 +18,11 @@ <div class="wizard"> <div class="container"> - <div class="container-fluid"> - <!--<a class="btn back" {{action backToServices}}>â Back to Services</a>--> + <!--<a class="btn btn-default back" {{action backToServices}}>â Back to Services</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"> @@ -39,10 +38,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/service/all_services_actions.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/all_services_actions.hbs b/ambari-web/app/templates/main/service/all_services_actions.hbs index 081d3eb..b68c575 100644 --- a/ambari-web/app/templates/main/service/all_services_actions.hbs +++ b/ambari-web/app/templates/main/service/all_services_actions.hbs @@ -18,17 +18,17 @@ {{#isAuthorized "SERVICE.START_STOP, SERVICE.ADD_DELETE_SERVICES"}} <div class="service-button" style="margin-top: 10px;"> - <div class="btn-group display-inline-block span11 offset1"> - <a class="btn dropdown-toggle span10" data-toggle="dropdown" href="#">{{t common.actions}} + <div class="btn-group display-inline-block col-md-11 col-md-offset-1"> + <button class="btn btn-default dropdown-toggle col-md-10" data-toggle="dropdown" href="#">{{t common.actions}} <span class="caret"></span> - </a> + </button> <ul class="pull-left dropdown-menu"> {{#isAuthorized "SERVICE.ADD_DELETE_SERVICES"}} <li {{bindAttr class="view.serviceController.isAllServicesInstalled:disabled :add-service-button"}}> <a href="#" {{bindAttr class="view.serviceController.isAllServicesInstalled:disabled"}} {{action gotoAddService target="view.serviceController"}}> - <i class="icon-plus icon-white"></i> {{t services.service.add}}</a> + <i class="glyphicon glyphicon-plus glyphicon-white"></i> {{t services.service.add}}</a> </li> {{/isAuthorized}} {{#isAuthorized "SERVICE.START_STOP"}} @@ -37,7 +37,7 @@ <a href="#" data-toggle="modal" {{bindAttr class="view.serviceController.isStartAllDisabled:disabled" }} {{action "startAllService" target="view.serviceController"}}> - <i {{bindAttr class=":icon-play view.serviceController.isStartAllDisabled:disabled:enabled " }}></i> + <i {{bindAttr class=":glyphicon glyphicon-play view.serviceController.isStartAllDisabled:disabled:enabled " }}></i> {{t services.service.startAll}} </a> </li> @@ -45,7 +45,7 @@ <a href="#" data-toggle="modal" {{bindAttr class="view.serviceController.isStopAllDisabled:disabled" }} {{action "stopAllService" target="view.serviceController"}}> - <i {{bindAttr class=":icon-stop view.serviceController.isStopAllDisabled:disabled:enabled" }}></i> + <i {{bindAttr class=":glyphicon glyphicon-stop view.serviceController.isStopAllDisabled:disabled:enabled" }}></i> {{t services.service.stopAll}} </a> </li> @@ -53,7 +53,7 @@ <a href="#" data-toggle="modal" {{bindAttr class="view.serviceController.isRestartAllRequiredDisabled:disabled" }} {{action "restartAllRequired" target="view.serviceController"}}> - <i {{bindAttr class=":icon-repeat view.serviceController.isRestartAllRequiredDisabled:disabled:enabled" }}></i> + <i {{bindAttr class=":glyphicon glyphicon-repeat view.serviceController.isRestartAllRequiredDisabled:disabled:enabled" }}></i> {{t services.service.restartAllRequired}} </a> </li> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/info/configs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/configs.hbs b/ambari-web/app/templates/main/service/info/configs.hbs index 3cc8f06..738893c 100644 --- a/ambari-web/app/templates/main/service/info/configs.hbs +++ b/ambari-web/app/templates/main/service/info/configs.hbs @@ -21,14 +21,14 @@ {{#if controller.content.isRestartRequired}} {{#isAuthorized "SERVICE.START_STOP"}} <div> - <div class="alert alert-warning clearfix"> - <i class="icon-refresh"></i> {{t services.service.config.restartService.needToRestart}} <a + <div class="alert alert-warning clearfix restart-required"> + <i class="glyphicon glyphicon-refresh"></i> {{t services.service.config.restartService.needToRestart}} <a href="#" {{action "showComponentsShouldBeRestarted" controller.content target="controller"}}>{{view.componentsCount}} {{pluralize view.componentsCount singular="t:common.component" plural="t:common.components"}}</a> {{t on}} <a href="#" {{action "showHostsShouldBeRestarted" controller.content target="controller"}}>{{view.hostsCount}} {{pluralize view.hostsCount singular="t:common.host" plural="t:common.hosts"}}</a> <span class="restart-components pull-right"> </span> <div class="btn-group pull-right"> - <button type="button" class="btn btn-default dropdown-toggle btn-warning" data-toggle="dropdown"> + <button type="button" class="btn dropdown-toggle btn-warning" data-toggle="dropdown"> {{t hosts.host.details.needToRestart.button}} <span class="caret"></span> </button> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/info/configs_save_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/configs_save_popup.hbs b/ambari-web/app/templates/main/service/info/configs_save_popup.hbs index 508135c..7d786cd 100644 --- a/ambari-web/app/templates/main/service/info/configs_save_popup.hbs +++ b/ambari-web/app/templates/main/service/info/configs_save_popup.hbs @@ -30,7 +30,7 @@ {{/unless}} {{#if view.isLoaded}} {{#if view.runningHosts}} - <i class="icon-warning-sign"></i> {{view.runningHostsMessage}} + <i class="glyphicon glyphicon-warning-sign"></i> {{view.runningHostsMessage}} <table class="table-striped running-host-components-table"> <tr><th>{{t common.host}}</th><th>{{t common.components}}</th></tr> {{#each host in view.runningHosts}} @@ -39,7 +39,7 @@ </table> {{/if}} {{#if view.unknownHosts}} - <i class="icon-warning-sign"></i> {{view.unknownHostsMessage}} + <i class="glyphicon glyphicon-warning-sign"></i> {{view.unknownHostsMessage}} <table class="table-striped running-host-components-table"> <tr><th>{{t common.host}}</th><th>{{t common.components}}</th></tr> {{#each host in view.unknownHosts}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/info/confirm_delete_service.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/confirm_delete_service.hbs b/ambari-web/app/templates/main/service/info/confirm_delete_service.hbs index cbe1f40..4ca1c73 100644 --- a/ambari-web/app/templates/main/service/info/confirm_delete_service.hbs +++ b/ambari-web/app/templates/main/service/info/confirm_delete_service.hbs @@ -19,5 +19,5 @@ {{{view.parentView.message}}} <div class="form-inline align-center"><br /> <label><strong>{{view.typeMessage}}</strong></label> - {{view Ember.TextField valueBinding="view.parentView.confirmInput" class="input-small"}}<br /> + {{view Ember.TextField valueBinding="view.parentView.confirmInput" class="input-sm"}}<br /> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs b/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs index 811a253..819db55 100644 --- a/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs +++ b/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs @@ -17,8 +17,8 @@ }} <div class="btn-group" id="select-metric-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" data-toggle="dropdown"> <span class="caret"></span> </button> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs b/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs index f8401ba..d32afdd 100644 --- a/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs +++ b/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs @@ -16,25 +16,25 @@ * limitations under the License. }} -<div {{bindAttr class=":accordion view.toggleIndex"}}> - <div class="accordion-group box"> - <div class="accordion-heading box-header"> - <span class="pull-left accordion-toggle metrics-header" +<div {{bindAttr class=":panel view.toggleIndex"}}> + <div class="panel-group box"> + <div class="panel-heading box-header"> + <div class="pull-left panel-toggle metrics-header" data-toggle="collapse" {{bindAttr dataParent="view.toggleIndex" href="view.toggleIndex"}}> - <i class="pull-left icon-caret-toggle"></i> - <span>{{view.header}}</span> - </span> + <h4> + <i class="pull-left glyphicon"></i> + {{view.header}} + </h4> + </div> {{#if showTimeRangeControl}} {{view view.timeRangeListView}} {{/if}} <div class="clearfix"></div> </div> - <div class="accordion-body collapse in" {{bindAttr id="view.id"}}> - <div class="accordion-inner"> - {{#if view.metricView}} - {{view view.metricView viewDataBinding="view.metricViewData"}} - {{/if}} - </div> + <div class="panel-body collapse in" {{bindAttr id="view.id"}}> + {{#if view.metricView}} + {{view view.metricView viewDataBinding="view.metricViewData"}} + {{/if}} </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/info/metrics/hive/hive_quick_links.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/metrics/hive/hive_quick_links.hbs b/ambari-web/app/templates/main/service/info/metrics/hive/hive_quick_links.hbs index 37f28b9..0c88f0a 100644 --- a/ambari-web/app/templates/main/service/info/metrics/hive/hive_quick_links.hbs +++ b/ambari-web/app/templates/main/service/info/metrics/hive/hive_quick_links.hbs @@ -17,10 +17,10 @@ }} <div class="widget span2p4"> - <div class="thumbnail quick-link-widget"> + <div class="img-thumbnail quick-link-widget"> {{#if view.isLoaded}} - <div class="caption title span11"> {{view.title}}</div> + <div class="caption title col-md-11"> {{view.title}}</div> <div class="content"> <table> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/info/save_popup_footer.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/save_popup_footer.hbs b/ambari-web/app/templates/main/service/info/save_popup_footer.hbs index e7c155c..4907b3a 100644 --- a/ambari-web/app/templates/main/service/info/save_popup_footer.hbs +++ b/ambari-web/app/templates/main/service/info/save_popup_footer.hbs @@ -17,7 +17,7 @@ }} <div class="modal-footer"> - <button type="button" class="btn btn" {{action onCancel target="view.parentView"}}>{{t common.cancel}}</button> - <button type="button" class="btn btn" {{action onDiscard target="view.parentView"}}>{{t common.discard}}</button> + <button type="button" class="btn btn-default" {{action onCancel target="view.parentView"}}>{{t common.cancel}}</button> + <button type="button" class="btn btn-default" {{action onDiscard target="view.parentView"}}>{{t common.discard}}</button> <button type="button" class="btn btn-success" {{bindAttr disabled="view.isSaveDisabled"}} {{action onSave target="view.parentView"}}>{{t common.save}}</button> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/info/service_alert_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs index cbadf06..3c132a3 100644 --- a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs +++ b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs @@ -17,11 +17,11 @@ }} {{#if view.alerts.length}} - <ul id='summary-alerts-popup' class="alerts"> + <ul id='summary-alerts-popup' class="alerts list-unstyled"> {{#each alert in view.alerts}} <li class="alert-list-wrap"> - <div class="row-fluid"> - <div class="span8 name-text"> + <div class="row"> + <div class="col-md-8 name-text"> <div> <a href="#" {{action "gotoAlertDetails" alert target="view"}}>{{alert.label}}</a> </div> @@ -29,7 +29,7 @@ {{alert.latestText}} </div> </div> - <div class="span4 status-col" rel="alert-status-tooltip" > + <div class="col-md-4 status-col" rel="alert-status-tooltip" > {{view App.AlertDefinitionSummary contentBinding="alert"}} <span class="timeago" {{bindAttr data-original-title="alert.lastTriggeredVerboseDisplay"}}> <span class="status-icon">{{{alert.status}}}</span> @@ -43,4 +43,3 @@ {{else}} {{t services.service.summary.alerts.noAlerts}} {{/if}} - http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/info/summary.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/summary.hbs b/ambari-web/app/templates/main/service/info/summary.hbs index 223e4a0..2cdf1d3 100644 --- a/ambari-web/app/templates/main/service/info/summary.hbs +++ b/ambari-web/app/templates/main/service/info/summary.hbs @@ -19,14 +19,14 @@ {{#if view.service.isRestartRequired}} {{#isAuthorized "SERVICE.START_STOP"}} <div id="summary-restart-bar"> - <div class="alert alert-warning clearfix"> - <i class="icon-refresh"></i> {{{view.needToRestartMessage}}} {{t services.service.config.restartService.needToRestart}} + <div class="alert alert-warning clearfix restart-required"> + <i class="glyphicon glyphicon-refresh"></i> {{{view.needToRestartMessage}}} {{t services.service.config.restartService.needToRestart}} <a href="#" {{action showComponentsShouldBeRestarted controller.content target="App.router.mainServiceInfoConfigsController"}}>{{view.componentsCount}} {{pluralize view.componentsCount singular="t:common.component" plural="t:common.components"}}</a> {{t on}} <a href="#" {{action showHostsShouldBeRestarted controller.content target="App.router.mainServiceInfoConfigsController"}}>{{view.hostsCount}} {{pluralize view.hostsCount singular="t:common.host" plural="t:common.hosts"}}</a> <span class="restart-components pull-right"> </span> <div class="btn-group pull-right"> - <button type="button" class="btn btn-default dropdown-toggle btn-warning" data-toggle="dropdown"> + <button type="button" class="btn dropdown-toggle btn-warning" data-toggle="dropdown"> {{t hosts.host.details.needToRestart.button}} <span class="caret"></span> </button> @@ -113,7 +113,7 @@ </div> <div> {{#if isServiceWithEnhancedWidgets}} - <div id="widget_layout" class="row-fluid"> + <div id="widget_layout" class="thumbnails"> {{#each widget in controller.widgets}} <div class="widget span2p4" {{bindAttr id="widget.id"}}> {{view widget.viewClass contentBinding="widget" idBinding="widget.id"}} @@ -124,7 +124,7 @@ <button id="add-widget-action-box" class="btn btn-default" {{action "goToWidgetsBrowser" controller.content target="controller"}} rel="add-widget-tooltip" {{translateAttr data-original-title="dashboard.widgets.addButton.tooltip"}}> - <i class="icon-plus"></i></button> + <i class="glyphicon glyphicon-plus"></i></button> </div> {{/if}} </div> @@ -149,8 +149,8 @@ </div> {{#if view.collapsedSections}} - <div class="row-fluid"> - <div class="span12 metrics-collapsed-graphs"> + <div class="row"> + <div class="col-md-12 metrics-collapsed-graphs"> {{#each collapsedSection in view.collapsedSections}} {{view collapsedSection}} {{/each}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/item.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/item.hbs b/ambari-web/app/templates/main/service/item.hbs index 43fb3dd..5eb4e5b 100644 --- a/ambari-web/app/templates/main/service/item.hbs +++ b/ambari-web/app/templates/main/service/item.hbs @@ -17,7 +17,7 @@ }} {{view App.MainServiceInfoMenuView configTabBinding="view.hasConfigTab" heatmapTabBinding="view.hasHeatmapTab"}} - <div class="span3 quick-links-wrapper"> + <div class="col-md-3 quick-links-wrapper"> {{#view App.QuickViewLinks contentBinding="view.service"}} {{#if view.showQuickLinks}} <ul class="nav nav-pills move"> @@ -60,10 +60,10 @@ <div class="service-button"> {{#if view.isMaintenanceActive}} <div class="btn-group display-inline-block"> - <a class="btn dropdown-toggle" id="service-actions-dropdown-btn" data-toggle="dropdown" href="#"> + <button class="btn btn-default dropdown-toggle" id="service-actions-dropdown-btn" data-toggle="dropdown" href="#"> {{t services.service.actions.serviceActions}} <span class="caret"></span> - </a> + </button> <ul class="pull-right dropdown-menu"> <!-- dropdown menu links --> @@ -73,14 +73,14 @@ <li {{bindAttr class="controller.isStartDisabled:disabled"}}> <a href="javascript:void(null)" {{bindAttr class="controller.isStartDisabled:disabled" }} {{action "startService" target="controller"}}> - <i {{bindAttr class=":icon-play controller.isStartDisabled:disabled:enabled" }}></i> + <i {{bindAttr class=":glyphicon :glyphicon-play controller.isStartDisabled:disabled:enabled" }}></i> {{t services.service.start}} </a> </li> <li {{bindAttr class="controller.isStopDisabled:disabled"}}> <a href="javascript:void(null)" {{bindAttr class="controller.isStopDisabled:disabled" }} data-toggle="modal" {{action "stopService" target="controller"}}> - <i {{bindAttr class=":icon-stop controller.isStopDisabled:disabled:enabled" }}></i> + <i {{bindAttr class=":glyphicon :glyphicon-stop controller.isStopDisabled:disabled:enabled" }}></i> {{t services.service.stop}} </a> </li> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs b/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs index 2c9dfa6..fe6bf8a 100644 --- a/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs +++ b/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs @@ -15,82 +15,79 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -<div class="alert alert-info margin-bottom-5">{{t services.service.config_groups_popup.notice serviceNameBinding="view.displayName"}}</div> - {{#if controller.isLoaded}} - <div class="row-fluid manage-configuration-group-content"> - <div class="span12"> - <div class="row-fluid"> - <div class="span4 group-list"> - <span> </span> - {{view Em.Select - contentBinding="configGroups" - optionLabelPath="content.displayNameHosts" - selectionBinding="view.selectedConfigGroup" - multiple="multiple" - class="group-select" - }} - <div class="btn-toolbar pull-right"> - <button rel="button-info" class="btn" {{bindAttr data-original-title="view.addButtonTooltip"}} - {{action addConfigGroup target="controller"}}><i class="icon-plus"></i></button> - <button rel="button-info" class="btn" {{bindAttr data-original-title="view.removeButtonTooltip" disabled="view.isRemoveButtonDisabled"}} - {{action confirmDelete target="controller"}}><i class="icon-minus"></i></button> - <div class="btn-group"> - <button class="btn dropdown-toggle" data-toggle="dropdown"> - <i class="icon-cog"></i> <span class="caret"></span> - </button> - <ul class="dropdown-menu"> - <li {{bindAttr class="view.isRenameButtonDisabled:disabled"}}> - <a href="" rel="button-info-dropdown" {{bindAttr data-original-title="view.renameButtonTooltip"}} {{action renameConfigGroup target="controller"}}>{{t services.service.config_groups_popup.rename}}</a> - </li> - <li {{bindAttr class="view.isDuplicateButtonDisabled:disabled"}}> - <a href="" rel="button-info-dropdown" {{bindAttr data-original-title="view.duplicateButtonTooltip"}} {{action duplicateConfigGroup target="controller"}}>{{t services.service.config_groups_popup.duplicate}}</a> - </li> - </ul> - </div> - </div> - </div> - <div class="span8 host-list"> - <span> </span> - <div class="row-fluid"> - <div class="span12 pull-right"> - {{view Em.Select - contentBinding="selectedConfigGroup.hosts" - multiple="multiple" - class="group-select" - selectionBinding="selectedHosts" - }} - </div> - <div class="button-group pull-right"> - <a rel="button-info" {{bindAttr data-original-title="view.addHostTooltip" class=":btn selectedConfigGroup.isAddHostsDisabled:disabled"}} {{action addHosts target="controller"}} ><i class="icon-plus"></i></a> - <a rel="button-info" {{bindAttr data-original-title="view.removeHostTooltip" class=":btn isDeleteHostsDisabled:disabled"}} {{action deleteHosts target="controller"}} ><i class="icon-minus"></i></a> - </div> - </div> - <div class="row-fluid"> - <div class="span2">{{t common.overrides}}</div> - <div class="span10"> - <a href="" class="properties-link" {{action showProperties target="controller"}} - {{bindAttr data-original-title="tooltipText" }}>{{selectedConfigGroup.properties.length}} {{t common.properties}}</a> - </div> - </div> - <div class="clearfix"></div> - <div class="row-fluid"> - <div class="span2"><span class="prrl">{{t common.description}}</span></div> - <div class="span10 group-description">{{selectedConfigGroup.description}}</div> - </div> - </div> - <div class="clearfix"></div> - <div class="row-fluid"> - <div class="span12 text-error" id="manage-config-group-error-div"> - {{#if errorMessage}} - {{errorMessage}} - {{else}} - - {{/if}} - </div> - </div> - </div> + +<div class="row"> + <div class="col-md-12 col-lg-12"> + <p class="alert alert-info">{{t services.service.config_groups_popup.notice serviceNameBinding="view.displayName"}}</p> + </div> +</div> +{{#if controller.isLoaded}} + <div class="row manage-configuration-group-content"> + <div class="col-md-4 col-lg-4 group-list"> + <span> </span> + {{view Em.Select + contentBinding="configGroups" + optionLabelPath="content.displayNameHosts" + selectionBinding="view.selectedConfigGroup" + multiple="multiple" + class="group-select form-control form-group" + }} + <div class="btn-toolbar pull-right"> + <button rel="button-info" class="btn btn-default" {{bindAttr data-original-title="view.addButtonTooltip"}} + {{action addConfigGroup target="controller"}}><i class="glyphicon glyphicon-plus"></i></button> + <button rel="button-info" class="btn btn-default" {{bindAttr data-original-title="view.removeButtonTooltip" disabled="view.isRemoveButtonDisabled"}} + {{action confirmDelete target="controller"}}><i class="glyphicon glyphicon-minus"></i></button> + <div class="btn-group"> + <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> + <i class="glyphicon glyphicon-cog"></i> <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li {{bindAttr class="view.isRenameButtonDisabled:disabled"}}> + <a href="" rel="button-info-dropdown" {{bindAttr data-original-title="view.renameButtonTooltip"}} {{action renameConfigGroup target="controller"}}>{{t services.service.config_groups_popup.rename}}</a> + </li> + <li {{bindAttr class="view.isDuplicateButtonDisabled:disabled"}}> + <a href="" rel="button-info-dropdown" {{bindAttr data-original-title="view.duplicateButtonTooltip"}} {{action duplicateConfigGroup target="controller"}}>{{t services.service.config_groups_popup.duplicate}}</a> + </li> + </ul> </div> + </div> </div> - {{else}} - {{view App.SpinnerView}} - {{/if}} + <div class="col-md-8 col-lg-8 host-list"> + <span> </span> + {{view Em.Select + contentBinding="selectedConfigGroup.hosts" + multiple="multiple" + class="group-select form-control form-group" + selectionBinding="selectedHosts" + }} + <div class="clearfix"> + <div class="pull-right btn-toolbar"> + <a rel="button-info" {{bindAttr data-original-title="view.addHostTooltip" class=":btn :btn-default selectedConfigGroup.isAddHostsDisabled:disabled"}} {{action addHosts target="controller"}} ><i class="glyphicon glyphicon-plus"></i></a> + <a rel="button-info" {{bindAttr data-original-title="view.removeHostTooltip" class=":btn :btn-default isDeleteHostsDisabled:disabled"}} {{action deleteHosts target="controller"}} ><i class="glyphicon glyphicon-minus"></i></a> + </div> + </div> + <div class="row"> + <div class="col-md-2 col-lg-2">{{t common.overrides}}</div> + <div class="col-md-10 col-lg-10"> + <a href="#" class="properties-link" {{action showProperties target="controller"}} + {{bindAttr data-original-title="tooltipText" }}>{{selectedConfigGroup.properties.length}} {{t common.properties}}</a> + </div> + </div> + <div class="row"> + <div class="col-md-2 col-lg-2"><span class="prrl">{{t common.description}}</span></div> + <div class="col-md-10 col-lg-10 group-description">{{selectedConfigGroup.description}}</div> + </div> + </div> + </div> + <div class="row"> + <div class="col-md-12 col-lg-12 text-danger" id="manage-config-group-error-div"> + {{#if errorMessage}} + {{errorMessage}} + {{else}} + + {{/if}} + </div> + </div> +{{else}} + {{view App.SpinnerView}} +{{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/menu_item.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/menu_item.hbs b/ambari-web/app/templates/main/service/menu_item.hbs index 6e69fbb..2da1555 100644 --- a/ambari-web/app/templates/main/service/menu_item.hbs +++ b/ambari-web/app/templates/main/service/menu_item.hbs @@ -17,17 +17,14 @@ }} <a class="services-menu-blocks" {{bindAttr href="view.link"}}> + {{view App.MainDashboardServiceHealthView class="service-health" serviceBinding="view.content"}} + {{unbound view.content.displayName}} {{#if view.alertsCount}} - <span {{bindAttr class=":label :alerts-count view.hasCriticalAlerts:alerts-crit-count:alerts-warn-count"}}> + <span {{bindAttr class=":label :alerts-count view.hasCriticalAlerts:alerts-crit-count:alerts-warn-count :pull-right"}}> {{view.alertsCount}} </span> {{/if}} - - <div class="icon-health-block"> - {{view App.MainDashboardServiceHealthView class="service-health" serviceBinding="view.content"}} - </div> - <div class="service-name-block"> - <span>{{unbound view.content.displayName}}</span> - </div> - <i rel="tooltip" {{action goToConfigs target="view"}}{{bindAttr class=":icon-refresh :restart-required-service view.content.isRestartRequired::hidden" data-original-title="view.restartRequiredMessage"}}></i> + <span class="pull-right"> + <i rel="tooltip" {{action goToConfigs target="view"}} {{bindAttr class=":glyphicon :glyphicon-refresh :restart-required-service view.content.isRestartRequired::hidden" data-original-title="view.restartRequiredMessage"}}></i> + </span> </a> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/new_config_group.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/new_config_group.hbs b/ambari-web/app/templates/main/service/new_config_group.hbs index 44a590d..7d8f938 100644 --- a/ambari-web/app/templates/main/service/new_config_group.hbs +++ b/ambari-web/app/templates/main/service/new_config_group.hbs @@ -24,16 +24,22 @@ {{/if}} </div> - <table> - <tr> - <td class="title">{{t services.service.config_groups_popup.group_name_lable }}: </td> - <td>{{view Ember.TextField maxlength="255" valueBinding="configGroupName"}}</td> - </tr> - <tr> - <td class="title">{{t services.service.config_groups_popup.group_desc_lable }}: </td> - <td class="row-fluid"> - {{view Ember.TextArea classNames="span12" valueBinding="configGroupDesc" rows="4"}} - </td> - </tr> - </table> + <div class="row"> + <div class="col-md-12"> + <form class="form-horizontal"> + <div class="form-group"> + <label class="col-md-2 control-label">{{t services.service.config_groups_popup.group_name_lable }}: </label> + <div class="col-md-6"> + {{view Ember.TextField maxlength="255" valueBinding="configGroupName" classNames="form-control"}}</td> + </div> + </div> + <div class="form-group"> + <label class="col-md-2 control-label">{{t services.service.config_groups_popup.group_desc_lable }}: </label> + <div class="col-md-10"> + {{view Ember.TextArea classNames="col-md-12 form-control" valueBinding="configGroupDesc" rows="4"}} + </div> + </div> + </form> + </div> + </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/reassign.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/reassign.hbs b/ambari-web/app/templates/main/service/reassign.hbs index 2477229..8942800 100644 --- a/ambari-web/app/templates/main/service/reassign.hbs +++ b/ambari-web/app/templates/main/service/reassign.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"> @@ -36,7 +35,7 @@ </ul> </div> </div> - <div class="wizard-content well span9"> + <div class="wizard-content well col-md-9"> {{#if view.isLoaded}} {{outlet}} {{else}} @@ -44,6 +43,5 @@ {{/if}} </div> </div> - </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/reassign/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/reassign/step3.hbs b/ambari-web/app/templates/main/service/reassign/step3.hbs index 1ffe989..1e8dfe0 100644 --- a/ambari-web/app/templates/main/service/reassign/step3.hbs +++ b/ambari-web/app/templates/main/service/reassign/step3.hbs @@ -39,7 +39,7 @@ </div> </div> <div class="btn-area"> - <a class="btn pull-left" {{action back href="true"}}>← {{t common.back}}</a> + <a class="btn btn-default pull-left" {{action back href="true"}}>← {{t common.back}}</a> <a class="btn btn-success pull-right" id="spinner" {{bindAttr disabled="controller.isSubmitDisabled"}} {{action submit target="controller"}}>{{t common.deploy}} →</a> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/reconfigure.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/reconfigure.hbs b/ambari-web/app/templates/main/service/reconfigure.hbs index 1ac87d1..553e383 100644 --- a/ambari-web/app/templates/main/service/reconfigure.hbs +++ b/ambari-web/app/templates/main/service/reconfigure.hbs @@ -38,7 +38,7 @@ {{else}} {{#if command.isStarted}} {{#if command.isPolling}} - <div class="progress-bar pull-left"> + <div class="progress-wrapper pull-left"> {{view App.StageInProgressView commandBinding=command}} </div> <div class="progress-percentage pull-left">{{command.progress}}%</div> @@ -50,7 +50,7 @@ {{#if command.isError}} <a class="btn btn-primary" href="javascript:void(null)" {{action retry target = "controller"}}><i - class="icon-repeat icon-white"></i> + class="glyphicon glyphicon-repeat glyphicon-white"></i> {{t common.retry}} </a> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/service.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/service.hbs b/ambari-web/app/templates/main/service/service.hbs index 262d80f..a907d6d 100644 --- a/ambari-web/app/templates/main/service/service.hbs +++ b/ambari-web/app/templates/main/service/service.hbs @@ -15,8 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -<div class="service-content row-fluid"> - <div {{bindAttr class="view.isFullWidth:span12:span6"}}> +<div class="service-content row"> + <div {{bindAttr class="view.isFullWidth:col-md-12:col-md-6"}}> <table class="summary-info table no-borders table-condensed"> <tbody> {{yield}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/services/flume.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/flume.hbs b/ambari-web/app/templates/main/service/services/flume.hbs index 2905492..43ce18a 100644 --- a/ambari-web/app/templates/main/service/services/flume.hbs +++ b/ambari-web/app/templates/main/service/services/flume.hbs @@ -28,9 +28,9 @@ {{#view view.sortView contentBinding="view.filteredContent" class="label-row"}} {{view view.parentView.hostSort}} <th>{{t dashboard.services.flume.agent}}</th> - <th><i class="icon-signin" {{translateAttr title="dashboard.services.flume.sources"}}></i> {{t dashboard.services.flume.sources}}</th> - <th><i class="icon-random" {{translateAttr title="dashboard.services.flume.channels"}}></i> {{t dashboard.services.flume.channels}}</th> - <th><i class="icon-signout" {{translateAttr title="dashboard.services.flume.sinks"}}></i> {{t dashboard.services.flume.sinks}}</th> + <th><i class="glyphicon glyphicon-signin" {{translateAttr title="dashboard.services.flume.sources"}}></i> {{t dashboard.services.flume.sources}}</th> + <th><i class="glyphicon glyphicon-random" {{translateAttr title="dashboard.services.flume.channels"}}></i> {{t dashboard.services.flume.channels}}</th> + <th><i class="glyphicon glyphicon-signout" {{translateAttr title="dashboard.services.flume.sinks"}}></i> {{t dashboard.services.flume.sinks}}</th> {{/view}} </thead> {{#if view.pageContent}} @@ -47,7 +47,7 @@ <div class="pull-left flume-agents-status"><span {{bindAttr class="host.firtstAgent.healthClass"}}></span> {{host.firtstAgent.name}}</div> <div class="btn-wrapper flume-agents-actions"> <div class="btn-group display-inline-block"> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="javascript:void(null)">{{host.firtstAgent.displayStatus}} + <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="javascript:void(null)">{{host.firtstAgent.displayStatus}} <span class="caret"></span> </a> <ul class="pull-left dropdown-menu"> @@ -85,7 +85,7 @@ <div class="pull-left flume-agents-status"><span {{bindAttr class="agent.healthClass"}}></span> {{agent.name}}</div> <div class="btn-wrapper flume-agents-actions"> <div class="btn-group display-inline-block"> - <a {{bindAttr class=":btn :dropdown-toggle"}} data-toggle="dropdown" href="javascript:void(null)">{{agent.displayStatus}} + <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="javascript:void(null)">{{agent.displayStatus}} <span class="caret"></span> </a> <ul class="pull-left dropdown-menu"> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/services/hbase.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/hbase.hbs b/ambari-web/app/templates/main/service/services/hbase.hbs index d575127..f6fa44c 100644 --- a/ambari-web/app/templates/main/service/services/hbase.hbs +++ b/ambari-web/app/templates/main/service/services/hbase.hbs @@ -66,7 +66,7 @@ </tbody> </table> </div> -<div class="span6"> +<div class="col-md-6"> <table class="summary-info table no-borders table-condensed"> <tbody> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/services/hdfs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/hdfs.hbs b/ambari-web/app/templates/main/service/services/hdfs.hbs index cc64a2f..ccf3d30 100644 --- a/ambari-web/app/templates/main/service/services/hdfs.hbs +++ b/ambari-web/app/templates/main/service/services/hdfs.hbs @@ -117,7 +117,7 @@ </tbody> </table> </div> -<div class="span6"> +<div class="col-md-6"> <table class="summary-info table no-borders table-condensed"> <tbody> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/services/mapreduce2.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/mapreduce2.hbs b/ambari-web/app/templates/main/service/services/mapreduce2.hbs index 2ac1886..22bbcb7 100644 --- a/ambari-web/app/templates/main/service/services/mapreduce2.hbs +++ b/ambari-web/app/templates/main/service/services/mapreduce2.hbs @@ -18,8 +18,8 @@ <div class="clearfix"> - <div class="name span2"> - <i class="pull-left icon-empty"></i> + <div class="name col-md-2"> + <i class="pull-left glyphicon glyphicon-empty"></i> {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} <a {{action selectService view.service href=true}}>{{view.service.displayName}}</a> {{#if view.alertsCount}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/services/oozie.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/oozie.hbs b/ambari-web/app/templates/main/service/services/oozie.hbs index b2517bb..3706eb4 100644 --- a/ambari-web/app/templates/main/service/services/oozie.hbs +++ b/ambari-web/app/templates/main/service/services/oozie.hbs @@ -17,8 +17,8 @@ }} <div class="clearfix"> - <div class="name span2"> - <i class="pull-left icon-empty"></i> + <div class="name col-md-2"> + <i class="pull-left glyphicon glyphicon-empty"></i> {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} <a {{action selectService view.service href=true}}>{{view.service.displayName}}</a> {{#if view.alertsCount}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/services/storm.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/storm.hbs b/ambari-web/app/templates/main/service/services/storm.hbs index 71821d1..fb6def2 100644 --- a/ambari-web/app/templates/main/service/services/storm.hbs +++ b/ambari-web/app/templates/main/service/services/storm.hbs @@ -41,7 +41,7 @@ </tbody> </table> </div> -<div class="span6"> +<div class="col-md-6"> <table class="summary-info table no-borders table-condensed"> <tbody> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/services/yarn.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/yarn.hbs b/ambari-web/app/templates/main/service/services/yarn.hbs index 138742d..290c361 100644 --- a/ambari-web/app/templates/main/service/services/yarn.hbs +++ b/ambari-web/app/templates/main/service/services/yarn.hbs @@ -61,7 +61,7 @@ </tbody> </table> </div> -<div class="span6"> +<div class="col-md-6"> <table class="summary-info table no-borders table-condensed"> <tbody> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/services/zookeeper.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/zookeeper.hbs b/ambari-web/app/templates/main/service/services/zookeeper.hbs index f628aaf..1337fb1 100644 --- a/ambari-web/app/templates/main/service/services/zookeeper.hbs +++ b/ambari-web/app/templates/main/service/services/zookeeper.hbs @@ -17,8 +17,8 @@ }} <div class="clearfix"> - <div class="name span2"> - <i class="pull-left icon-empty"></i> + <div class="name col-md-2"> + <i class="pull-left glyphicon glyphicon-empty"></i> {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} <a {{action selectService view.service href=true}}>{{view.service.displayName}}</a> {{#if view.alertsCount}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/widgets/create/expression.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/expression.hbs b/ambari-web/app/templates/main/service/widgets/create/expression.hbs index 0ad08bf..5d05b4a 100644 --- a/ambari-web/app/templates/main/service/widgets/create/expression.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/expression.hbs @@ -16,22 +16,28 @@ * limitations under the License. }} -<div class="actions-field row-fluid"> - {{view App.AddMetricExpressionView class="add-metric-menu"}} - <div class="btn-group span2 add-operator"> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> - {{t dashboard.widgets.wizard.step2.newOperator}} +<div class="actions-field row"> + {{view App.AddMetricExpressionView class="add-metric-menu col-md-2"}} + <div class="col-md-2"> + <div class="btn-group add-operator"> + <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"> + {{t dashboard.widgets.wizard.step2.newOperator}} <span class="caret"></span> - </a> - <ul class="dropdown-menu"> - {{#each operator in view.OPERATORS}} + </a> + <ul class="dropdown-menu"> + {{#each operator in view.OPERATORS}} <li><a href="#" {{action addOperator operator target="view"}}>{{operator}}</a></li> - {{/each}} - </ul> + {{/each}} + </ul> + </div> </div> - <div class="input-append span2 add-number"> - {{view App.AddNumberExpressionView valueBinding="view.numberValue" class="input-small"}} - <button class="btn add-on" {{action addNumber target="view"}} {{bindAttr disabled="view.isNumberValueInvalid"}}>{{t dashboard.widgets.wizard.step2.newNumber}}</button> + <div class="col-md-7 row add-number"> + <div class="input-group col-md-5"> + {{view App.AddNumberExpressionView valueBinding="view.numberValue" class="form-control col-md-3"}} + <div class="input-group-btn"> + <button class="btn btn-default" {{action addNumber target="view"}} {{bindAttr disabled="view.isNumberValueInvalid"}}>{{t dashboard.widgets.wizard.step2.newNumber}}</button> + </div> + </div> </div> </div> {{#if view.isInvalid}} @@ -42,14 +48,14 @@ {{/if}} </div> {{/if}} -<div class="metric-field"> +<div class="col-md-12 metric-field"> {{#if view.expression.isRemovable}} - <a {{action removeExpression view.expression target="controller"}} class="remove-link"><i class="icon-trash"></i></a> + <a {{action removeExpression view.expression target="controller"}} class="remove-link"><i class="glyphicon glyphicon-trash"></i></a> {{/if}} {{#if view.expression.data.length}} {{#each element in view.expression.data}} <div class="metric-instance" {{bindAttr id="element.id"}}>{{element.name}} - <a href="#" {{action removeElement element target="view"}}><i class="icon-remove"></i></a> + <a href="#" {{action removeElement element target="view"}}><i class="glyphicon glyphicon-remove"></i></a> </div> {{/each}} <div class="add-item-input"> @@ -62,4 +68,3 @@ <div class="placeholder">{{t dashboard.widgets.wizard.step2.addMetrics}}</div> {{/if}} </div> - http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/widgets/create/step1.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/step1.hbs b/ambari-web/app/templates/main/service/widgets/create/step1.hbs index f2d6d43..e465bcb 100644 --- a/ambari-web/app/templates/main/service/widgets/create/step1.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/step1.hbs @@ -22,15 +22,15 @@ <div id="add-widget-step1-options-body"> <h4>{{t widget.create.wizard.step1.body.text}}</h4> - <div class="widgets-info-container row-fluid"> + <div class="widgets-info-container row"> {{#each option in options}} - <div class="span6 row-fluid widget-info-section" rel="selectable-tooltip" + <div class="col-md-6 row widget-info-section" rel="selectable-tooltip" {{translateAttr data-original-title="widget.create.wizard.step1.body.choose.tooltip"}} {{action "chooseOption" option.name target="controller"}}> - <div class="icon span4"> + <div class="icon col-md-4"> <a class="widget-icon-image" target="_blank"><img {{bindAttr src="option.iconPath"}}></a> </div> - <div class="label-description span8"> + <div class="label-description col-md-8"> <p class="label-text">{{option.displayName}}</p> <p class="description-text">{{option.description}}</p> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/widgets/create/step2.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/step2.hbs b/ambari-web/app/templates/main/service/widgets/create/step2.hbs index 47d206e..021f051 100644 --- a/ambari-web/app/templates/main/service/widgets/create/step2.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/step2.hbs @@ -33,15 +33,13 @@ <div> <form class="form-horizontal"> {{#each property in widgetPropertiesViews}} - <div {{bindAttr class=":control-group property.name property.isValid::error"}}> + <div {{bindAttr class=":form-group :col-md-12 property.name property.isValid::error"}}> <label class="control-label">{{property.label}} {{#if property.isRequired }} - <i class="icon-asterisk"></i> + <i class="glyphicon glyphicon-asterisk"></i> {{/if}} </label> - <div class="controls"> - {{view property.viewClass propertyBinding="property"}} - </div> + {{view property.viewClass propertyBinding="property"}} </div> {{/each}} </form> @@ -50,7 +48,7 @@ <div class="btn-area"> {{#unless isEditWidget}} - <button id="add-widget-step2-back" class="btn" {{action back}}>← {{t common.back}}</button> + <button id="add-widget-step2-back" class="btn btn-default" {{action back}}>← {{t common.back}}</button> {{/unless}} <button id="add-widget-step2-next" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action "next" target="controller"}}>{{t common.next}} →</button> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs b/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs index adaacff..7d39dfc 100644 --- a/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs @@ -16,8 +16,8 @@ * limitations under the License. }} -<div class="btn-group dropdown span2"> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">{{t dashboard.widgets.wizard.step2.newMetric}} +<div class="btn-group dropdown"> + <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">{{t dashboard.widgets.wizard.step2.newMetric}} <span class="caret"></span></a> <ul class="dropdown-menu service-level-dropdown"> {{#if controller.content.isMetricsLoaded}} @@ -42,7 +42,7 @@ {{view App.JqueryChosenView optionsBinding="view.parentView.AGGREGATE_FUNCTIONS" elementIdBinding="component.aggregatorId" selectionObjBinding="view.aggregateFnSelectionObj"}} </li> <li class="actions-buttons"> - <button class="btn" href="#" {{action cancel target="view"}}>{{t common.cancel}}</button> + <button class="btn btn-default" href="#" {{action cancel target="view"}}>{{t common.cancel}}</button> <button {{bindAttr class=":btn :btn-primary component.isAddEnabled::disabled"}} href="#" {{action addMetric component target="view"}}>{{t common.add}}</button> </li> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/widgets/create/step2_graph.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/step2_graph.hbs b/ambari-web/app/templates/main/service/widgets/create/step2_graph.hbs index 483abd6..59a697c 100644 --- a/ambari-web/app/templates/main/service/widgets/create/step2_graph.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/step2_graph.hbs @@ -31,14 +31,14 @@ <h5>{{t common.expression}}:</h5> {{view App.WidgetWizardExpressionView expressionBinding="dataSet.expression"}} {{#if dataSet.isRemovable}} - <a {{action removeDataSet dataSet target="controller"}} class="remove-link"><i class="icon-trash"></i></a> + <a {{action removeDataSet dataSet target="controller"}} class="remove-link"><i class="glyphicon glyphicon-trash"></i></a> {{/if}} </fieldset> {{/each}} <div class="align-right"> <a href="#" {{action addDataSet target="controller"}}> - <i class="icon-plus"></i> + <i class="glyphicon glyphicon-plus"></i> {{t widget.create.wizard.step2.addDataset}} </a> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/widgets/create/step2_template.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/step2_template.hbs b/ambari-web/app/templates/main/service/widgets/create/step2_template.hbs index c0faedc..6c0722a 100644 --- a/ambari-web/app/templates/main/service/widgets/create/step2_template.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/step2_template.hbs @@ -45,7 +45,7 @@ <div class="align-right"> <a href="#" {{action addExpression target="controller"}}> - <i class="icon-plus"></i> + <i class="glyphicon glyphicon-plus"></i> {{t widget.create.wizard.step2.addExpression}} </a> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/widgets/create/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/step3.hbs b/ambari-web/app/templates/main/service/widgets/create/step3.hbs index 81177bc..1c7c588 100644 --- a/ambari-web/app/templates/main/service/widgets/create/step3.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/step3.hbs @@ -20,9 +20,9 @@ <h2>{{t widget.create.wizard.step3.header}}</h2> <form> - <div class="row-fluid"> - <div class="span2 title">{{t widget.create.wizard.step3.widgetName}}<i class="icon-asterisk"></i></div> - <div {{bindAttr class=":span10 isNameInvalid:error"}}> + <div class="row"> + <div class="col-md-2 title">{{t widget.create.wizard.step3.widgetName}}<i class="glyphicon glyphicon-asterisk"></i></div> + <div {{bindAttr class=":col-md-10 isNameInvalid:error"}}> {{view Ember.TextField valueBinding="widgetName"}} {{#if isNameInvalid}} <div>{{widgetNameErrorMessage}}</div> @@ -30,24 +30,26 @@ </div> </div> - <div class="row-fluid"> - <div class="span2 title">{{t common.author}}</div> - <div class="span10">{{widgetAuthor}}</div> + <div class="row"> + <div class="col-md-2 title">{{t common.author}}</div> + <div class="col-md-10">{{widgetAuthor}}</div> </div> - <div class="row-fluid"> - <div class="span2 title">{{t widget.create.wizard.step3.sharing}}</div> - <div class="span10"> - <label class="checkbox"> - {{view Ember.Checkbox disabledBinding="controller.isSharedCheckboxDisabled" checkedBinding="controller.isSharedChecked"}} - {{t widget.create.wizard.step3.sharing.msg}} - </label> + <div class="row"> + <div class="col-md-2 title">{{t widget.create.wizard.step3.sharing}}</div> + <div class="col-md-10"> + <div class="checkbox"> + <label> + {{view Ember.Checkbox disabledBinding="controller.isSharedCheckboxDisabled" checkedBinding="controller.isSharedChecked"}} + {{t widget.create.wizard.step3.sharing.msg}} + </label> + </div> </div> </div> - <div class="row-fluid"> - <div class="span2 title">{{t common.description}}</div> - <div {{bindAttr class=":span10 isDescriptionInvalid:error"}}> + <div class="row"> + <div class="col-md-2 title">{{t common.description}}</div> + <div {{bindAttr class=":col-md-10 isDescriptionInvalid:error"}}> {{view Ember.TextArea valueBinding="widgetDescription" class="description-text-area"}} {{#if isDescriptionInvalid}} <div>{{descriptionErrorMessage}}</div> @@ -58,8 +60,8 @@ </form> <div class="btn-area"> - <button id="add-widget-step3-back" class="btn" {{action back}}>← {{t common.back}}</button> + <button id="add-widget-step3-back" class="btn btn-default" {{action back}}>← {{t common.back}}</button> <button id="add-widget-step3-save" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action "complete" target="controller"}}>{{t common.save}}</button> - <button id="add-widget-step3-cancel" class="btn pull-right" {{action "cancel" target="controller"}}>{{t common.cancel}}</button> + <button id="add-widget-step3-cancel" class="btn btn-default pull-right" {{action "cancel" target="controller"}}>{{t common.cancel}}</button> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/widgets/create/widget_property_threshold.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/widget_property_threshold.hbs b/ambari-web/app/templates/main/service/widgets/create/widget_property_threshold.hbs index 90bfd73..df31d13 100644 --- a/ambari-web/app/templates/main/service/widgets/create/widget_property_threshold.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/widget_property_threshold.hbs @@ -16,17 +16,17 @@ * limitations under the License. }} -<div class="row-fluid"> - <div class="span3 badge-container"><span {{bindAttr class=":label view.property.badgeWarning"}}>{{view.property.badgeWarning}}</span> </div> - <div {{bindAttr class=":span2 :threshold-input property.isSmallValueValid::error"}} rel="threshold-tooltip" +<div class="row"> + <div class="col-md-3 badge-container"><span {{bindAttr class=":label view.property.badgeWarning"}}>{{view.property.badgeWarning}}</span> </div> + <div {{bindAttr class=":col-md-2 :threshold-input property.isSmallValueValid::error"}} rel="threshold-tooltip" {{translateAttr data-original-title="dashboard.widgets.wizard.step2.threshold.ok.tooltip"}}> - {{view Em.TextField valueBinding="view.property.smallValue" class ="span10"}} + {{view Em.TextField valueBinding="view.property.smallValue" class ="col-md-10"}} </div> </div> -<div class="row-fluid"> - <div class="span3 badge-container"><span {{bindAttr class=":label view.property.badgeCritical"}}>{{view.property.badgeCritical}}</span> </div> - <div {{bindAttr class=":span2 :threshold-input property.isBigValueValid::error"}} rel="threshold-tooltip" +<div class="row"> + <div class="col-md-3 badge-container"><span {{bindAttr class=":label view.property.badgeCritical"}}>{{view.property.badgeCritical}}</span> </div> + <div {{bindAttr class=":col-md-2 :threshold-input property.isBigValueValid::error"}} rel="threshold-tooltip" {{translateAttr data-original-title="dashboard.widgets.wizard.step2.threshold.warning.tooltip"}}> - {{view Em.TextField valueBinding="view.property.bigValue" class ="span10"}} + {{view Em.TextField valueBinding="view.property.bigValue" class ="col-md-10"}} </div> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/service/widgets/create/wizard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/wizard.hbs b/ambari-web/app/templates/main/service/widgets/create/wizard.hbs index 31286f3..a389ecd 100644 --- a/ambari-web/app/templates/main/service/widgets/create/wizard.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/wizard.hbs @@ -18,9 +18,9 @@ <div class="wizard" id="add-widget-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"> @@ -47,7 +47,7 @@ </div> {{/if}} </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/service/widgets/edit.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/edit.hbs b/ambari-web/app/templates/main/service/widgets/edit.hbs index 690e05b..a54ce72 100644 --- a/ambari-web/app/templates/main/service/widgets/edit.hbs +++ b/ambari-web/app/templates/main/service/widgets/edit.hbs @@ -18,9 +18,9 @@ <div class="wizard" id="edit-widget-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"> @@ -46,7 +46,7 @@ </div> {{/if}} </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/utils/ajax.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/utils/ajax.hbs b/ambari-web/app/templates/utils/ajax.hbs index 788444f..ab5fc8f 100644 --- a/ambari-web/app/templates/utils/ajax.hbs +++ b/ambari-web/app/templates/utils/ajax.hbs @@ -16,9 +16,9 @@ * limitations under the License. }} -<span class="text-error">{{view.statusCode}}</span> <span>{{view.api}}</span> +<span class="text-danger">{{view.statusCode}}</span> <span>{{view.api}}</span> {{#if view.showMessage}} <br /> <br /> - <pre><strong>{{t utils.ajax.errorMessage}}: </strong><span class="text-error">{{view.message}}</span></pre> + <pre><strong>{{t utils.ajax.errorMessage}}: </strong><span class="text-danger">{{view.message}}</span></pre> {{/if}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/utils/config_launch_switch_config_group_of_host.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/utils/config_launch_switch_config_group_of_host.hbs b/ambari-web/app/templates/utils/config_launch_switch_config_group_of_host.hbs index 7a3d8be..4320f04 100644 --- a/ambari-web/app/templates/utils/config_launch_switch_config_group_of_host.hbs +++ b/ambari-web/app/templates/utils/config_launch_switch_config_group_of_host.hbs @@ -16,5 +16,12 @@ * limitations under the License. }} -{{t installer.controls.slaveComponentGroups}}: -{{view Em.Select contentBinding="view.parentView.configGroups" optionLabelPath="content.displayName" selectionBinding="view.parentView.selectedConfigGroup"}} +<span>{{t installer.controls.slaveComponentGroups}}: </span> +<div class="display-inline-block"> + {{view Em.Select + contentBinding="view.parentView.configGroups" + optionLabelPath="content.displayName" + selectionBinding="view.parentView.selectedConfigGroup" + class="form-control"}} +</div> + http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/wizard/controls_service_config_radio_buttons.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/controls_service_config_radio_buttons.hbs b/ambari-web/app/templates/wizard/controls_service_config_radio_buttons.hbs index 2187155..7cc024b 100644 --- a/ambari-web/app/templates/wizard/controls_service_config_radio_buttons.hbs +++ b/ambari-web/app/templates/wizard/controls_service_config_radio_buttons.hbs @@ -18,9 +18,11 @@ {{#each option in view.options}} {{#unless option.hidden}} - <label {{bindAttr class="option.className :radio"}}> - {{#view App.ServiceConfigRadioButton nameBinding = "view.name" valueBinding = "option.displayName"}}{{/view}} - {{option.displayName}} - </label> + <div class="radio"> + <label {{bindAttr class="option.className"}}> + {{#view App.ServiceConfigRadioButton nameBinding = "view.name" valueBinding = "option.displayName"}}{{/view}} + {{option.displayName}} + </label> + </div> {{/unless}} {{/each}}
