Skip to content

Commit

Permalink
118627: update mr to me & ml to ms & pr to ps & pl to ps
Browse files Browse the repository at this point in the history
  • Loading branch information
Wout-atmire committed Oct 18, 2024
1 parent 94d446e commit 5442dc3
Show file tree
Hide file tree
Showing 22 changed files with 37 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ <h3 id="search" class="border-bottom pb-2">
</h3>

<form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
<div class="flex-grow-1 mr-3">
<div class="form-group input-group mr-3">
<div class="flex-grow-1 me-3">
<div class="form-group input-group me-3">
<input type="text" name="query" id="query" formControlName="query"
class="form-control" aria-label="Search input">
<span class="input-group-append">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
<div class="mb-5 mt-5">
<!-- In the url section -->
<div class="d-flex align-items-center">
<div class="d-flex flex-column w-50 mr-2">
<div class="d-flex flex-column w-50 me-2">
<label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
<input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
[placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
Expand Down Expand Up @@ -73,7 +73,7 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
<label for="lowerIp" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
<div class="d-flex">
<input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
[placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control mr-2"
[placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control me-2"
formControlName="lowerIp"
id="lowerIp"
name="lowerIp"
Expand Down Expand Up @@ -298,15 +298,15 @@ <h4 *ngIf="isNewService">{{'service.overview.create.modal' | translate }}</h4>
</div>
<div class="modal-footer">
<div *ngIf="!isNewService">
<button (click)="closeModal()" class="btn btn-outline-secondary mr-2"
<button (click)="closeModal()" class="btn btn-outline-secondary me-2"
id="delete-confirm-edit">{{ 'service.detail.return' | translate }}
</button>
<button *ngIf="!isNewService" (click)="patchService()"
class="btn btn-primary">{{ 'service.detail.update' | translate }}
</button>
</div>
<div *ngIf="isNewService">
<button (click)="closeModal()" class="btn btn-outline-secondary mr-2 "
<button (click)="closeModal()" class="btn btn-outline-secondary me-2 "
id="delete-confirm-new">{{ 'service.refuse.create' | translate }}
</button>
<button (click)="createService()"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h1 class="flex-grow-1">{{ 'ldn-registered-services.title' | translate }}</h1>
</div>
<div class="d-flex justify-content-end">
<button class="btn btn-success" routerLink="/admin/ldn/services/new"><i
class="fas fa-plus pr-2"></i>{{ 'process.overview.new' | translate }}</button>
class="fas fa-plus pe-2"></i>{{ 'process.overview.new' | translate }}</button>
</div>
<ds-pagination *ngIf="(ldnServicesRD$ | async)?.payload?.totalElements > 0"
[collectionSize]="(ldnServicesRD$ | async)?.payload?.totalElements"
Expand Down Expand Up @@ -85,7 +85,7 @@ <h4>{{'service.overview.delete.header' | translate }}</h4>
<div class="mt-4 text-right">
<button (click)="closeModal()"
[attr.aria-label]="'ldn-service-overview-close-modal' | translate"
class="btn btn-outline-secondary mr-2">{{ 'service.detail.delete.cancel' | translate }}</button>
class="btn btn-outline-secondary me-2">{{ 'service.detail.delete.cancel' | translate }}</button>
<button (click)="deleteSelected(this.selectedServiceId.toString(), ldnServicesService)"
class="btn btn-danger"
[attr.aria-label]="'ldn-service-overview-select-delete' | translate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="col-12 col-md-3 text-left h4">{{((isInbound$ | async) ? 'admin.notify.dashboard.inbound' : 'admin.notify.dashboard.outbound') | translate}}</div>
<div class="col-md-9">
<div class="h4">
<button (click)="resetDefaultConfiguration()" *ngIf="(selectedSearchConfig$ | async) !== defaultConfiguration" class="badge badge-primary mr-1 mb-1">
<button (click)="resetDefaultConfiguration()" *ngIf="(selectedSearchConfig$ | async) !== defaultConfiguration" class="badge badge-primary me-1 mb-1">
{{ 'admin-notify-logs.' + (selectedSearchConfig$ | async) | translate}}
<span> ×</span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<div class="mt-2" *ngIf=" mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)">
<div class="btn-group w-75">
<i dsAuthorityConfidenceState
class="fas fa-fw p-0 mr-1 mt-auto mb-auto"
class="fas fa-fw p-0 me-1 mt-auto mb-auto"
aria-hidden="true"
[authorityValue]="mdValue.newValue.confidence"
[iconMode]="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
onerror="this.src='assets/images/dspace-logo.svg'">
</div>
<div class="w-100 d-flex justify-content-between">
<div class="pl-4 align-self-center">
<div class="ps-4 align-self-center">
{{'item.qa-event-notification.check.notification-info' | translate : {num: source.totalEvents } }}
</div>
<button [routerLink]="[ getQualityAssuranceRoute(), (source.id | dsSplit: ':')[0], 'target', item.id]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
</ng-template>
<span *ngIf="version?.id === itemVersion?.id">*</span>

<span *ngIf="workspaceId$ | async" class="text-light badge badge-primary ml-3">
<span *ngIf="workspaceId$ | async" class="text-light badge badge-primary ms-3">
{{ "item.version.history.table.workspaceItem" | translate }}
</span>

<span *ngIf="workflowId$ | async" class="text-light badge badge-info ml-3">
<span *ngIf="workflowId$ | async" class="text-light badge badge-info ms-3">
{{ "item.version.history.table.workflowItem" | translate }}
</span>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/>
</div>
<div class="w-100 d-flex justify-content-between">
<div class="pl-4 align-self-center">
<div class="ps-4 align-self-center">
{{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}
</div>
<button
Expand Down
2 changes: 1 addition & 1 deletion src/app/navbar/navbar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
<ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
</ng-container>
<div class="navbar-nav align-items-md-center mr-auto shadow-none gapx-3">
<div class="navbar-nav align-items-md-center me-auto shadow-none gapx-3">
<ng-container *ngFor="let section of (sections | async)">
<ng-container
*ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ <h4 class="border-bottom pb-2">
[routerLink]="['/items', eventElement?.target?.id]">{{eventElement.title}}</a>
<span *ngIf="!eventElement?.target">{{eventElement.title}}</span>
<div *ngIf="eventElement?.event?.message?.serviceId">
<span class="small pr-1">{{'quality-assurance.event.table.event.message.serviceUrl' | translate}}</span>
<span class="small pe-1">{{'quality-assurance.event.table.event.message.serviceUrl' | translate}}</span>
<span [title]="eventElement.event.message.serviceId">
<a [href]="eventElement.event.message.serviceId" target="_blank">{{eventElement.event.message.serviceId}}</a>
</span>
</div>
<div *ngIf="eventElement?.event?.message?.href" class="d-flex align-items-center">
<span class="small pr-1">{{'quality-assurance.event.table.event.message.link' | translate}}</span>
<span class="small pe-1">{{'quality-assurance.event.table.event.message.link' | translate}}</span>
<span [title]="eventElement.event.message.href" class="text-truncate d-inline-block w-75">
<a [href]="eventElement.event.message.href" target="_blank">{{eventElement.event.message.href}}</a>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</ng-template>

</div>
<button (click)="ignoreSuggestion()" class="btn btn-danger ml-2"><i class="fa fa-ban"></i>
<button (click)="ignoreSuggestion()" class="btn btn-danger ms-2"><i class="fa fa-ban"></i>
{{ ignoreSuggestionLabel() | translate}}</button>
<button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [disabled]="!hasEvidence" class="btn btn-info ml-2">
<button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [disabled]="!hasEvidence" class="btn btn-info ms-2">
<i class="fa fa-eye"></i>
<ng-container *ngIf="!seeEvidence"> {{ 'suggestion.seeEvidence' | translate}}</ng-container>
<ng-container *ngIf="seeEvidence"> {{ 'suggestion.hideEvidence' | translate}}</ng-container>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="notifications-wrapper position-fixed top right" *ngIf="suggestionsRD$ | async">
<div class="notification alert alert-success alert-dismissible m-3 shadow" role="alert">
<button (click)="removePopup()"
type="button" class="close pt-0 pr-1 pl-0 pb-0" data-dismiss="alert" aria-label="Close">
type="button" class="close pt-0 pe-1 pe-0 pb-0" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ <h2 class="flex-grow-1">
*ngIf="(processesRD$ | async) as processesRD">
{{processesRD?.payload?.totalElements}}
</span>
<span class="ml-2 toggle-icon">
<span class="ms-2 toggle-icon">
<i class="fas" [ngClass]="collapse.collapsed ? 'fa-angle-right' : 'fa-angle-down'"></i>
</span>
</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
</div>
</div>
<div class="modal-footer space-children-mr">
<button class="btn btn-outline-secondary btn-sm ml-0"
<button class="btn btn-outline-secondary btn-sm ms-0"
type="button"
(click)="onModalClose()"
title="{{'item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip' | translate}}">
<i class="fas fa-times fa-fw"></i> {{'item.qa.withdrawn-reinstate.create.modal.button.cancel' | translate}}
</button>
<button class="btn btn-success btn-sm ml-0"
<button class="btn btn-success btn-sm ms-0"
type="submit"
(click)="onModalSubmit()"
title="{{'item.qa.withdrawn-reinstate.modal.button.confirm.tooltip' | translate}}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
<button class="btn btn-primary submit"
[disabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
(click)="submitEv()">
<span *ngIf="isPending" class="spinner-border spinner-border-sm mr-1" role="status"
<span *ngIf="isPending" class="spinner-border spinner-border-sm me-1" role="status"
aria-hidden="true"></span>
<i *ngIf="!isPending" class="fas fa-save"></i>
<span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h2 *ngIf="(loading | async) !== true && dataSource.data.length === 0" class="h4
<cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
<!-- Leaf node -->
<cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">
<span aria-hidden="true" type="button" class="btn btn-default px-2 mr-1" cdkTreeNodeToggle>
<span aria-hidden="true" type="button" class="btn btn-default px-2 me-1" cdkTreeNodeToggle>
<i class="fas fa-fw fa-angle-right invisible"></i>
</span>
<label *ngIf="multiSelect" class="form-label d-flex align-items-center m-0 p-0 form-check"
Expand Down Expand Up @@ -60,7 +60,7 @@ <h2 *ngIf="(loading | async) !== true && dataSource.data.length === 0" class="h4

<!-- expandable node -->
<cdk-tree-node *cdkTreeNodeDef="let node; when: hasChildren" cdkTreeNodePadding class="d-flex">
<button type="button" class="btn btn-default px-2 mr-1" cdkTreeNodeToggle
<button type="button" class="btn btn-default px-2 me-1" cdkTreeNodeToggle
[attr.aria-label]="'toggle ' + node.name"
(click)="loadChildren(node)">
<i class="fas fa-fw {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class="badge badge-primary">
<span class="d-flex">
<span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate}}: {{ min }}</span>
<span class="pl-1" aria-hidden="true">×</span>
<span class="ps-1" aria-hidden="true">×</span>
</span>
</a>
<a *ngIf="max !== '*'"
Expand All @@ -17,6 +17,6 @@
class="badge badge-primary">
<span class="d-flex">
<span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate}}: {{ max }}</span>
<span class="pl-1" aria-hidden="true">×</span>
<span class="ps-1" aria-hidden="true">×</span>
</span>
</a>
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
(click)="searchFilterService.minimizeAll()">
<span class="d-flex">
<span class="flex-grow-1 text-left">{{ ('search.filters.applied.f.' + appliedFilter.filter) | translate}}{{'search.filters.applied.operator.' + appliedFilter.operator | translate}}: {{'search.filters.' + appliedFilter.filter + '.' + appliedFilter.label | translate: { default: appliedFilter.label } }}</span>
<span class="pl-1" aria-hidden="true">×</span>
<span class="ps-1" aria-hidden="true">×</span>
</span>
</a>
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ <h5>
<div class="m-2">
<div (click)="setAccepted(!accepted)">
<input type="checkbox"
class="mr-2"
class="me-2"
title="accepted"
[checked]="accepted">
<span> {{ 'submission.sections.ccLicense.confirmation' | translate }}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</div>
<button *ngIf="ldnServiceByPattern[ldnPattern.pattern].services.length > 1"
type="button" [class.mt-2]="serviceIndex > 0"
class="btn btn-secondary ml-2"
class="btn btn-secondary ms-2"
role="button"
title="{{'form.remove' | translate}}"
[attr.aria-label]="'form.remove' | translate"
Expand Down Expand Up @@ -102,8 +102,8 @@
<div
class="alert alert-info w-100 d-flex align-items-center flex-row"
>
<i class="fa-solid fa-circle-info fa-xl ml-2"></i>
<div class="ml-4">
<i class="fa-solid fa-circle-info fa-xl ms-2"></i>
<div class="ms-4">
<div>{{ 'submission.section.section-coar-notify.selection.description' | translate }}</div>
<div *ngIf="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.description; else noDesc">
{{ ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex].description }}
Expand All @@ -120,7 +120,7 @@
<div
class="alert alert-danger w-100 d-flex align-items-center flex-row"
>
<div class="ml-4">
<div class="ms-4">
<span>
{{ 'submission.section.section-coar-notify.notification.error' | translate }}
</span>
Expand All @@ -130,7 +130,7 @@
<div class="row">
<div *ngIf="ldnPattern.multipleRequest && (serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length - 1)"
(click)="addNewService(ldnPattern)"
class="btn btn-link mt-2 pl-0"
class="btn btn-link mt-2 ps-0"
>
<i class="fas fa-plus"></i>
{{ 'submission.sections.general.add-more' | translate }}
Expand Down
2 changes: 1 addition & 1 deletion src/app/suggestions-page/suggestions-page.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1>
</h1>

<div class="mb-3 mt-3">
<button class="btn mr-2 btn-light" (click)="onToggleSelectAll(suggestionsRD.page)">Select / Deselect All</button>
<button class="btn me-2 btn-light" (click)="onToggleSelectAll(suggestionsRD.page)">Select / Deselect All</button>
<em>({{ getSelectedSuggestionsCount() }})</em>
<ds-suggestion-actions *ngIf="getSelectedSuggestionsCount() > 0"
class="m-2"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/dspace/app/header/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ds-auth-nav-menu></ds-auth-nav-menu>
</div>

<div id="mobile-navbar-toggler" class="d-block d-lg-none ml-3" *ngIf="(isMobile$ | async)">
<div id="mobile-navbar-toggler" class="d-block d-lg-none ms-3" *ngIf="(isMobile$ | async)">
<button id="navbar-toggler" class="btn" type="button" (click)="toggleNavbar()"
[attr.aria-label]="'nav.toggle' | translate" aria-controls="collapsible-mobile-navbar" [attr.aria-expanded]="(isNavBarCollapsed$ | async) !== true">
<span class="fas fa-bars fa-fw fa-xl toggler-icon" aria-hidden="true"></span>
Expand Down

0 comments on commit 5442dc3

Please sign in to comment.