http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs index bb197bd..7874f35 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs @@ -22,23 +22,23 @@ <div {{bindAttr class="view.parentView.serverValidationFailed::hidden :alert :alert-warning"}}> {{t admin.stackVersions.editRepositories.validation.warning}} </div> -<div class="row-fluid"> - <div class="span2"><strong>{{t common.os}}</strong></div> - <div class="span10 row-fluid"> - <div class="span3"><strong>{{t common.name}}</strong></div> - <div class="span9"><strong>{{t admin.cluster.repositories.baseUrl}}</strong></div> +<div class="row"> + <div class="col-md-2"><strong>{{t common.os}}</strong></div> + <div class="col-md-10 row"> + <div class="col-md-3"><strong>{{t common.name}}</strong></div> + <div class="col-md-9"><strong>{{t admin.cluster.repositories.baseUrl}}</strong></div> </div> </div> {{#each os in view.content.operatingSystems}} - <div class="row-fluid os-block" {{bindAttr id="os.osType"}}> - <div class="span2"> + <div class="row os-block" {{bindAttr id="os.osType"}}> + <div class="col-md-2"> {{os.osType}} </div> - <div class="span10"> + <div class="col-md-10"> {{#each repository in os.repositories}} - <div {{bindAttr class="repository.repoName :row-fluid"}}> - <div class="span3">{{repository.repoName}}</div> - <div {{bindAttr class="repository.hasError:error :control-group :span9"}}>{{view App.BaseUrlTextField repositoryBinding="repository" disabledBinding="view.content.useRedhatSatellite"}}</div> + <div {{bindAttr class="repository.repoName :row"}}> + <div class="col-md-3">{{repository.repoName}}</div> + <div {{bindAttr class="repository.hasError:error :form-group :col-md-9"}}>{{view App.BaseUrlTextField repositoryBinding="repository" disabledBinding="view.content.useRedhatSatellite"}}</div> </div> {{/each}} </div> @@ -47,11 +47,11 @@ <div id="skip-validation"> <label>{{view view.skipCheckBox checkedBinding="view.parentView.skipValidation"}}{{t installer.step1.advancedRepo.skipValidation.message}} - <i class="icon-question-sign" rel="skip-validation-tooltip" + <i class="glyphicon glyphicon-question-sign" rel="skip-validation-tooltip" data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label> </div> <div id="use-redhat"> <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="view.content.useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}} - <i class="icon-question-sign" rel="use-redhat-tooltip" + <i class="glyphicon glyphicon-question-sign" rel="use-redhat-tooltip" data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}></i></label> </div> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/failed_hosts_modal.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/failed_hosts_modal.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/failed_hosts_modal.hbs index d6617d6..e9d6b2a 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/failed_hosts_modal.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/failed_hosts_modal.hbs @@ -18,34 +18,32 @@ <div id="upgrade-failed-hosts"> - <div class="row-fluid sub-header"> - <div class="span6">{{view.subHeader}}</div> + <div class="row col-md-12"> + <div class="col-md-6">{{view.subHeader}}</div> <div class="pull-right"> <a href="#" {{action openDetails target="view"}}> {{t admin.stackUpgrade.failedHosts.details}} </a> </div> </div> - <div class="host-list-container"> + <div class="col-md-12 host-list-container"> {{#each host in view.hosts}} - <div class="accordion"> - <div class="accordion-group"> - <div class="accordion-heading"> - <i class="pull-left accordion-toggle icon-caret-right"></i> - <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="{{unbound host.collapseHref}}"> + <div class="panel panel-default"> + <div class="panel-group"> + <div class="panel-heading"> + <i class="pull-left panel-toggle icon-caret-right"></i> + <a class="panel-toggle" data-toggle="collapse" data-parent="#accordion2" href="{{unbound host.collapseHref}}"> <span rel="UsageTooltip" data-original-title="{{unbound host.hostName}}">{{host.displayName}}</span> <span class="pull-right label label-info">{{host.hostComponents.length}}</span> </a> </div> - <div id="{{unbound host.collapseId}}" class="accordion-body collapse"> - <div class="accordion-inner"> - {{#each hostComponent in host.hostComponents}} - <div class="row-fluid"> - <div class="span4">{{hostComponent.serviceName}}</div> - <div class="span4">{{hostComponent.componentName}}</div> - </div> - {{/each}} - </div> + <div id="{{unbound host.collapseId}}" class="panel-body collapse"> + {{#each hostComponent in host.hostComponents}} + <div class="row"> + <div class="col-md-4">{{hostComponent.serviceName}}</div> + <div class="col-md-4">{{hostComponent.componentName}}</div> + </div> + {{/each}} </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs index 8ba51e8..ed0dfce 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs @@ -83,12 +83,12 @@ <div class="clear-td"> {{#if repository.clearAll}} <a {{action "clearGroupLocalRepository" repository target="view" }}> - <i class="icon-remove-sign"></i> + <i class="glyphicon glyphicon-remove-sign"></i> </a> {{/if}} </div> <div class="edit-buttons-td"> - <a class="btn" {{action doCancel repository target="view"}}>{{t common.cancel}}</a> + <a class="btn btn-default" {{action doCancel repository target="view"}}>{{t common.cancel}}</a> </div> <div class="edit-buttons-td"> {{#if repository.empty-error}} @@ -104,7 +104,7 @@ </div> <div class="edit-td"> <a {{action "onEditClick" repository target="view" }}> - <i class="icon-edit"></i> {{t common.edit}} + <i class="glyphicon glyphicon-edit"></i> {{t common.edit}} </a> </div> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs index a86048e..f7de77f 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs @@ -18,19 +18,19 @@ <div id="stack-upgrade-dialog"> <div {{bindAttr class=":upgrade-options-link controller.isDowngrade:disabled"}} {{action openUpgradeOptions target="controller"}}> - <i class="icon-cogs"></i><a>{{t common.options}}</a> + <i class="glyphicon glyphicon-cogs"></i><a>{{t common.options}}</a> </div> - <div {{bindAttr class="view.isLoaded::hidden :row-fluid"}}> - <div class="span3 task-list-main-warp">{{statusIcon controller.requestStatus}} + <div {{bindAttr class="view.isLoaded::hidden :row"}}> + <div class="col-md-3 task-list-main-warp">{{statusIcon controller.requestStatus}} {{view.upgradeStatusLabel}}</div> - <div class="span8"> + <div class="col-md-8"> {{view App.ProgressBarView progressBinding="view.overallProgress" statusBinding="controller.requestStatus" }} </div> - <div class="span1"> + <div class="col-md-1"> {{view.overallProgress}}% </div> </div> @@ -39,40 +39,40 @@ {{#if view.isLoaded}} <div> {{#if view.runningItem}} - <div class="box details-box"> - <div class="row-fluid"> - <div class="pull-left">{{t admin.stackUpgrade.dialog.inProgress}} {{view.runningItem.text}}</div> + <div class="box details-box row"> + <div class="row col-md-12"> + <div class="pull-left col-md-6">{{t admin.stackUpgrade.dialog.inProgress}} {{view.runningItem.text}}</div> {{#if view.isDetailsOpened}} - <a href="#" class="pull-right" {{action toggleDetails target="view"}}>{{t admin.stackUpgrade.dialog.details.hide}}</a> + <div class="pull-right col-md-6"><a href="#" class="pull-right" {{action toggleDetails target="view"}}>{{t admin.stackUpgrade.dialog.details.hide}}</a></div> {{#if view.runningItem.isTasksLoaded}} - <div class="clear"> + <div class="clear col-md-12"> {{view App.upgradeTaskView contentBinding="view.taskDetails" outsideViewBinding="view.outsideView"}} </div> {{else}} {{view App.SpinnerView classNames="clear"}} {{/if}} {{else}} - <a href="#" class="pull-right" {{action toggleDetails target="view"}}>{{t admin.stackUpgrade.dialog.details.open}}</a> + <div class="pull-right col-md-6"><a href="#" class="pull-right" {{action toggleDetails target="view"}}>{{t admin.stackUpgrade.dialog.details.open}}</a></div> {{/if}} </div> </div> {{/if}} {{#if view.failedItem}} {{#unless view.isSlaveComponentFailuresItem}} - <div class="box details-box"> - <div class="row-fluid"> - <div class="pull-left">{{t admin.stackUpgrade.dialog.failed}} {{view.failedItem.text}}</div> + <div class="box details-box row"> + <div class="row col-md-12"> + <div class="pull-left col-md-6">{{t admin.stackUpgrade.dialog.failed}} {{view.failedItem.text}}</div> {{#if view.isDetailsOpened}} - <a href="#" class="pull-right" {{action toggleDetails target="view"}}>{{t admin.stackUpgrade.dialog.details.hide}}</a> + <div class="pull-right col-md-6"><a href="#" class="pull-right" {{action toggleDetails target="view"}}>{{t admin.stackUpgrade.dialog.details.hide}}</a></div> {{#if view.failedItem.isTasksLoaded}} - <div class="clear"> + <div class="clear col-md-12"> {{view App.upgradeTaskView contentBinding="view.taskDetails" outsideViewBinding="view.outsideView"}} </div> {{else}} {{view App.SpinnerView classNames="clear"}} {{/if}} {{else}} - <a href="#" class="pull-right" {{action toggleDetails target="view"}}>{{t admin.stackUpgrade.dialog.details.open}}</a> + <div class="pull-right col-md-6"><a href="#" class="pull-right" {{action toggleDetails target="view"}}>{{t admin.stackUpgrade.dialog.details.open}}</a></div> {{/if}} </div> {{#if view.isHoldingState}} @@ -81,14 +81,14 @@ <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.failedItem target="controller"}}>{{t common.downgrade}}</button> {{/if}} {{#if isDowngrade}} - <button class="btn" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> + <button class="btn btn-default" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> {{else}} - <button class="btn" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> + <button class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> {{/if}} {{#if view.failedItem.skippable}} <button class="btn btn-warning" {{bindAttr disabled="controller.requestInProgress"}} {{action continue view.failedItem target="view"}}>{{t admin.stackUpgrade.dialog.continue}}</button> {{/if}} - <button class="btn" {{bindAttr disabled="controller.requestInProgress"}} {{action retry view.failedItem target="view"}}>{{t common.retry}}</button> + <button class="btn btn-default" {{bindAttr disabled="controller.requestInProgress"}} {{action retry view.failedItem target="view"}}>{{t common.retry}}</button> </div> {{/if}} </div> @@ -109,9 +109,9 @@ <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button> {{/if}} {{#if isDowngrade}} - <button class="btn" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> + <button class="btn btn-default" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> {{else}} - <button class="btn" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> + <button class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> {{/if}} <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}> {{t common.proceed}} @@ -150,7 +150,7 @@ {{#if view.isDowngradeAvailable}} <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button> {{/if}} - <button class="btn" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.finalize.later}}</button> + <button class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.finalize.later}}</button> <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}> {{t common.finalize}} </button> @@ -190,12 +190,12 @@ <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button> {{/if}} {{#if isDowngrade}} - <button class="btn" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> + <button class="btn btn-default" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> {{else}} - <button class="btn" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> + <button class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> {{/if}} {{#if view.isHoldingState}} - <button class="btn" {{bindAttr disabled="controller.requestInProgress"}} {{action retry view.failedItem target="view"}}>{{t common.retry}}</button> + <button class="btn btn-default" {{bindAttr disabled="controller.requestInProgress"}} {{action retry view.failedItem target="view"}}>{{t common.retry}}</button> {{else}} <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}> {{t common.proceed}} @@ -253,9 +253,9 @@ <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button> {{/if}} {{#if isDowngrade}} - <button class="btn" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> + <button class="btn btn-default" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> {{else}} - <button class="btn" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> + <button class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> {{/if}} <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}> {{t common.proceed}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs index 2cd3ebd..71ddbbf 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs @@ -18,7 +18,7 @@ <h4 class="configurations-changes-header">{{t popup.clusterCheck.Upgrade.configsMerge.title}}</h4> <a {{action openConfigsInNewWindow view.configs target="App.router.mainAdminStackAndUpgradeController"}} {{translateAttr title="common.openNewWindow"}} class="pull-right open-in-new-window" href="#"> - <i class="icon-external-link"></i> <span id="i18n-34">{{t common.open}}</span> + <i class="glyphicon glyphicon-external-link"></i> <span id="i18n-34">{{t common.open}}</span> </a> <div class="alert alert-warning"> {{t popup.clusterCheck.Upgrade.configsMerge.alert}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs index 7b62599..1a829fb 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs @@ -17,13 +17,13 @@ }} -<div class="row-fluid"> - <div {{bindAttr class="view.content.isExpandableGroup::not-active-link :span8 :upgrade-group-text"}}> +<div class="row"> + <div {{bindAttr class="view.content.isExpandableGroup::not-active-link :col-md-8 :upgrade-group-text"}}> {{statusIcon view.content.upgradeGroupStatus}} <a href="#" {{action toggleExpanded view.content controller.upgradeData.upgradeGroups target="view"}}>{{view.content.title}}</a> </div> {{#if view.content.isRunning}} - <div class="span3"> + <div class="col-md-3"> {{view view.progressBarView progressBinding="view.content.progress" statusBinding="view.content.status" @@ -31,7 +31,7 @@ completedTasksBinding="view.content.completed_task_count" }} </div> - <div class="span1"> + <div class="col-md-1"> <div>{{view.content.progress}}%</div> </div> {{/if}} @@ -42,19 +42,19 @@ {{! List of UpgradeItem}} {{#each item in view.content.upgradeItems}} {{#if item.isVisible}} - <div class="row-fluid"> - <div {{bindAttr class="item.isActive::not-active-link :span8 :upgrade-item-text"}}> + <div class="row"> + <div {{bindAttr class="item.isActive::not-active-link :col-md-8 :upgrade-item-text"}}> {{statusIcon item.upgradeItemStatus}} <a href="#" {{action toggleExpanded item view.content.upgradeItems target="view"}}>{{item.context}}</a> </div> {{#if item.isRunning}} - <div class="span3"> + <div class="col-md-3"> {{view App.ProgressBarView progressBinding="item.progress" statusBinding="item.status" }} </div> - <div class="span1"> + <div class="col-md-1"> <div>{{item.progress}}%</div> </div> {{/if}} @@ -63,9 +63,9 @@ {{#if item.isExpanded}} {{#if item.isTasksLoaded}} {{! List of Tasks}} - <div class="task-list margin-bottom-5"> + <div class="task-list"> {{#each task in item.tasks}} - {{view App.upgradeTaskView contentBinding="task" tasksBinding="item.tasks"}} + {{view App.upgradeTaskView contentBinding="task" tasksBinding="item.tasks" class="row"}} {{/each}} </div> {{else}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs index 6d4a32d..f37f69a 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs @@ -22,7 +22,7 @@ </div> <div {{bindAttr class="view.isReady::hidden"}}> <div class="btn-group display-inline-block"> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"> <span class="filters-label">{{t common.filter}}: </span> <span> {{view.selectedCategory.label}} @@ -94,12 +94,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> </div> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history_details.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history_details.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history_details.hbs index 2d431f9..f9d0a2a 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history_details.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history_details.hbs @@ -17,16 +17,16 @@ }} <div id="stack-upgrade-record-dialog"> - <div {{bindAttr class="view.isLoaded::hidden :row-fluid"}}> - <div class="span3 task-list-main-warp">{{statusIcon controller.requestStatus}} + <div {{bindAttr class="view.isLoaded::hidden :row"}}> + <div class="col-md-3 task-list-main-warp">{{statusIcon controller.requestStatus}} {{view.upgradeStatusLabel}}</div> - <div class="span8"> + <div class="col-md-8"> {{view App.ProgressBarView progressBinding="view.overallProgress" statusBinding="controller.requestStatus" }} </div> - <div class="span1"> + <div class="col-md-1"> {{view.overallProgress}}% </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_options.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_options.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_options.hbs index 5369ebd..0367ee2 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_options.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_options.hbs @@ -19,12 +19,12 @@ <div id="upgrade-options-popup-content"> <div class="text version-text">{{{view.versionText}}}</div> <div class="text method-text">{{t admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.method}}</div> - <div {{bindAttr class=":row-fluid :method-options view.isInUpgradeWizard:disabled"}}> + <div {{bindAttr class=":row :method-options view.isInUpgradeWizard:disabled"}}> {{#each method in view.upgradeMethods}} - <div class="method-option span5"> + <div class="method-option col-md-6"> <div {{bindAttr class="method.allowed::not-allowed method.allowed::not-allowed-by-version method.isPrecheckFailed:not-allowed method.isPrecheckFailed:check-failed - method.selected:selected method.type :thumbnail"}} + method.selected:selected method.type :img-thumbnail"}} {{action selectMethod method target="view"}}> <div {{bindAttr class="method.icon :method-icon"}}></div> <div class="method-name">{{method.displayName}}</div> @@ -53,11 +53,15 @@ </div> <div class="text tolerance-text">{{t admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.tolerance}} - <i class="icon-question-sign failure-tolerance-tooltip" data-toggle="tooltip"></i> - <label class="tolerance-option">{{view Ember.Checkbox checkedBinding="view.parentView.skipSCFailures"}} - {{t admin.stackVersions.version.upgrade.upgradeOptions.tolerance.option2}}</label> - <label class="tolerance-option">{{view Ember.Checkbox checkedBinding="view.parentView.skipComponentFailures"}} - {{t admin.stackVersions.version.upgrade.upgradeOptions.tolerance.option1}}</label> + <i class="glyphicon glyphicon-question-sign failure-tolerance-tooltip" data-toggle="tooltip"></i> + <div> + <label class="tolerance-option">{{view Ember.Checkbox checkedBinding="view.parentView.skipSCFailures"}} + {{t admin.stackVersions.version.upgrade.upgradeOptions.tolerance.option2}}</label> + </div> + <div> + <label class="tolerance-option">{{view Ember.Checkbox checkedBinding="view.parentView.skipComponentFailures"}} + {{t admin.stackVersions.version.upgrade.upgradeOptions.tolerance.option1}}</label> + </div> </div> <div class="alert alert-warning">{{t admin.stackVersions.version.upgrade.alertsWarning}}</div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_task.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_task.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_task.hbs index 5b2d721..4c26231 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_task.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_task.hbs @@ -17,8 +17,11 @@ }} {{#unless view.outsideView}} - <div {{bindAttr class="view.content.isActive::not-active-link"}}>{{statusIcon view.content.status}}<a - href="#" {{action toggleExpanded view.content view.tasks target="view.parentView"}}>{{view.content.command_detail}}</a> + <div {{bindAttr class="view.content.isActive::not-active-link"}}> + {{statusIcon view.content.status}} + <a href="#" {{action toggleExpanded view.content view.tasks target="view.parentView"}}> + {{view.content.command_detail}} + </a> </div> {{/unless}} {{#if view.showContent}} @@ -31,14 +34,14 @@ <div class="tab-content"> <div class="tab-pane active" {{bindAttr id="view.logTabId"}}> <p>{{view.content.host_name}}</p> - <div class="row-fluid"> - <p class="pull-left">{{view.content.output_log}}</p> - <div class="manage-controls pull-right"> - <a title="Click to Copy" {{action copyOutLog view.content target="view"}} class="task-detail-copy"> - <i class="icon-copy"></i> {{t common.copy}} + <div class="row"> + <p class="pull-left col-sm-6">{{view.content.output_log}}</p> + <div class="manage-controls pull-right col-sm-6"> + <a {{translateAttr title="common.openNewWindow"}} {{action openOutLog target="view"}} class="task-detail-open-dialog pull-right"> + <i class="glyphicon glyphicon-external-link"></i> {{t common.open}} </a> - <a {{translateAttr title="common.openNewWindow"}} {{action openOutLog target="view"}} class="task-detail-open-dialog"> - <i class="icon-external-link"></i> {{t common.open}} + <a title="Click to Copy" {{action copyOutLog view.content target="view"}} class="task-detail-copy pull-right"> + <i class="glyphicon glyphicon-copy"></i> {{t common.copy}} </a> </div> </div> @@ -47,14 +50,14 @@ </div> <div class="tab-pane" {{bindAttr id="view.errorTabId"}}> <p>{{view.content.host_name}}</p> - <div class="row-fluid"> - <p class="pull-left">{{view.content.error_log}}</p> + <div class="row"> + <p class="pull-left col-sm-6">{{view.content.error_log}}</p> <div class="manage-controls pull-right"> - <a title="Click to Copy" {{action copyErrLog view.content target="view"}} class="task-detail-copy"> - <i class="icon-copy"></i> {{t common.copy}} + <a {{translateAttr title="common.openNewWindow"}} {{action openErrorLog target="view"}} class="task-detail-open-dialog pull-right"> + <i class="glyphicon glyphicon-external-link"></i> {{t common.open}} </a> - <a {{translateAttr title="common.openNewWindow"}} {{action openErrorLog target="view"}} class="task-detail-open-dialog"> - <i class="icon-external-link"></i> {{t common.open}} + <a title="Click to Copy" {{action copyErrLog view.content target="view"}} class="task-detail-copy pull-right"> + <i class="glyphicon glyphicon-copy"></i> {{t common.copy}} </a> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs index 72bce5c..cb91bd7 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs @@ -17,20 +17,20 @@ }} {{#if view.isOutOfSync}} - <i class="icon-exclamation-sign out-of-sync-badge"></i> + <i class="glyphicon glyphicon-exclamation-sign out-of-sync-badge"></i> {{/if}} <p {{bindAttr class=":version view.isRepoUrlsEditDisabled:not-active-link"}}> <span>{{view.content.displayName}}</span> <a class="pull-right not-active link-tooltip" {{action editRepositories target="view"}}> - <i class="icon-edit"></i> + <i class="glyphicon glyphicon-edit"></i> </a> </p> <p class="repository-name">({{view.content.repositoryVersion}})</p> <p class="patch-icon"> {{#if view.isPatch}} - <i class="icon-umbrella"></i> {{t common.patch}} + <i class="glyphicon glyphicon-umbrella"></i> {{t common.patch}} {{/if}} </p> @@ -86,20 +86,20 @@ <div class="hosts-section"> <div class="hosts-bar">{{t common.hosts}}</div> - <div class="row-fluid host-link"> - <div class="span4 align-center not-installed-hosts"> + <div class="row host-link"> + <div class="col-md-4 align-center not-installed-hosts"> <div><a href="#" class="hosts-tooltip not-active" {{bindAttr data-original-title="view.content.noInitHostsTooltip" }} {{action showHosts view.versionStateMap.not_installed target="view"}}> {{view.notInstalledHosts.length}}</a></div> <div>{{t admin.stackVersions.version.notInstalled}}</div> </div> - <div class="span4 align-center installed-hosts"> + <div class="col-md-4 align-center installed-hosts"> <div><a href="#" class="hosts-tooltip not-active" {{bindAttr data-original-title="view.content.noInstalledHostsTooltip" }} {{action showHosts view.versionStateMap.installed target="view"}}> {{view.installedHosts.length}}</a></div> <div>{{t common.installed}}</div> </div> - <div class="span4 align-center current-hosts"> + <div class="col-md-4 align-center current-hosts"> <div><a href="#" class="hosts-tooltip not-active" {{bindAttr data-original-title="view.content.noCurrentHostsTooltip" }} {{action showHosts view.versionStateMap.current target="view"}}> {{view.currentHosts.length}}</a></div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs index 52a42fc..b7477ca 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs @@ -17,7 +17,7 @@ }} {{#if view.isOutOfSync}} - <i class="icon-exclamation-sign out-of-sync-badge"></i> + <i class="glyphicon glyphicon-exclamation-sign out-of-sync-badge"></i> {{/if}} <p class="version-column-display-name"> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs index bcc4b63..be88f66 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs @@ -16,20 +16,20 @@ * limitations under the License. }} -<div id="versions-filter-section"> +<div id="versions-filter-section" class="btn-toolbar"> {{#isAuthorized "AMBARI.MANAGE_STACK_VERSIONS"}} <button class="btn btn-primary" {{action goToVersions target="view"}} id="manage-versions-link"> - <i class="icon-external-link"></i> {{t admin.stackVersions.manageVersions}} + <i class="glyphicon glyphicon-external-link"></i> {{t admin.stackVersions.manageVersions}} </button> {{/isAuthorized}} <div class="btn-group display-inline-block"> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"> <span class="filters-label">{{t common.filter}}: </span> <span> {{view.selectedCategory.label}} <span class="caret"></span> </span> - </a> + </button> <ul class="dropdown-menu"> {{#each category in view.categories}} <li> @@ -41,8 +41,8 @@ </ul> </div> </div> -<div id="versions-section" class="row-fluid"> - <div class="span2 left-menu-table"> +<div id="versions-section" class="row col-md-12"> + <div class="col-md-2 left-menu-table"> <table class="table"> <thead> </thead> @@ -55,7 +55,7 @@ </tbody> </table> </div> - <div class="span10 versions-slides"> + <div class="col-md-10 versions-slides"> {{#if isLoaded}} <div class="versions-slides-bar"> {{#each version in view.repoVersionsDisplay}} @@ -68,4 +68,4 @@ {{view App.SpinnerView}} {{/if}} </div> -</div> \ No newline at end of file +</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts.hbs b/ambari-web/app/templates/main/alerts.hbs index 8a27056..2c7f365 100644 --- a/ambari-web/app/templates/main/alerts.hbs +++ b/ambari-web/app/templates/main/alerts.hbs @@ -90,21 +90,16 @@ </table> <div class="page-bar"> - <div class="filtered-info span4"> + <div class="filtered-info col-md-4"> <label>{{view.filteredContentInfo}} - <a {{action clearFilters target="view"}} href="#">{{t tableView.filters.clearAllFilters}}</a></label> </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/alerts/add_alert_definition/add_alert_definition.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/add_alert_definition/add_alert_definition.hbs b/ambari-web/app/templates/main/alerts/add_alert_definition/add_alert_definition.hbs index b12ab7e..6bc7980 100644 --- a/ambari-web/app/templates/main/alerts/add_alert_definition/add_alert_definition.hbs +++ b/ambari-web/app/templates/main/alerts/add_alert_definition/add_alert_definition.hbs @@ -18,10 +18,9 @@ <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"> @@ -32,10 +31,9 @@ </ul> </div> </div> - <div class="wizard-content well span9"> + <div class="wizard-content well col-md-9"> {{outlet}} </div> </div> - </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/add_alert_definition/step2.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/add_alert_definition/step2.hbs b/ambari-web/app/templates/main/alerts/add_alert_definition/step2.hbs index b2ff6c8..27db700 100644 --- a/ambari-web/app/templates/main/alerts/add_alert_definition/step2.hbs +++ b/ambari-web/app/templates/main/alerts/add_alert_definition/step2.hbs @@ -21,6 +21,6 @@ {{view App.AlertDefinitionConfigsView canEdit=true isWizard=true alertDefinitionTypeBinding="controller.content.selectedType"}} <div class="btn-area"> - <a class="btn" {{bindAttr disabled="isBackBtnDisabled"}} {{action back}}>← {{t common.back}}</a> + <a class="btn btn-default" {{bindAttr disabled="isBackBtnDisabled"}} {{action back}}>← {{t common.back}}</a> <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} →</a> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/add_alert_definition/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/add_alert_definition/step3.hbs b/ambari-web/app/templates/main/alerts/add_alert_definition/step3.hbs index 1b7e85d..713c5ab 100644 --- a/ambari-web/app/templates/main/alerts/add_alert_definition/step3.hbs +++ b/ambari-web/app/templates/main/alerts/add_alert_definition/step3.hbs @@ -22,12 +22,10 @@ {{t alerts.add.step3.selectedType}}: <strong>{{controller.content.selectedType}}</strong> </div> <div class="control-group"> - <div class="controls"> <pre class="alert-definition-review">{{view.alertDefinitionToDisplay}}</pre> - </div> </div> <div class="btn-area"> - <a class="btn" {{bindAttr disabled="isBackBtnDisabled"}} {{action back}}>← {{t common.back}}</a> + <a class="btn btn-default" {{bindAttr disabled="isBackBtnDisabled"}} {{action back}}>← {{t common.back}}</a> <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action done}}>{{t common.done}} </a> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/add_custom_config_to_alert_notification_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/add_custom_config_to_alert_notification_popup.hbs b/ambari-web/app/templates/main/alerts/add_custom_config_to_alert_notification_popup.hbs index 701dfc1..dc2fee8 100644 --- a/ambari-web/app/templates/main/alerts/add_custom_config_to_alert_notification_popup.hbs +++ b/ambari-web/app/templates/main/alerts/add_custom_config_to_alert_notification_popup.hbs @@ -17,19 +17,19 @@ }} <form class="form-horizontal alert-configs"> - <div {{bindAttr class="controller.isErrorWithNewCustomPropertyName:error :control-group"}}> - <label class="control-label">{{t common.name}} </label> + <div {{bindAttr class="controller.isErrorWithNewCustomPropertyName:error :form-group"}}> + <label class="control-label col-md-3">{{t common.name}} </label> - <div class="controls"> - {{view Em.TextField valueBinding="controller.newCustomProperty.name"}} + <div class="col-md-7"> + {{view Em.TextField valueBinding="controller.newCustomProperty.name" classNames="form-control"}} </div> </div> - <div class="control-group"> - <label class="control-label">{{t common.value}} </label> + <div class="form-group"> + <label class="control-label col-md-3">{{t common.value}} </label> - <div class="controls"> - {{view Em.TextField valueBinding="controller.newCustomProperty.value"}} + <div class="col-md-7"> + {{view Em.TextField valueBinding="controller.newCustomProperty.value" classNames="form-control"}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs b/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs index 606b4f4..e5e9abd 100644 --- a/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs +++ b/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs @@ -25,70 +25,64 @@ {{view.parentView.warningMessage}} </div> {{/if}} - <table style="width: 100%;"> - <tr> - <td> - <a href="#" {{action toggleShowSelectedDefs target="view" }}>{{view.defSelectMessage}}</a> - {{#if view.showOnlySelectedDefs}} - <i class='icon-ok-sign'></i> - {{/if}} - </td> - <td width="20%"> - <div class="row"> - <div class="span2" id="filter-dropdown-div"> - <!-- services drop-down --> - <div class="btn-group"> - <button class="btn dropdown-toggle" data-toggle="dropdown" - href="#" {{bindAttr disabled="view.isDisabled"}}> - {{t common.service}} - <span class="caret"></span> - </button> - <ul class="dropdown-menu alert-definition-filter-list"> - <!-- dropdown menu links --> - {{#each service in view.filterServices}} - <li> - <a href="#" {{action selectFilterService service target="view"}}> - {{#if service.selected}} - <i class='icon-ok-sign'></i> - {{else}} - <i class='icon-placeholder'></i> - {{/if}} - {{service.displayName}} - </a> - </li> - {{/each}} - </ul> - </div> - </div> - <div class="span2" id="component-dropdown-div"> - <!-- definition-components drop-down --> - <div class="btn-group"> - <button class="btn dropdown-toggle" data-toggle="dropdown" - href="#" {{bindAttr disabled="view.isDisabled"}}> - {{t common.component}} - <span class="caret"></span> - </button> - <ul class="dropdown-menu alert-definition-filter-list"> - <!-- dropdown menu links --> - {{#each component in view.filterComponents}} - <li> - <a href="#" {{action selectFilterComponent component target="view"}}> - {{#if component.selected}} - <i class='icon-ok-sign'></i> - {{else}} - <i class='icon-placeholder'></i> - {{/if}} - {{component.displayName}} - </a> - </li> - {{/each}} - </ul> - </div> - </div> - </div> - </td> - </tr> - </table> + <div class="row"> + <div class="col-md-8"> + <a href="#" {{action toggleShowSelectedDefs target="view" }}>{{view.defSelectMessage}}</a> + {{#if view.showOnlySelectedDefs}} + <i class='glyphicon glyphicon-ok-sign'></i> + {{/if}} + </div> + <div class="col-md-2" id="component-dropdown-div"> + <!-- definition-components drop-down --> + <div class="btn-group pull-right"> + <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" + href="#" {{bindAttr disabled="view.isDisabled"}}> + {{t common.component}} + <span class="caret"></span> + </button> + <ul class="dropdown-menu alert-definition-filter-list"> + <!-- dropdown menu links --> + {{#each component in view.filterComponents}} + <li> + <a href="#" {{action selectFilterComponent component target="view"}}> + {{#if component.selected}} + <i class='glyphicon glyphicon-ok-sign'></i> + {{else}} + <i class='glyphicon glyphicon-placeholder'></i> + {{/if}} + {{component.displayName}} + </a> + </li> + {{/each}} + </ul> + </div> + </div> + <div class="col-md-2" id="filter-dropdown-div"> + <!-- services drop-down --> + <div class="btn-group pull-right"> + <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" + href="#" {{bindAttr disabled="view.isDisabled"}}> + {{t common.service}} + <span class="caret"></span> + </button> + <ul class="dropdown-menu alert-definition-filter-list"> + <!-- dropdown menu links --> + {{#each service in view.filterServices}} + <li> + <a href="#" {{action selectFilterService service target="view"}}> + {{#if service.selected}} + <i class='glyphicon glyphicon-ok-sign'></i> + {{else}} + <i class='glyphicon glyphicon-placeholder'></i> + {{/if}} + {{service.displayName}} + </a> + </li> + {{/each}} + </ul> + </div> + </div> + </div> <table class="table table-striped hosts-table"> <thead> <tr class="success"> @@ -137,12 +131,7 @@ <label>{{t common.show}}: {{view view.rowsPerPageSelectView selectionBinding="view.displayLength"}}</label> </div> <div class="info">{{view.paginationInfo}}</div> - <div class="paging_two_button"> - {{view view.paginationFirst}} - {{view view.paginationLeft}} - {{view view.paginationRight}} - {{view view.paginationLast}} - </div> + {{view view.pagination4Btns}} </div> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/alert_definitions_actions.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/alert_definitions_actions.hbs b/ambari-web/app/templates/main/alerts/alert_definitions_actions.hbs index 48fcad9..abdc076 100644 --- a/ambari-web/app/templates/main/alerts/alert_definitions_actions.hbs +++ b/ambari-web/app/templates/main/alerts/alert_definitions_actions.hbs @@ -17,7 +17,7 @@ }} <div class="dropdown"> - <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 pull-left"> {{#each action in controller}} <li> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/configs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/configs.hbs b/ambari-web/app/templates/main/alerts/configs.hbs index 5cc9a25..febc2b8 100644 --- a/ambari-web/app/templates/main/alerts/configs.hbs +++ b/ambari-web/app/templates/main/alerts/configs.hbs @@ -15,30 +15,32 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -<form class="form-horizontal alert-configs"> - {{#each property in controller.configs}} - {{#unless property.hidden}} - <div {{bindAttr class=":control-group property.name property.isValid::error"}}> - {{#if property.isPreLabeled}} - <label {{bindAttr class=":control-label property.isShifted:shifted"}}>{{property.label}}</label> +<div style="padding-top:20px;"> + <form class="form-horizontal alert-configs"> + {{#each property in controller.configs}} + {{#unless property.hidden}} + <div {{bindAttr class=":form-group property.name property.isValid::has-error"}}> + {{#if property.isPreLabeled}} + <label {{bindAttr class=":control-label :col-md-2"}}>{{property.label}}</label> - <div {{bindAttr class=":controls property.isShifted:shifted"}}> - {{view property.viewClass propertyBinding="property"}} - </div> - {{else}} - <div class="controls"> - <label class="radio"> + <div {{bindAttr class=":col-md-10"}}> {{view property.viewClass propertyBinding="property"}} - {{property.label}} - </label> - </div> - {{/if}} + </div> + {{else}} + <div> + <label class="radio"> + {{view property.viewClass propertyBinding="property"}} + {{property.label}} + </label> + </div> + {{/if}} + </div> + {{/unless}} + {{/each}} + {{#if controller.hasThresholdsError}} + <div class="error-message"> + {{view.errorMessage}} </div> - {{/unless}} - {{/each}} - {{#if controller.hasThresholdsError}} - <div class="error-message controls"> - {{view.errorMessage}} - </div> - {{/if}} -</form> + {{/if}} + </form> +</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/configs/alert_config_parameter.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/configs/alert_config_parameter.hbs b/ambari-web/app/templates/main/alerts/configs/alert_config_parameter.hbs index ad5b1a1..0e1232e 100644 --- a/ambari-web/app/templates/main/alerts/configs/alert_config_parameter.hbs +++ b/ambari-web/app/templates/main/alerts/configs/alert_config_parameter.hbs @@ -18,17 +18,18 @@ <div> {{#if view.property.thresholdExists}} - <div {{bindAttr class=":span3 :badge-container :stuck-left"}}> - <span {{bindAttr class="view.property.badgeCssClass :alert-parameter-badge :alert-state-single-host view.property.threshold:label"}}> + <div class="col-md-3"> + <span {{bindAttr class="view.property.badgeCssClass :label :alert-label :alert-state-single-host"}}> {{view.property.badge}} - </span> + </span> </div> {{/if}} - <div - rel="parameter-tooltip" {{bindAttr data-original-title="view.property.description" class="view.bigInput:span12:span3 view.property.units:input-append view.property.thresholdNotExists:stuck-left"}}> - {{view Em.TextField valueBinding="view.property.value" disabledBinding="view.property.isDisabled" class ="view.bigInput:span12:span6"}} - {{#if view.property.units}} - <span class="add-on">{{view.property.units}}</span> - {{/if}} + <div rel="parameter-tooltip" {{bindAttr data-original-title="view.property.description" class="view.bigInput:col-md-12:col-md-4"}}> + <div {{bindAttr class="view.property.units:input-group"}}> + {{view Em.TextField valueBinding="view.property.value" disabledBinding="view.property.isDisabled" class="form-control"}} + {{#if view.property.units}} + <span class="input-group-addon">{{view.property.units}}</span> + {{/if}} + </div> </div> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/configs/alert_config_text_area.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/configs/alert_config_text_area.hbs b/ambari-web/app/templates/main/alerts/configs/alert_config_text_area.hbs new file mode 100644 index 0000000..a802973 --- /dev/null +++ b/ambari-web/app/templates/main/alerts/configs/alert_config_text_area.hbs @@ -0,0 +1,20 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} +<div class="col-md-12"> + {{view Em.TextArea rows="4" class="form-control" valueBinding="view.property.value" disabledBinding="view.property.isDisabled"}} +</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/configs/alert_config_text_field.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/configs/alert_config_text_field.hbs b/ambari-web/app/templates/main/alerts/configs/alert_config_text_field.hbs index 79f1fcb..d85dc33 100644 --- a/ambari-web/app/templates/main/alerts/configs/alert_config_text_field.hbs +++ b/ambari-web/app/templates/main/alerts/configs/alert_config_text_field.hbs @@ -15,9 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -<div {{bindAttr class="view.property.unit:input-append"}}> - {{view Em.TextField valueBinding="view.property.value" disabledBinding="view.property.isDisabled"}} - {{#if view.property.unit}} - <span class="add-on">{{view.property.unit}}</span> - {{/if}} +<div {{bindAttr class="view.colWidth"}}> + <div {{bindAttr class="view.property.unit:input-group"}}> + {{view Em.TextField class="form-control" valueBinding="view.property.value" disabledBinding="view.property.isDisabled"}} + {{#if view.property.unit}} + <span class="input-group-addon">{{view.property.unit}}</span> + {{/if}} + </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/configs/alert_config_threshold.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/configs/alert_config_threshold.hbs b/ambari-web/app/templates/main/alerts/configs/alert_config_threshold.hbs index 3f74664..7c7c211 100644 --- a/ambari-web/app/templates/main/alerts/configs/alert_config_threshold.hbs +++ b/ambari-web/app/templates/main/alerts/configs/alert_config_threshold.hbs @@ -16,19 +16,21 @@ * limitations under the License. }} -<div> - <div class="span3 badge-container"><span {{bindAttr class="view.property.badgeCssClass :alert-threshold-badge :alert-state-single-host :label"}}>{{view.property.badge}}</span> </div> - {{#if view.property.showInputForValue}} - <div {{bindAttr class=":span3 view.property.valueMetric:input-append"}}> - {{view Em.TextField valueBinding="view.property.displayValue" disabledBinding="view.property.isDisabled" class ="span7"}} - {{#if view.property.valueMetric}} - <span class="add-on">{{view.property.valueMetric}}</span> - {{/if}} +<div class="col-md-3"> + <span {{bindAttr class="view.property.badgeCssClass :alert-label :label :alert-state-single-host"}}>{{view.property.badge}}</span> +</div> +{{#if view.property.showInputForValue}} + <div class="col-md-3"> + <div {{bindAttr class="view.property.valueMetric:input-group"}}> + {{view Em.TextField valueBinding="view.property.displayValue" disabledBinding="view.property.isDisabled" class="form-control"}} + {{#if view.property.valueMetric}} + <span class="input-group-addon">{{view.property.valueMetric}}</span> + {{/if}} </div> - {{/if}} - <div {{bindAttr class=":alert-text-input view.property.showInputForValue:span6:span9"}}> - {{#if view.property.showInputForText}} - {{view Em.TextField valueBinding="view.property.text" disabledBinding="view.property.isDisabled"}} - {{/if}} </div> -</div> \ No newline at end of file +{{/if}} +{{#if view.property.showInputForText}} + <div {{bindAttr class="view.property.showInputForValue:col-md-6:col-md-9"}}> + {{view Em.TextField valueBinding="view.property.text" disabledBinding="view.property.isDisabled" class="form-control"}} + </div> +{{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/create_alert_notification.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/create_alert_notification.hbs b/ambari-web/app/templates/main/alerts/create_alert_notification.hbs index a248e57..e984e29 100644 --- a/ambari-web/app/templates/main/alerts/create_alert_notification.hbs +++ b/ambari-web/app/templates/main/alerts/create_alert_notification.hbs @@ -16,241 +16,263 @@ * limitations under the License. }} -<div id="create-edit-alert-notification"> +<div id="create-edit-alert-notification row"> <form class="form-horizontal"> - {{! alert-notification name }} - <div {{bindAttr class=":control-group controller.inputFields.name.errorMsg:error"}}> - <label class="control-label" for="inputName">{{controller.inputFields.name.label}}</label> - - <div class="controls"> - {{view Em.TextField valueBinding="controller.inputFields.name.value" id="inputName" class="input-xlarge"}} - </div> - - <div class="controls error-msg"> - {{controller.inputFields.name.errorMsg}} + <div {{bindAttr class=":form-group controller.inputFields.name.errorMsg:has-error"}}> + <label class="control-label col-md-2" for="inputName">{{controller.inputFields.name.label}}</label> + <div class="col-md-10"> + {{view Em.TextField valueBinding="controller.inputFields.name.value" id="inputName" classNames="form-control"}} </div> + {{#if controller.inputFields.name.errorMsg}} + <div class="col-md-10 col-md-offset-2 help-block validation-block error-msg"> + {{controller.inputFields.name.errorMsg}} + </div> + {{/if}} </div> {{! alert-notification name end }} {{! alert-notification groups }} - <div class="control-group"> - <label class="control-label" for="inputGroups">{{controller.inputFields.groups.label}}</label> - - <div class="controls"> - + <div class="form-group"> + <label class="control-label col-md-2" for="inputGroups">{{controller.inputFields.groups.label}}</label> + <div class="col-md-10"> <div> {{view Ember.RadioButton name="allGroups" selectionBinding="controller.inputFields.allGroups.value" value="all"}} {{t common.all}} </div> <div> {{view Ember.RadioButton name="allGroups" selectionBinding="controller.inputFields.allGroups.value" value="custom"}} {{t common.custom}} </div> - {{view view.groupsSelectView multiple="true" id="inputGroups" class="input-large" + <div> + {{view view.groupsSelectView multiple="true" id="inputGroups" class="form-control" disabledBinding="controller.inputFields.allGroups.isAll" selectionBinding="controller.inputFields.groups.value" contentBinding="controller.allAlertGroups" optionLabelPath="content.displayName" }} + </div> + <div> <a href="#" {{action selectAllGroups target="view"}} {{bindAttr class="controller.inputFields.allGroups.isAll:disabled view.allGroupsSelected:disabled"}}>{{t alerts.actions.manage_alert_notifications_popup.selectAll}}</a> | <a href="#" {{action clearAllGroups target="view"}} {{bindAttr class="controller.inputFields.allGroups.isAll:disabled view.noneGroupsSelected:disabled"}}>{{t alerts.actions.manage_alert_notifications_popup.clearAll}}</a> + </div> </div> </div> {{! alert-notification groups end }} {{! alert-notification severity }} - <div class="control-group"> - <label class="control-label">{{controller.inputFields.severityFilter.label}}</label> - - <div class="controls"> - {{view view.severitySelectView multiple="true" id="inputSeverity" class="input-large" - selectionBinding="controller.inputFields.severityFilter.value" - contentBinding="controller.severities" - }} - <a href="#" {{action selectAllSeverity target="view"}} {{bindAttr class="view.allSeveritySelected:disabled"}}>{{t alerts.actions.manage_alert_notifications_popup.selectAll}}</a> | - <a href="#" {{action clearAllSeverity target="view"}} {{bindAttr class="view.noneSeveritySelected:disabled"}}>{{t alerts.actions.manage_alert_notifications_popup.clearAll}}</a> + <div class="form-group"> + <label class="control-label col-md-2">{{controller.inputFields.severityFilter.label}}</label> + + <div class="col-md-10"> + <div> + {{view view.severitySelectView multiple="true" id="inputSeverity" class="form-control" + selectionBinding="controller.inputFields.severityFilter.value" + contentBinding="controller.severities" + }} + </div> + <div> + <a href="#" {{action selectAllSeverity target="view"}} {{bindAttr class="view.allSeveritySelected:disabled"}}>{{t alerts.actions.manage_alert_notifications_popup.selectAll}}</a> | + <a href="#" {{action clearAllSeverity target="view"}} {{bindAttr class="view.noneSeveritySelected:disabled"}}>{{t alerts.actions.manage_alert_notifications_popup.clearAll}}</a> + </div> </div> </div> {{! alert-notification severity end }} {{! alert-notification description }} - <div class="control-group"> - <label class="control-label" for="inputDescription">{{controller.inputFields.description.label}}</label> + <div class="form-group"> + <label class="control-label col-md-2" for="inputDescription">{{controller.inputFields.description.label}}</label> - <div class="controls"> - {{view Em.TextArea valueBinding="controller.inputFields.description.value" id="inputDescription" rows="4" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.TextArea valueBinding="controller.inputFields.description.value" id="inputDescription" rows="4" class="form-control"}} </div> </div> {{! alert-notification description end }} {{! alert-notification method }} - <div class="control-group"> - <label class="control-label" for="inputMethod">{{controller.inputFields.method.label}}</label> + <div class="form-group"> + <label class="control-label col-md-2" for="inputMethod">{{controller.inputFields.method.label}}</label> - <div class="controls"> - {{view Em.Select contentBinding="controller.methods" selectionBinding="controller.inputFields.method.value" id="inputMethod" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.Select contentBinding="controller.methods" selectionBinding="controller.inputFields.method.value" id="inputMethod" classNames="form-control"}} </div> </div> {{! alert-notification method end }} {{! alert-notification email }} {{#if view.isEmailMethodSelected}} - <div {{bindAttr class=":control-group controller.inputFields.email.errorMsg:error"}}> - <label class="control-label" for="inputEmail">{{controller.inputFields.email.label}}</label> - - <div class="controls"> - {{view Em.TextField valueBinding="controller.inputFields.email.value" id="inputEmail" class="input-xlarge"}} - </div> + <div {{bindAttr class=":form-group controller.inputFields.email.errorMsg:has-error"}}> + <label class="control-label col-md-2" for="inputEmail">{{controller.inputFields.email.label}}</label> - <div class="controls error-msg"> - {{controller.inputFields.email.errorMsg}} + <div class="col-md-10"> + {{view Em.TextField valueBinding="controller.inputFields.email.value" id="inputEmail" classNames="form-control"}} </div> + {{#if controller.inputFields.email.errorMsg}} + <div class="col-md-10 col-md-offset-2 help-block validation-block error-msg"> + {{controller.inputFields.email.errorMsg}} + </div> + {{/if}} </div> - <div class="control-group"> - <label class="control-label">{{controller.inputFields.SMTPServer.label}}</label> + <div class="form-group"> + <label class="control-label col-md-2">{{controller.inputFields.SMTPServer.label}}</label> - <div class="controls"> - {{view Em.TextField valueBinding="controller.inputFields.SMTPServer.value" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.TextField valueBinding="controller.inputFields.SMTPServer.value" classNames="form-control"}} </div> </div> - <div {{bindAttr class=":control-group controller.inputFields.SMTPPort.errorMsg:error"}}> - <label class="control-label">{{controller.inputFields.SMTPPort.label}}</label> + <div {{bindAttr class=":form-group controller.inputFields.SMTPPort.errorMsg:has-error"}}> + <label class="control-label col-md-2">{{controller.inputFields.SMTPPort.label}}</label> - <div class="controls"> - {{view Em.TextField valueBinding="controller.inputFields.SMTPPort.value"}} + <div class="col-md-10"> + {{view Em.TextField valueBinding="controller.inputFields.SMTPPort.value" classNames="form-control"}} </div> - <div class="controls error-msg"> - {{controller.inputFields.SMTPPort.errorMsg}} - </div> + {{#if controller.inputFields.SMTPPort.errorMsg}} + <div class="col-md-10 col-md-offset-2 help-block validation-block error-msg"> + {{controller.inputFields.SMTPPort.errorMsg}} + </div> + {{/if}} </div> - <div {{bindAttr class=":control-group controller.inputFields.emailFrom.errorMsg:error"}}> - <label class="control-label">{{controller.inputFields.emailFrom.label}}</label> + <div {{bindAttr class=":form-group controller.inputFields.emailFrom.errorMsg:has-error"}}> + <label class="control-label col-md-2">{{controller.inputFields.emailFrom.label}}</label> - <div class="controls"> - {{view Em.TextField valueBinding="controller.inputFields.emailFrom.value" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.TextField valueBinding="controller.inputFields.emailFrom.value" classNames="form-control"}} </div> - <div class="controls error-msg"> - {{controller.inputFields.emailFrom.errorMsg}} - </div> + {{#if controller.inputFields.emailFrom.errorMsg}} + <div class="col-md-10 col-md-offset-2 help-block validation-block error-msg"> + {{controller.inputFields.emailFrom.errorMsg}} + </div> + {{/if}} </div> - <div class="control-group"> - <label class="control-label" for="inputUseAuthentication">{{controller.inputFields.SMTPUseAuthentication.label}}</label> + <div class="form-group"> + <label class="control-label col-md-2" for="inputUseAuthentication">{{controller.inputFields.SMTPUseAuthentication.label}}</label> - <div class="controls"> - {{view Em.Checkbox checkedBinding="controller.inputFields.SMTPUseAuthentication.value" id="inputUseAuthentication" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.Checkbox checkedBinding="controller.inputFields.SMTPUseAuthentication.value" id="inputUseAuthentication"}} </div> </div> - <div {{bindAttr class=":control-group controller.inputFields.SMTPUsername.errorMsg:error"}}> - <label class="control-label">{{controller.inputFields.SMTPUsername.label}}</label> + <div {{bindAttr class=":form-group controller.inputFields.SMTPUsername.errorMsg:has-error"}}> + <label class="control-label col-md-2">{{controller.inputFields.SMTPUsername.label}}</label> - <div class="controls"> - {{view Em.TextField disabledBinding="controller.inputFields.SMTPUseAuthentication.invertedValue" valueBinding="controller.inputFields.SMTPUsername.value" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.TextField disabledBinding="controller.inputFields.SMTPUseAuthentication.invertedValue" valueBinding="controller.inputFields.SMTPUsername.value" classNames="form-control"}} </div> - <div class="controls error-msg"> - {{controller.inputFields.SMTPUsername.errorMsg}} - </div> + {{#if controller.inputFields.SMTPUsername.errorMsg}} + <div class="col-md-10 col-md-offset-2 help-block validation-block error-msg"> + {{controller.inputFields.SMTPUsername.errorMsg}} + </div> + {{/if}} </div> - <div {{bindAttr class=":control-group controller.inputFields.SMTPPassword.errorMsg:error"}}> - <label class="control-label">{{controller.inputFields.SMTPPassword.label}}</label> + <div {{bindAttr class=":form-group controller.inputFields.SMTPPassword.errorMsg:has-error"}}> + <label class="control-label col-md-2">{{controller.inputFields.SMTPPassword.label}}</label> - <div class="controls"> - {{view Em.TextField type="password" disabledBinding="controller.inputFields.SMTPUseAuthentication.invertedValue" valueBinding="controller.inputFields.SMTPPassword.value" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.TextField type="password" disabledBinding="controller.inputFields.SMTPUseAuthentication.invertedValue" valueBinding="controller.inputFields.SMTPPassword.value" classNames="form-control"}} </div> - <div class="controls error-msg"> - {{controller.inputFields.SMTPPassword.errorMsg}} - </div> + {{#if controller.inputFields.SMTPPassword.errorMsg}} + <div class="col-md-10 col-md-offset-2 help-block validation-block error-msg"> + {{controller.inputFields.SMTPPassword.errorMsg}} + </div> + {{/if}} </div> - <div {{bindAttr class=":control-group controller.inputFields.retypeSMTPPassword.errorMsg:error"}}> - <label class="control-label">{{controller.inputFields.retypeSMTPPassword.label}}</label> + <div {{bindAttr class=":form-group controller.inputFields.retypeSMTPPassword.errorMsg:has-error"}}> + <label class="control-label col-md-2">{{controller.inputFields.retypeSMTPPassword.label}}</label> - <div class="controls"> - {{view Em.TextField type="password" disabledBinding="controller.inputFields.SMTPUseAuthentication.invertedValue" valueBinding="controller.inputFields.retypeSMTPPassword.value" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.TextField type="password" disabledBinding="controller.inputFields.SMTPUseAuthentication.invertedValue" valueBinding="controller.inputFields.retypeSMTPPassword.value" classNames="form-control"}} </div> - <div class="controls error-msg"> - {{controller.inputFields.retypeSMTPPassword.errorMsg}} - </div> + {{#if controller.inputFields.retypeSMTPPassword.errorMsg}} + <div class="col-md-10 col-md-offset-2 help-block validation-block error-msg"> + {{controller.inputFields.retypeSMTPPassword.errorMsg}} + </div> + {{/if}} </div> - <div class="control-group"> - <label class="control-label" for="inputSMTPSTARTTLS">{{controller.inputFields.SMTPSTARTTLS.label}}</label> + <div class="form-group"> + <label class="control-label col-md-2" for="inputSMTPSTARTTLS">{{controller.inputFields.SMTPSTARTTLS.label}}</label> - <div class="controls"> - {{view Em.Checkbox disabledBinding="controller.inputFields.SMTPUseAuthentication.invertedValue" checkedBinding="controller.inputFields.SMTPSTARTTLS.value" id="inputSMTPSTARTTLS" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.Checkbox disabledBinding="controller.inputFields.SMTPUseAuthentication.invertedValue" checkedBinding="controller.inputFields.SMTPSTARTTLS.value" id="inputSMTPSTARTTLS"}} </div> </div> {{else}} - <div class="control-group"> - <label class="control-label">{{controller.inputFields.version.label}}</label> + <div class="form-group"> + <label class="control-label col-md-2">{{controller.inputFields.version.label}}</label> - <div class="controls"> - {{view Em.Select selectionBinding="controller.inputFields.version.value" contentBinding="controller.SNMPVersions" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.Select selectionBinding="controller.inputFields.version.value" contentBinding="controller.SNMPVersions" classNames="form-control"}} </div> </div> - <div class="control-group"> - <label class="control-label">{{controller.inputFields.OIDs.label}}</label> + <div class="form-group"> + <label class="control-label col-md-2">{{controller.inputFields.OIDs.label}}</label> - <div class="controls"> - {{view Em.TextField valueBinding="controller.inputFields.OIDs.value" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.TextField valueBinding="controller.inputFields.OIDs.value" classNames="form-control"}} </div> </div> - <div class="control-group"> - <label class="control-label">{{controller.inputFields.community.label}}</label> + <div class="form-group"> + <label class="control-label col-md-2">{{controller.inputFields.community.label}}</label> - <div class="controls"> - {{view Em.TextField valueBinding="controller.inputFields.community.value" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.TextField valueBinding="controller.inputFields.community.value" classNames="form-control"}} </div> </div> - <div {{bindAttr class=":control-group controller.inputFields.host.errorMsg:error"}}> - <label class="control-label">{{controller.inputFields.host.label}}</label> + <div {{bindAttr class=":form-group controller.inputFields.host.errorMsg:has-error"}}> + <label class="control-label col-md-2">{{controller.inputFields.host.label}}</label> - <div class="controls"> - {{view Em.TextField valueBinding="controller.inputFields.host.value" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.TextField valueBinding="controller.inputFields.host.value" classNames="form-control"}} </div> - <div class="controls error-msg"> + {{#if controller.inputFields.host.errorMsg}} + <div class="col-md-10 col-md-offset-2 help-block validation-block error-msg"> {{controller.inputFields.host.errorMsg}} </div> + {{/if}} </div> - <div {{bindAttr class=":control-group controller.inputFields.port.errorMsg:error"}}> - <label class="control-label">{{controller.inputFields.port.label}}</label> + <div {{bindAttr class=":form-group controller.inputFields.port.errorMsg:has-error"}}> + <label class="control-label col-md-2">{{controller.inputFields.port.label}}</label> - <div class="controls"> - {{view Em.TextField valueBinding="controller.inputFields.port.value" class="input-xlarge"}} + <div class="col-md-10"> + {{view Em.TextField valueBinding="controller.inputFields.port.value" classNames="form-control"}} </div> - <div class="controls error-msg"> + {{#if controller.inputFields.port.errorMsg}} + <div class="col-md-10 col-md-offset-2 help-block validation-block error-msg"> {{controller.inputFields.port.errorMsg}} </div> + {{/if}} </div> {{/if}} {{! alert-notification email end }} {{! alert-notification custom properties }} {{#each customProperty in controller.inputFields.customProperties}} - <div class="control-group"> - <label class="control-label" for="inputGroups">{{customProperty.name}}</label> + <div class="form-group"> + <label class="control-label col-md-2" for="inputGroups">{{customProperty.name}}</label> - <div class="controls"> - {{view Em.TextField valueBinding="customProperty.value" class="input-xlarge"}} - <a href="#" {{action "removeCustomPropertyHandler" customProperty target="controller"}} class="btn-small"><span class="icon-minus-sign"></span></a> + <div class="col-md-9"> + {{view Em.TextField valueBinding="customProperty.value" classNames="form-control"}} + </div> + <div class="col-md-1"> + <a href="#" {{action "removeCustomPropertyHandler" customProperty target="controller"}} class="btn-sm"><span class="icon-minus-sign"></span></a> </div> </div> {{/each}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/main/alerts/create_new_alert_group.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/create_new_alert_group.hbs b/ambari-web/app/templates/main/alerts/create_new_alert_group.hbs index 170c8e8..d60d7bc 100644 --- a/ambari-web/app/templates/main/alerts/create_new_alert_group.hbs +++ b/ambari-web/app/templates/main/alerts/create_new_alert_group.hbs @@ -24,10 +24,12 @@ {{/if}} </div> - <table> - <tr> - <td class="title">{{t common.name}}: </td> - <td>{{view Ember.TextField maxlength="255" valueBinding="alertGroupName"}}</td> - </tr> - </table> + <form class="form-horizontal"> + <div class="form-group"> + <label class="control-label col-md-3">{{t common.name}}: </label> + <div class="col-md-7"> + {{view Ember.TextField maxlength="255" valueBinding="alertGroupName" classNames="form-control"}} + </div> + </div> + </form> </div>
