Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ambari-web/app/templates/common/configs/overrideWindow.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
{{view Ember.TextField valueBinding="view.filterText" id="appendedDropdownButton"
placeholderBinding="view.filterTextPlaceholder" classNames="form-control" disabledBinding="view.isDisabled"}}
<div class="input-group-btn">
<button class="btn btn-default dropdown-toggle" data-bs-toggle=="dropdown" {{bindAttr disabled="view.isDisabled"}}>
<button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" {{bindAttr disabled="view.isDisabled"}}>
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
Expand All @@ -63,7 +63,7 @@
<div class="col-md-5" id="component-dropdown-div">
<!-- Host-components drop-down -->
<div>
<button class="btn btn-block btn-default dropdown-toggle" data-bs-toggle=="dropdown" href="#" {{bindAttr disabled="view.isDisabled"}}>
<button class="btn btn-block btn-default dropdown-toggle" data-bs-toggle="dropdown" href="#" {{bindAttr disabled="view.isDisabled"}}>
{{t common.components}}
<span class="caret"></span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div class="select-create-config-group-div">
<div class="btn-group">
<button class="btn btn-default" {{bindAttr disabled="view.parentView.optionCreateConfigGroup"}}>{{view.parentView.selectedConfigGroup.name}}</button>
<button class="btn btn-default dropdown-toggle btn-icon" data-bs-toggle=="dropdown" {{bindAttr disabled="view.parentView.optionCreateConfigGroup"}}>
<button class="btn btn-default dropdown-toggle btn-icon" data-bs-toggle="dropdown" {{bindAttr disabled="view.parentView.optionCreateConfigGroup"}}>
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
{{#if controller.selectedConfigGroup.isDefault}}
<span class="label label-info">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span>
{{#if controller.isCurrentSelected}}
<span class="label label-success glyphicon glyphicon-ok label-current" data-bs-toggle=="tooltip" {{translateAttr title="common.current"}}></span>
<span class="label label-success glyphicon glyphicon-ok label-current" data-bs-toggle="tooltip" {{translateAttr title="common.current"}}></span>
{{/if}}
{{#if view.config.supportsFinal}}
<i {{bindAttr class=":glyphicon :glyphicon-lock view.config.isFinal::hidden" }}></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
{{#if view.showPencil}}
{{#if view.isWidgetViewAllowed}}
<a href="#"
data-bs-toggle=="tooltip" {{translateAttr data-original-title="common.edit"}}
data-bs-toggle="tooltip" {{translateAttr data-original-title="common.edit"}}
{{bindAttr class=":glyphicon :glyphicon-pencil :widget-action :widget-action-switch-view view.config.showAsTextBox::active"}}
{{action "toggleWidgetView" target="view"}}>
</a>
{{else}}
<i class="icon-pencil widget-action widget-action-switch-view text-danger"
data-bs-toggle=="tooltip" {{bindAttr data-original-title="view.issueMessage"}}></i>
data-bs-toggle="tooltip" {{bindAttr data-original-title="view.issueMessage"}}></i>
{{/if}}
{{/if}}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}}

{{#if view.config.supportsFinal}}
<a href="#" data-bs-toggle=="tooltip"
<a href="#" data-bs-toggle="tooltip"
{{bindAttr class=":widget-action :widget-action-final view.config.isFinal:active view.showFinalConfig:show:hide" disabled="view.config.isNotEditable"}}
{{action "toggleFinalFlag" view.config target="view"}}
{{translateAttr data-original-title="services.service.config.final"}}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{{#unless view.isOriginalSCP}}
{{#unless view.disabled}}
{{#isAuthorized "SERVICE.MODIFY_CONFIGS"}}
<a {{bindAttr class=":widget-action :widget-action-remove"}} href="#" data-bs-toggle=="tooltip"
<a {{bindAttr class=":widget-action :widget-action-remove"}} href="#" data-bs-toggle="tooltip"
{{action "removeOverride" view.config target="view.parentView"}}
{{translateAttr data-original-title="common.remove"}}>
<i class="glyphicon glyphicon-minus-sign"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div {{bindAttr class="view.config.isHiddenByFilter:hide view.isOriginalSCP:original-widget"}}>
{{template "templates/common/configs/widgets/config_label"}}
<div class="pull-left btn-group">
<a {{bindAttr class=":btn :btn-default :dropdown-toggle view.config.isEditable::disabled view.doNotShowWidget:hide"}} data-bs-toggle=="dropdown">{{view.displayVal}} <span class="caret"></span></a>
<a {{bindAttr class=":btn :btn-default :dropdown-toggle view.config.isEditable::disabled view.doNotShowWidget:hide"}} data-bs-toggle="dropdown">{{view.displayVal}} <span class="caret"></span></a>
<ul class="dropdown-menu">
{{#each option in view.options}}
<li>
Expand Down
8 changes: 4 additions & 4 deletions ambari-web/app/templates/common/host_progress_popup.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<h2 class="table-title col-sm-2">{{t common.hosts}}</h2>
<div class="table-controls col-sm-10">
<div class="btn-group pull-right status-dropdown">
<button type="button" class="btn btn-default dropdown-toggle" data-bs-toggle=="dropdown" aria-haspopup="true"
<button type="button" class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true"
aria-expanded="false">
{{view.hostCategory.label}} <span class="caret"></span>
</button>
Expand Down Expand Up @@ -203,7 +203,7 @@
<h2 class="table-title col-sm-2">{{t common.tasks}}</h2>
<div class="table-controls col-sm-10">
<div class="btn-group pull-right status-dropdown">
<button type="button" class="btn btn-default dropdown-toggle" data-bs-toggle=="dropdown" aria-haspopup="true"
<button type="button" class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true"
aria-expanded="false">
{{view.taskCategory.label}} <span class="caret"></span>
</button>
Expand Down Expand Up @@ -289,12 +289,12 @@
<ul {{bindAttr class="view.hostComponentLogsExists::hide :nav :nav-tabs :task-detail-nav"}}>
<li {{bindAttr class="view.isLevelLoaded:active"}}>
<a href="#" data-target="#task-log-tab"
data-bs-toggle=="tab" {{action setActiveTaskLogTab target="view"}}>{{t app.name}} stdout/stderr</a>
data-bs-toggle="tab" {{action setActiveTaskLogTab target="view"}}>{{t app.name}} stdout/stderr</a>
</li>
{{#each hostLog in view.hostComponentLogs}}
<li>
<a href="#" {{action setActiveLogTab hostLog target="view"}} {{bindAttr data-target="hostLog.tabClassNameSelector"}}
data-bs-toggle=="tab">{{hostLog.displayedFileName}}</a>
data-bs-toggle="tab">{{hostLog.displayedFileName}}</a>
</li>
{{/each}}
</ul>
Expand Down
4 changes: 2 additions & 2 deletions ambari-web/app/templates/common/metric.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
{{#each view.moreMetrics}}
<div class="panel-group">
<div class="panel-heading">
<a class="panel-toggle" data-bs-toggle=="collapse" data-parent="#metricAccordion"
<a class="panel-toggle" data-bs-toggle="collapse" data-parent="#metricAccordion"
href="#{{unbound code}}Collapse">
<i class="glyphicon glyphicon-play"></i>{{unbound label}}
</a>
Expand All @@ -56,4 +56,4 @@
</div>
{{/if}}
</li>
</ul>
</ul>
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</button>
{{else}}
<div class="btn-group">
<button class="btn btn-default dropdown-toggle" data-bs-toggle=="dropdown">
<button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown">
{{t common.more}}<span class="caret"></span>
</button>
<ul class="dropdown-menu">
Expand Down
2 changes: 1 addition & 1 deletion ambari-web/app/templates/common/widget/gauge_widget.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{{/if}}
</div>
<div {{bindAttr class="view.parentView.isMoving:hidden :corner-icon :widget-icons view.isPreview:hidden"}}>
<button class="dropdown-toggle ellipsis-menu button-border" data-bs-toggle=="dropdown" href="#"></button>
<button class="dropdown-toggle ellipsis-menu button-border" data-bs-toggle="dropdown" href="#"></button>
<ul class="dropdown-menu">
{{#if controller.isAmbariMetricsInstalled}}
<li>
Expand Down
2 changes: 1 addition & 1 deletion ambari-web/app/templates/common/widget/graph_widget.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{{/if}}
</div>
<div {{bindAttr class="view.parentView.isMoving:hidden :corner-icon :widget-icons view.isPreview:hidden"}}>
<button class="dropdown-toggle ellipsis-menu button-border" data-bs-toggle=="dropdown" href="#"></button>
<button class="dropdown-toggle ellipsis-menu button-border" data-bs-toggle="dropdown" href="#"></button>
<ul class="dropdown-menu">
<li>
<a href="#" {{bindAttr class="view.isExportButtonHidden:hidden"}}
Expand Down
2 changes: 1 addition & 1 deletion ambari-web/app/templates/common/widget/number_widget.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{{/if}}
</div>
<div {{bindAttr class="view.parentView.isMoving:hidden :corner-icon :widget-icons view.isPreview:hidden"}}>
<button class="dropdown-toggle ellipsis-menu button-border" data-bs-toggle=="dropdown" href="#"></button>
<button class="dropdown-toggle ellipsis-menu button-border" data-bs-toggle="dropdown" href="#"></button>
<ul class="dropdown-menu">
{{#if controller.isAmbariMetricsInstalled}}
<li>
Expand Down
2 changes: 1 addition & 1 deletion ambari-web/app/templates/common/widget/template_widget.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{{/if}}
</div>
<div {{bindAttr class="view.parentView.isMoving:hidden :corner-icon :widget-icons view.isPreview:hidden"}}>
<button class="dropdown-toggle ellipsis-menu button-border" data-bs-toggle=="dropdown" href="#"></button>
<button class="dropdown-toggle ellipsis-menu button-border" data-bs-toggle="dropdown" href="#"></button>
<ul class="dropdown-menu">
{{#if controller.isAmbariMetricsInstalled}}
<li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
{{#view view.skipCheckBox labelTranslate="installer.step1.advancedRepo.skipValidation.message"
checkedBinding="view.parentView.skipValidation"}}
<i class="glyphicon glyphicon-question-sign" rel="skip-validation-tooltip"
data-bs-toggle=="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}>
data-bs-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}>
</i>
{{/view}}
</div>
Expand All @@ -68,7 +68,7 @@
labelTranslate="installer.step1.advancedRepo.useRedhatSatellite.message"
checkedBinding="view.content.useRedhatSatellite"}}
<i class="glyphicon glyphicon-question-sign" rel="use-redhat-tooltip"
data-bs-toggle=="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}>
data-bs-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}>
</i>
{{/view}}
</div>