Skip to content

Commit

Permalink
Merge pull request DSpace#3225 from 4Science/task/main/CST-15591
Browse files Browse the repository at this point in the history
Fixed headings by their rank
  • Loading branch information
tdonohue authored Nov 13, 2024
2 parents e267244 + b0356c5 commit 0417e1d
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 25 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="container" *ngIf="(isLoading$ | async) === false">
<div class="row">
<div class="col-12 pb-4">
<h2 id="sub-header"
class="border-bottom pb-2">{{ 'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h2>
<h1 id="sub-header"
class="border-bottom pb-2">{{ 'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h1>
</div>
</div>
<ds-collection-form (submitForm)="onSubmit($event)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<div class="row">
<div class="col-12 pb-4">
<ng-container *ngVar="(parentRD$ | async)?.payload as parent">
<h2 *ngIf="!parent" id="header" class="border-bottom p-2">{{ 'community.create.head' | translate }}</h2>
<h2 *ngIf="parent" id="sub-header"
class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h2>
<h1 *ngIf="!parent" id="header" class="border-bottom p-2">{{ 'community.create.head' | translate }}</h1>
<h1 *ngIf="parent" id="sub-header"
class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h1>
</ng-container>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="container">
<div class="row">
<div class="col-12">
<h2 class="border-bottom pb-2">
<h1 class="border-bottom pb-2">
<div class="d-flex justify-content-between">
{{'notifications.events.title'| translate}}
</div>
</h2>
</h1>
<ds-alert *ngIf="!targetId" [type]="'alert-info'">
<span [innerHTML]="'quality-assurance.events.description' | translate : {topic: selectedTopicName, source: sourceId}"></span>
</ds-alert>
Expand All @@ -17,9 +17,9 @@ <h2 class="border-bottom pb-2">
</div>
<div class="row">
<div class="col-12">
<h4 class="border-bottom pb-2">
<h2 class="border-bottom pb-2">
{{'quality-assurance.events.topic' | translate}} {{this.showTopic}}
</h4>
</h2>

<ds-loading class="container" *ngIf="(isEventPageLoading | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>

Expand Down Expand Up @@ -247,7 +247,7 @@ <h4 class="modal-title" id="acceptModal">{{'quality-assurance.event.sure' | tran

<ng-template #ignoreModal let-modal>
<div class="modal-header">
<h4 class="modal-title" id="ignoreModal">{{'quality-assurance.event.sure' | translate}}</h4>
<h1 class="modal-title h4" id="ignoreModal">{{'quality-assurance.event.sure' | translate}}</h1>
</div>
<div class="modal-body">
<p>{{'quality-assurance.event.ignore.description' | translate}}</p>
Expand All @@ -264,7 +264,7 @@ <h4 class="modal-title" id="ignoreModal">{{'quality-assurance.event.sure' | tran

<ng-template #rejectModal let-modal>
<div class="modal-header">
<h4 class="modal-title" id="rejectModal">{{'quality-assurance.event.sure' | translate}}</h4>
<h1 class="modal-title h4" id="rejectModal">{{'quality-assurance.event.sure' | translate}}</h1>
</div>
<div class="modal-body">
<p>{{'quality-assurance.event.reject.description' | translate}}</p>
Expand All @@ -281,7 +281,7 @@ <h4 class="modal-title" id="rejectModal">{{'quality-assurance.event.sure' | tran

<ng-template #undoModal let-modal>
<div class="modal-header">
<h4 class="modal-title" id="undoModal">{{'quality-assurance.event.sure' | translate}}</h4>
<h1 class="modal-title h4" id="undoModal">{{'quality-assurance.event.sure' | translate}}</h1>
</div>
<div class="modal-body">
<p>{{'quality-assurance.event.undo.description' | translate}}</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="container">
<div class="row">
<div class="col-12">
<h2 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h2>
<h1 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h1>
<ds-alert [type]="'alert-info'" [content]="'quality-assurance.source.description'"></ds-alert>
</div>
</div>
<div class="row">
<div class="col-12">
<h3 class="h4 border-bottom pb-2">{{'quality-assurance.source'| translate}}</h3>
<h2 class="h4 border-bottom pb-2">{{'quality-assurance.source'| translate}}</h2>

<ds-loading class="container" *ngIf="(isSourceLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
<ds-pagination *ngIf="(isSourceLoading() | async) !== true"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container">
<div class="row">
<div class="col-12">
<h2 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h2>
<h1 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h1>
<ds-alert *ngIf="!targetId" [type]="'alert-info'">{{'quality-assurance.topics.description'| translate:{source: sourceId} }}</ds-alert>
<ds-alert *ngIf="targetId" [type]="'alert-info'">
{{'quality-assurance.topics.description-with-target'| translate:{source: sourceId} }}
Expand All @@ -11,7 +11,7 @@ <h2 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h2>
</div>
<div class="row">
<div class="col-12">
<h4 class="border-bottom pb-2">{{'quality-assurance.topics'| translate}}</h4>
<h2 class="border-bottom pb-2">{{'quality-assurance.topics'| translate}}</h2>

<ds-loading class="container" *ngIf="(isTopicsLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
<ds-pagination *ngIf="(isTopicsLoading() | async) !== true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<ng-template #content let-c="close" let-d="dismiss">
<div class="modal-header">
<h4 class="modal-title text-danger">{{'submission.general.discard.confirm.title' | translate}}</h4>
<div class="modal-title text-danger h4">{{'submission.general.discard.confirm.title' | translate}}</div>
<button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
<span aria-hidden="true">&times;</span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ds-badges [object]="item" [context]="badgeContext" [showAccessStatus]="true"></ds-badges>
</div>
<ds-truncatable [id]="item.id">
<h3 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h3>
<h2 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h2>
<div>
<span class="text-muted">
<ds-truncatable-part [id]="item.id" [minLines]="1">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
</div>
<div class="modal-body">
<button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.button'| translate }}</button>
<h3 class="position-relative py-1 my-3 font-weight-normal">
<div class="position-relative py-1 my-3 font-weight-normal h3">
<hr>
<div id="create-community-or-separator" class="text-center position-absolute w-100">
<span class="px-4 bg-white">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.or-divider' | translate}}</span>
</div>
</h3>
</div>

<h5 class="px-2">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h5>
<h2 class="px-2 h5">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h2>
<ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="d-flex justify-content-between">
<h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h2>
<h1 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
<ds-search-export-csv *ngIf="showCsvExport" [searchConfig]="searchConfig"></ds-search-export-csv>
</div>
<div *ngIf="searchResults && searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0" @fadeIn>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<ng-template #noFileUploaded>
<div class="row">
<div class="col-md-12">
<h3 class="text-center"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></h3>
<div class="text-center h3"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></div>
</div>
</div>
</ng-template>
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="container">
<h2>{{ 'workspace-item.delete.header' | translate }}</h2>
<h1>{{ 'workspace-item.delete.header' | translate }}</h1>
<ds-modify-item-overview *ngIf="(dso$ | async)" [item]="$any(dso$ | async)"></ds-modify-item-overview>
<button class="btn btn-default" (click)="previousPage()">{{ 'workspace-item.delete.button.cancel' | translate }}</button>
<button class="btn btn-danger" (click)="$event.preventDefault();confirmDelete(content)">{{ 'workspace-item.delete.button.confirm' | translate }}</button>
</div>

<ng-template #content let-c="close" let-d="dismiss" id="delete-modal">
<div class="modal-header">
<h4 class="modal-title text-danger">{{ 'workspace-item.delete.header' | translate }}</h4>
<div class="modal-title text-danger h4">{{ 'workspace-item.delete.header' | translate }}</div>
<button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
<span aria-hidden="true">&times;</span>
</button>
Expand Down

0 comments on commit 0417e1d

Please sign in to comment.