Skip to content

Commit ab17164

Browse files
New themed components & minor CSS fixes (DSpace#2442)
* 100839: Created themeable BrowseByComponent * 100839: Added themed BrowseByComponent to custom theme * 100839: Added themed BrowseEntryListElementComponent to custom theme * Added PersonComponent to custom theme * Themed LogInComponent * Fix focus on navbar using different color * Fix ccLicense checkbox margin * Fix long search facets name not displaying correctly * Removed RecentItemListComponent's unnecessary float causing alignment issues when adding components underneath it * Themed RegisterEmailFormComponent
1 parent be59255 commit ab17164

37 files changed

Lines changed: 290 additions & 35 deletions

File tree

src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,19 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
8989
const lastItemRD = this.browseService.getFirstItemFor(definition, scope, SortDirection.DESC);
9090
this.subs.push(
9191
observableCombineLatest([firstItemRD, lastItemRD]).subscribe(([firstItem, lastItem]) => {
92-
let lowerLimit = this.getLimit(firstItem, metadataKeys, this.appConfig.browseBy.defaultLowerLimit);
93-
let upperLimit = this.getLimit(lastItem, metadataKeys, new Date().getUTCFullYear());
94-
const options = [];
95-
const oneYearBreak = Math.floor((upperLimit - this.appConfig.browseBy.oneYearLimit) / 5) * 5;
96-
const fiveYearBreak = Math.floor((upperLimit - this.appConfig.browseBy.fiveYearLimit) / 10) * 10;
92+
let lowerLimit: number = this.getLimit(firstItem, metadataKeys, this.appConfig.browseBy.defaultLowerLimit);
93+
let upperLimit: number = this.getLimit(lastItem, metadataKeys, new Date().getUTCFullYear());
94+
const options: number[] = [];
95+
const oneYearBreak: number = Math.floor((upperLimit - this.appConfig.browseBy.oneYearLimit) / 5) * 5;
96+
const fiveYearBreak: number = Math.floor((upperLimit - this.appConfig.browseBy.fiveYearLimit) / 10) * 10;
9797
if (lowerLimit <= fiveYearBreak) {
9898
lowerLimit -= 10;
9999
} else if (lowerLimit <= oneYearBreak) {
100100
lowerLimit -= 5;
101101
} else {
102102
lowerLimit -= 1;
103103
}
104-
let i = upperLimit;
104+
let i: number = upperLimit;
105105
while (i > lowerLimit) {
106106
options.push(i);
107107
if (i <= fiveYearBreak) {

src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<section class="comcol-page-browse-section">
3434
<div class="browse-by-metadata w-100">
35-
<ds-browse-by *ngIf="startsWithOptions" class="col-xs-12 w-100"
35+
<ds-themed-browse-by *ngIf="startsWithOptions" class="col-xs-12 w-100"
3636
title="{{'browse.title' | translate:
3737
{
3838
collection: dsoNameService.getName((parent$ | async)?.payload),
@@ -48,7 +48,7 @@
4848
[startsWithOptions]="startsWithOptions"
4949
(prev)="goPrev()"
5050
(next)="goNext()">
51-
</ds-browse-by>
51+
</ds-themed-browse-by>
5252
<ds-themed-loading *ngIf="!startsWithOptions" message="{{'loading.browse-by-page' | translate}}"></ds-themed-loading>
5353
</div>
5454
</section>

src/app/browse-by/browse-by.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { ThemedBrowseByTaxonomyPageComponent } from './browse-by-taxonomy-page/t
1414
import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
1515
import { DsoPageModule } from '../shared/dso-page/dso-page.module';
1616
import { FormModule } from '../shared/form/form.module';
17+
import { SharedModule } from '../shared/shared.module';
1718

1819
const ENTRY_COMPONENTS = [
1920
// put only entry components that use custom decorator
@@ -35,6 +36,7 @@ const ENTRY_COMPONENTS = [
3536
ComcolModule,
3637
DsoPageModule,
3738
FormModule,
39+
SharedModule,
3840
],
3941
declarations: [
4042
BrowseBySwitcherComponent,
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<ds-register-email-form
1+
<ds-themed-register-email-form
22
[MESSAGE_PREFIX]="'forgot-email.form'" [typeRequest]="typeRequest">
3-
</ds-register-email-form>
3+
</ds-themed-register-email-form>

src/app/home-page/recent-item-list/recent-item-list.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<ng-container *ngVar="(itemRD$ | async) as itemRD">
22
<div class="mt-4" [ngClass]="placeholderFontClass" *ngIf="itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0" @fadeIn>
3-
<div class="d-flex flex-row border-bottom mb-4 pb-4 ng-tns-c416-2"></div>
3+
<div class="d-flex flex-row border-bottom mb-4 pb-4"></div>
44
<h2> {{'home.recent-submissions.head' | translate}}</h2>
55
<div class="my-4" *ngFor="let item of itemRD?.payload?.page">
66
<ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
77
</ds-listable-object-component-loader>
88
</div>
9-
<button (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-left ng-tns-c290-40"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
9+
<button (click)="onLoadMore()" class="btn btn-primary search-button mt-4"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
1010
</div>
1111
<ds-error *ngIf="itemRD?.hasFailed" message="{{'error.recent-submissions' | translate}}"></ds-error>
1212
<ds-loading *ngIf="!itemRD || itemRD.isLoading" message="{{'loading.recent-submissions' | translate}}">

src/app/login-page/login-page.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<div>
44
<img class="mb-4 login-logo" src="assets/images/dspace-logo.png" alt="{{'repository.image.logo' | translate}}">
55
<h1 class="h3 mb-0 font-weight-normal">{{"login.form.header" | translate}}</h1>
6-
<ds-log-in
7-
[isStandalonePage]="true"></ds-log-in>
6+
<ds-themed-log-in
7+
[isStandalonePage]="true"></ds-themed-log-in>
88
</div>
99
</div>
1010
</div>

src/app/navbar/navbar.component.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ nav.navbar {
3939
.navbar-nav {
4040
::ng-deep a.nav-link {
4141
color: var(--ds-navbar-link-color);
42-
}
43-
::ng-deep a.nav-link:hover {
44-
color: var(--ds-navbar-link-color-hover);
42+
43+
&:hover, &:focus {
44+
color: var(--ds-navbar-link-color-hover);
45+
}
4546
}
4647
}

src/app/register-email-form/register-email-form.module.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,24 @@ import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { SharedModule } from '../shared/shared.module';
44
import { RegisterEmailFormComponent } from './register-email-form.component';
5+
import { ThemedRegisterEmailFormComponent } from './themed-registry-email-form.component';
6+
7+
const DECLARATIONS = [
8+
RegisterEmailFormComponent,
9+
ThemedRegisterEmailFormComponent,
10+
];
511

612
@NgModule({
713
imports: [
814
CommonModule,
915
SharedModule
1016
],
1117
declarations: [
12-
RegisterEmailFormComponent,
18+
...DECLARATIONS,
1319
],
1420
providers: [],
1521
exports: [
16-
RegisterEmailFormComponent,
22+
...DECLARATIONS,
1723
]
1824
})
1925

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import { Component, Input } from '@angular/core';
2+
import { ThemedComponent } from '../shared/theme-support/themed.component';
3+
import { RegisterEmailFormComponent } from './register-email-form.component';
4+
5+
/**
6+
* Themed wrapper for {@link RegisterEmailFormComponent}
7+
*/
8+
@Component({
9+
selector: 'ds-themed-register-email-form',
10+
styleUrls: [],
11+
templateUrl: '../shared/theme-support/themed.component.html',
12+
})
13+
export class ThemedRegisterEmailFormComponent extends ThemedComponent<RegisterEmailFormComponent> {
14+
15+
@Input() MESSAGE_PREFIX: string;
16+
17+
@Input() typeRequest: string;
18+
19+
protected inAndOutputNames: (keyof RegisterEmailFormComponent & keyof this)[] = [
20+
'MESSAGE_PREFIX',
21+
'typeRequest',
22+
];
23+
24+
protected getComponentName(): string {
25+
return 'RegisterEmailFormComponent';
26+
}
27+
28+
protected importThemedComponent(themeName: string): Promise<any> {
29+
return import(`../../themes/${themeName}/app/register-email-form/register-email-form.component`);
30+
}
31+
32+
protected importUnthemedComponent(): Promise<any> {
33+
return import('./register-email-form.component');
34+
}
35+
36+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<ds-register-email-form
1+
<ds-themed-register-email-form
22
[MESSAGE_PREFIX]="'register-page.registration'" [typeRequest]="typeRequest">
3-
</ds-register-email-form>
3+
</ds-themed-register-email-form>

0 commit comments

Comments
 (0)