diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html index ef220b834ba..39378d6cdd6 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar.component.html +++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html @@ -14,7 +14,7 @@
-
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index e81ef323de6..1a0692b5d9e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -54,7 +54,7 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone canActivateChild: [ServerCheckGuard], resolve: [MenuResolver], children: [ - { path: '', redirectTo: '/home', pathMatch: 'full' }, + { path: '', redirectTo: '/documents', pathMatch: 'full' }, { path: 'reload/:rnd', component: ThemedPageNotFoundComponent, @@ -62,7 +62,7 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone canActivate: [ReloadGuard] }, { - path: 'home', + path: 'documents', loadChildren: () => import('./home-page/home-page.module') .then((m) => m.HomePageModule), data: { showBreadcrumbs: false }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 89e361821ba..a72ca901fb3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,6 +1,6 @@ import { APP_BASE_HREF, CommonModule, DOCUMENT } from '@angular/common'; import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @@ -128,7 +128,8 @@ const EXPORTS = [ exports: [ ...EXPORTS, ...DECLARATIONS, - ] + ], + schemas: [ CUSTOM_ELEMENTS_SCHEMA ] }) export class AppModule { diff --git a/src/app/breadcrumbs/breadcrumbs.component.html b/src/app/breadcrumbs/breadcrumbs.component.html index bff792eeff4..5e6204a687b 100644 --- a/src/app/breadcrumbs/breadcrumbs.component.html +++ b/src/app/breadcrumbs/breadcrumbs.component.html @@ -2,7 +2,7 @@
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html index 4c2a0fe7c80..49fe278a6cf 100644 --- a/src/app/profile-page/profile-page.component.html +++ b/src/app/profile-page/profile-page.component.html @@ -20,5 +20,27 @@

{{'profile.head' | translate}}

+ + +
+

{{'profile.groups.head' | translate}}

+
    +
  • {{ dsoNameService.getName(group) }}
    • +
+
+ + + +
+

{{'profile.special.groups.head' | translate}}

+
    +
  • + {{ dsoNameService.getName(specialGroup) }} +
    • +
+
+ + +
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts index ddb77b669cb..9617a2e0364 100644 --- a/src/app/register-email-form/register-email-form.component.ts +++ b/src/app/register-email-form/register-email-form.component.ts @@ -190,7 +190,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit { if (response.hasSucceeded) { this.notificationService.success(this.translateService.get(`${this.MESSAGE_PREFIX}.success.head`), this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, {email: this.email.value})); - this.router.navigate(['/home']); + this.router.navigate(['/documents']); } else if (response.statusCode === 422) { this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`), this.translateService.get(`${this.MESSAGE_PREFIX}.error.maildomain`, {domains: this.validMailDomains.join(', ')})); } else { diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts index eaaa983a43d..e1fbd4e55bc 100644 --- a/src/app/register-page/create-profile/create-profile.component.ts +++ b/src/app/register-page/create-profile/create-profile.component.ts @@ -169,7 +169,7 @@ export class CreateProfileComponent implements OnInit { this.notificationsService.success(this.translateService.get(this.NOTIFICATIONS_PREFIX + 'success.head'), this.translateService.get(this.NOTIFICATIONS_PREFIX + 'success.content')); this.store.dispatch(new AuthenticateAction(this.email, this.password)); - this.router.navigate(['/home']); + this.router.navigate(['/documents']); } else { this.notificationsService.error(this.translateService.get(this.NOTIFICATIONS_PREFIX + 'error.head'), rd.errorMessage); } diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html index 4837e0dcda1..38917b7a20d 100644 --- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html @@ -22,7 +22,7 @@

{{'grant-deny-request-copy.header' | translate}}

{{'grant-deny-request-copy.processed' | translate}}

- {{'grant-deny-request-copy.home-page' | translate}} + {{'grant-deny-request-copy.home-page' | translate}}

diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html index 2b30507f3ec..f853e1977b5 100644 --- a/src/app/search-navbar/search-navbar.component.html +++ b/src/app/search-navbar/search-navbar.component.html @@ -4,9 +4,11 @@ - @@ -32,6 +79,7 @@

{{ type + '.edit.head' | translate }}

+ {{ coll_uuid}} @@ -41,6 +89,9 @@

{{ type + '.edit.head' | translate }}

+ + +
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts index 4ca70e90689..88331aa9c95 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts @@ -11,6 +11,8 @@ import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { HttpClient} from '@angular/common/http'; import { Collection } from '../../../../core/shared/collection.model'; +import { ChangeDetectorRef } from '@angular/core'; + /** * Component representing the edit page for communities and collections */ @@ -20,10 +22,14 @@ import { Collection } from '../../../../core/shared/collection.model'; }) export class EditComColPageComponent implements OnInit { - public subscribeStats: Boolean; + // public subscribeStats$: Promise; + subscribeStats: Boolean; showContent: boolean; + +cd: ChangeDetectorRef; + /** * The type of DSpaceObject (used to create i18n messages) */ @@ -45,6 +51,8 @@ export class EditComColPageComponent implements On */ public dsoRD$: Observable>; + + /** * Hide the default return button? */ @@ -59,33 +67,89 @@ export class EditComColPageComponent implements On } ngOnInit(): void { + + + +console.log("THE value of this.subscribeStats= " + this.subscribeStats) + this.initPageParamsByRoute(); this.pages = this.route.routeConfig.children .map((child: any) => child.path) .filter((path: string) => isNotEmpty(path)); // ignore reroutes + this.dsoRD$ = this.route.data.pipe(map((data) => data.dso)); let id = ""; let status; - + + + // this.getData().subscribe( + // (response: any) => { + + // this.subscribeStats$ = Promise.resolve(response); + // console.log( "resonse is =" + response); + // console.log( "resonse is this.subscribeStats =" + this.subscribeStats$); + + // }, + // (error: any) => { + // }); + + // console.log( "outside is this.subscribeStats =" + this.subscribeStats$); + + // this.http.get('http://localhost:8080/server/api/eperson/groups/issubscribed_admin/f70b4285-f3fd-4b86-8990-532e2ddd32f8', + // {responseType: 'text'}).subscribe((data: any) => { + // //this.subscribeStats = false; + // status = false; + // if ( data === "true") + // { + // status = true; + // this.subscribeStats = true; + // } + // else { + // this.subscribeStats = false; + // } + // }); + + + + this.dsoRD$.subscribe((value: any) => { id = value.payload.uuid; this.type = value.payload.type; this.http.get('http://localhost:8080/server/api/eperson/groups/issubscribed_admin/' + id, {responseType: 'text'}).subscribe((data: any) => { - this.subscribeStats = false; + //this.subscribeStats = false; status = false; if ( data === "true") { status = true; this.subscribeStats = true; } + else { + this.subscribeStats = false; + } }); - }); + + console.log("Here in oninit id=" + id); + } + +public setStat() { + + window.location.reload(); + +} + + + + public getData() { + return this.http.get('http://localhost:8080/server/api/eperson/groups/issubscribed_admin/f70b4285-f3fd-4b86-8990-532e2ddd32f8', + {responseType: 'text'}); +} + public goToCollectionAdminStats(id: string) { var link = document.createElement('a'); var working_href = 'https://angular.io/guide/router?restrict=1' + 'collid=' + id; @@ -96,12 +160,14 @@ export class EditComColPageComponent implements On public subscribeToAdminStats(id: string) { this.http.get('http://localhost:8080/server/api/eperson/groups/subscribe_admin/' + id, {responseType: 'text'}).subscribe((data: any) => { }); + //this.subscribeStats = Promise.resolve(true); this.subscribeStats = true; } public unsubscribeToAdminStats(id: string) { this.http.get('http://localhost:8080/server/api/eperson/groups/unsubscribe_admin/' + id, {responseType: 'text'}).subscribe((data: any) => { }); + //this.subscribeStats = Promise.resolve(false); this.subscribeStats = false; } diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html index 16fda1caa83..4b4ae2f0ef2 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html @@ -15,11 +15,14 @@
+ diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts index af3381ef716..21086968c92 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts @@ -6,6 +6,9 @@ import { isNotEmpty } from '../../../empty.util'; import { MenuID } from '../../../menu/menu-id.model'; import { MenuSection } from '../../../menu/menu-section.model'; + +import { RoleService } from '../../../../core/roles/role.service'; +import { combineLatest, Observable } from 'rxjs'; /** * Represents a non-expandable section in the dso edit menus */ @@ -23,18 +26,26 @@ export class DsoEditMenuSectionComponent extends MenuSectionComponent implements hasLink: boolean; canActivate: boolean; + isAdmin$: Observable; + isSiteAdmin constructor( @Inject('sectionDataProvider') menuSection: MenuSection, protected menuService: MenuService, + protected roleService: RoleService, protected injector: Injector, ) { super(menuSection, menuService, injector); this.itemModel = menuSection.model; + + } ngOnInit(): void { this.hasLink = isNotEmpty(this.itemModel?.link); this.canActivate = isNotEmpty(this.itemModel?.function); + //this.canActivate = false; + this.isAdmin$ = this.roleService.isAdmin(); + super.ngOnInit(); } diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html index 8ebe622a5ba..9a2c3dc427e 100644 --- a/src/app/shared/file-download-link/file-download-link.component.html +++ b/src/app/shared/file-download-link/file-download-link.component.html @@ -1,5 +1,6 @@ - + + diff --git a/src/app/shared/jose/jose.component.ts b/src/app/shared/jose/jose.component.ts new file mode 100644 index 00000000000..edd665fd567 --- /dev/null +++ b/src/app/shared/jose/jose.component.ts @@ -0,0 +1,10 @@ +import { ChangeDetectorRef, Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core'; +import { trigger } from '@angular/animations'; + + +@Component({ + selector: 'ds-jose', + template: '

This is the Jose component

' +}) +export class JoseComponent { +} diff --git a/src/app/shared/lang-switch/lang-switch.component.ts b/src/app/shared/lang-switch/lang-switch.component.ts index 41d707a0568..9a8e956aeb8 100644 --- a/src/app/shared/lang-switch/lang-switch.component.ts +++ b/src/app/shared/lang-switch/lang-switch.component.ts @@ -32,7 +32,7 @@ export class LangSwitchComponent implements OnInit { ngOnInit(): void { this.activeLangs = environment.languages.filter((MyLangConfig) => MyLangConfig.active === true); - this.moreThanOneLanguage = (this.activeLangs.length > 1); + this.moreThanOneLanguage = false; } /** diff --git a/src/app/shared/listfiles/listfiles.component.html b/src/app/shared/listfiles/listfiles.component.html new file mode 100644 index 00000000000..26a572ec678 --- /dev/null +++ b/src/app/shared/listfiles/listfiles.component.html @@ -0,0 +1,60 @@ + +
+ + + + + + +
+ + +
+
+ + + + + {{ dsoNameService.getName(file) }} + + + ({{(file?.sizeBytes) | dsFileSize }}) + + + + +
+
+ + + Click file name to request access from the owner + + + + + + + +
+THIS IS A HIDDEN FILE +
+ {{file.firstMetadataValue('dc.description')}} +
+
+ +
+ + + +
+ +
+
+ +
+ + + + +
+ diff --git a/src/app/shared/listfiles/listfiles.component.html.backup b/src/app/shared/listfiles/listfiles.component.html.backup new file mode 100644 index 00000000000..d35019b398c --- /dev/null +++ b/src/app/shared/listfiles/listfiles.component.html.backup @@ -0,0 +1,53 @@ + +
+ + + + +
+ + + + + + {{ dsoNameService.getName(file) }} + ({{(file?.sizeBytes) | dsFileSize }}) +{{(file?._links | async)?.payload?.format.mimetype}} + + + + + + + + Click file name to request access from the owner + + + + + + + {{file.firstMetadataValue('dc.description')}} + + + + + +
+ + +
+ +
+
+ +
+ + + + + + + +
+ diff --git a/src/app/shared/listfiles/listfiles.component.ts b/src/app/shared/listfiles/listfiles.component.ts new file mode 100644 index 00000000000..a4a663da315 --- /dev/null +++ b/src/app/shared/listfiles/listfiles.component.ts @@ -0,0 +1,146 @@ +import { Component, Inject, Input, OnInit } from '@angular/core'; +import { BehaviorSubject } from 'rxjs'; + +import { Item } from '../../core/shared/item.model'; +import { BitstreamDataService } from '../../core/data/bitstream-data.service'; +import { Bitstream } from '../../core/shared/bitstream.model'; + +import { RemoteData } from '../../core/data/remote-data'; +import { hasValue } from '../../shared/empty.util'; +import { PaginatedList } from '../../core/data/paginated-list.model'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; + + +import { ConfigurationDataService } from '../../core/data/configuration-data.service'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getRemoteDataPayload +} from '../../core/shared/operators'; + + +@Component({ + selector: 'ds-listfiles', + templateUrl: './listfiles.component.html' +}) + +export class ListfilesComponent implements OnInit { + + @Input() item: Item; + + label = 'item.page.files'; + + #separator = '
'; + + separator = ' '; + + bitstreams$: BehaviorSubject; + + currentPage: number; + + isLoading: boolean; + + isLastPage: boolean; + + pageSize: number; + + //UM Change to support Hidden files. + formatId: string; + + constructor( + protected bitstreamDataService: BitstreamDataService, + protected notificationsService: NotificationsService, + protected translateService: TranslateService, + protected configService: ConfigurationDataService, + public dsoNameService: DSONameService, + @Inject(APP_CONFIG) protected appConfig: AppConfig + ) { + this.pageSize = this.appConfig.item.bitstream.pageSize; + } + + ngOnInit(): void { + + this.configService.findByPropertyName('hidden.format').pipe( + getFirstCompletedRemoteData(), + getRemoteDataPayload() + ).subscribe((remoteData) => { + if (remoteData === undefined || remoteData.values.length === 0) { + this.formatId = '12345'; + console.log ("hidden.format ==>" + this.formatId); + } else { + this.formatId = remoteData.values[0]; + console.log ("hidden.format ==>" + this.formatId); + } + }) + + this.getNextPageDisplay(); + } + + getIconForFileRestriction(desc: string): string { + console.log("desc is = " + desc); + + if ( desc == null) + { + return ""; + } + else if ( (desc.toLowerCase().includes('restricted to u') ) ) + { + return "Restricted to current U-M faculty, staff, and students"; + } + else if ( (desc.toLowerCase().includes('restricted to on-site access at biological station') ) ) + { + return "Restricted to on-site access at Biological Station"; + } + else if ( (desc.toLowerCase().includes('restricted to on-site access at bentley historical library') ) ) + { + return "Restricted to on-site access at Bentley Historical Library"; + } + else + { + return ""; + } + + } + + getIconForRequestCopy(desc: string): string { + if ( desc == null) + { + return ""; + } + else + { + return "Request Copy"; + } + } + + getNextPageDisplay(): void { + console.log("getting bitstreams...."); + this.isLoading = true; + if (this.currentPage === undefined) { + this.currentPage = 1; + this.bitstreams$ = new BehaviorSubject([]); + } else { + this.currentPage++; + } + this.bitstreamDataService.findAllByItemAndBundleName(this.item, 'ORIGINAL', { + currentPage: this.currentPage, + elementsPerPage: this.pageSize + }).pipe( + getFirstCompletedRemoteData(), + ).subscribe((bitstreamsRD: RemoteData>) => { + if (bitstreamsRD.errorMessage) { + // this.notificationsService.error(this.translateService.get('file-section.error.header'), `${bitstreamsRD.statusCode} ${bitstreamsRD.errorMessage}`); + // return ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"; + } else if (hasValue(bitstreamsRD.payload)) { + const current: Bitstream[] = this.bitstreams$.getValue(); + this.bitstreams$.next([...current, ...bitstreamsRD.payload.page]); + this.isLoading = false; + this.isLastPage = this.currentPage === bitstreamsRD.payload.totalPages; + } + }); + } + +} \ No newline at end of file diff --git a/src/app/shared/listfiles/listfiles.component.ts.backup b/src/app/shared/listfiles/listfiles.component.ts.backup new file mode 100644 index 00000000000..003bb7be693 --- /dev/null +++ b/src/app/shared/listfiles/listfiles.component.ts.backup @@ -0,0 +1,130 @@ +import { Component, Inject, Input, OnInit } from '@angular/core'; +import { BehaviorSubject } from 'rxjs'; + +import { Item } from '../../core/shared/item.model'; + + + + +import { BitstreamDataService } from '../../core/data/bitstream-data.service'; + +import { Bitstream } from '../../core/shared/bitstream.model'; + +import { RemoteData } from '../../core/data/remote-data'; +import { hasValue } from '../../shared/empty.util'; +import { PaginatedList } from '../../core/data/paginated-list.model'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { getFirstCompletedRemoteData } from '../../core/shared/operators'; +import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; + + +@Component({ + selector: 'ds-listfiles', + templateUrl: './listfiles.component.html' +}) +// export class ListfilesComponent { +// } + +export class ListfilesComponent implements OnInit { + + @Input() item: Item; + + label = 'item.page.files'; + + separator = '
'; + + bitstreams$: BehaviorSubject; + + currentPage: number; + + isLoading: boolean; + + isLastPage: boolean; + + pageSize: number; + + constructor( + protected bitstreamDataService: BitstreamDataService, + protected notificationsService: NotificationsService, + protected translateService: TranslateService, + public dsoNameService: DSONameService, + @Inject(APP_CONFIG) protected appConfig: AppConfig + ) { + this.pageSize = this.appConfig.item.bitstream.pageSize; + } + + ngOnInit(): void { + this.getNextPageJose(); + } + + getIconForFileRestriction(desc: string): string { + console.log("desc is = " + desc); + + if ( desc == null) + { + return ""; + } + else if ( (desc.toLowerCase().includes('restricted to u') ) ) + { + return "Restricted to current U-M faculty, staff, and students"; + } + else if ( (desc.toLowerCase().includes('restricted to on-site access at biological station') ) ) + { + return "Restricted to on-site access at Biological Station"; + } + else if ( (desc.toLowerCase().includes('restricted to on-site access at bentley historical library') ) ) + { + return "Restricted to on-site access at Bentley Historical Library"; + } + else + { + return ""; + } + + } + + getIconForRequestCopy(desc: string): string { + if ( desc == null) + { + return ""; + } + else + { + return "Request Copy"; + } + } + + + getNextPageJose(): void { + + console.log("getting bitstreams...."); + this.isLoading = true; + if (this.currentPage === undefined) { + this.currentPage = 1; + this.bitstreams$ = new BehaviorSubject([]); + } else { + this.currentPage++; + } + this.bitstreamDataService.findAllByItemAndBundleName(this.item, 'ORIGINAL', { + currentPage: this.currentPage, + elementsPerPage: this.pageSize + }).pipe( + getFirstCompletedRemoteData(), + ).subscribe((bitstreamsRD: RemoteData>) => { + if (bitstreamsRD.errorMessage) { + // this.notificationsService.error(this.translateService.get('file-section.error.header'), `${bitstreamsRD.statusCode} ${bitstreamsRD.errorMessage}`); + // return ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"; + } else if (hasValue(bitstreamsRD.payload)) { + const current: Bitstream[] = this.bitstreams$.getValue(); + this.bitstreams$.next([...current, ...bitstreamsRD.payload.page]); + this.isLoading = false; + this.isLastPage = this.currentPage === bitstreamsRD.payload.totalPages; + } + }); + + + } + +} \ No newline at end of file diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index 6b1fdb9ff66..ed3ce8691cf 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -7,7 +7,10 @@ + +
diff --git a/src/app/shared/log-out/log-out.component.ts b/src/app/shared/log-out/log-out.component.ts index 6fa71caa328..831edfa7c45 100644 --- a/src/app/shared/log-out/log-out.component.ts +++ b/src/app/shared/log-out/log-out.component.ts @@ -43,7 +43,7 @@ export class LogOutComponent implements OnInit { * Go to the home page. */ public home() { - this.router.navigate(['/home']); + this.router.navigate(['/documents']); } public logOut() { diff --git a/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts b/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts index a8dd0ee04cc..6b0c5dfcb66 100644 --- a/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts +++ b/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts @@ -9,7 +9,7 @@ import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; @Component({ selector: 'ds-themed-type-badge', styleUrls: [], - templateUrl: '../../../../theme-support/themed.component.html', + template: '', }) export class ThemedTypeBadgeComponent extends ThemedComponent { @Input() object: DSpaceObject; diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html index f7a687048a2..db1510faae1 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html @@ -1,7 +1,9 @@
+ +
@@ -36,6 +40,9 @@ + + +
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts index 99251d3c243..b09a56a0efc 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts @@ -1,10 +1,15 @@ -import { Component } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; import { listableObjectComponent } from '../../../../../object-collection/shared/listable-object/listable-object.decorator'; import { ViewMode } from '../../../../../../core/shared/view-mode.model'; import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model'; import { SearchResultListElementComponent } from '../../../search-result-list-element.component'; import { Item } from '../../../../../../core/shared/item.model'; import { getItemPageRoute } from '../../../../../../item-page/item-page-routing-paths'; +import { TruncatableService } from '../../../../../truncatable/truncatable.service'; +import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service'; +import { APP_CONFIG, AppConfig } from '../../../../../../../config/app-config.interface'; +import { BitstreamDataService } from '../../../../../../core/data/bitstream-data.service'; + @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement) @listableObjectComponent(ItemSearchResult, ViewMode.ListElement) @@ -16,12 +21,21 @@ import { getItemPageRoute } from '../../../../../../item-page/item-page-routing- /** * The component for displaying a list element for an item search result of the type Publication */ -export class ItemSearchResultListElementComponent extends SearchResultListElementComponent { +export class ItemSearchResultListElementComponent extends SearchResultListElementComponent { + /** * Route to the item's page */ itemPageRoute: string; + constructor(protected truncatableService: TruncatableService, + public dsoNameService: DSONameService, + public bitstreamDataService: BitstreamDataService, + @Inject(APP_CONFIG) protected appConfig: AppConfig + ) { + super(truncatableService, dsoNameService, appConfig); + } + ngOnInit(): void { super.ngOnInit(); this.showThumbnails = this.showThumbnails ?? this.appConfig.browseBy.showThumbnails; diff --git a/src/app/shared/rss-feed/rss.component.html b/src/app/shared/rss-feed/rss.component.html index 70eb066ff83..91140c50c5a 100644 --- a/src/app/shared/rss-feed/rss.component.html +++ b/src/app/shared/rss-feed/rss.component.html @@ -1,2 +1,5 @@ +
+ +
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 0f7871f7f9b..b0556b99dae 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -47,6 +47,8 @@ import { import { ObjectGridComponent } from './object-grid/object-grid.component'; import { ObjectCollectionComponent } from './object-collection/object-collection.component'; import { ErrorComponent } from './error/error.component'; +import { JoseComponent } from './jose/jose.component'; +import { ListfilesComponent } from './listfiles/listfiles.component'; import { LoadingComponent } from './loading/loading.component'; import { PaginationComponent } from './pagination/pagination.component'; import { ThumbnailComponent } from '../thumbnail/thumbnail.component'; @@ -334,6 +336,8 @@ const COMPONENTS = [ UserMenuComponent, DsSelectComponent, ErrorComponent, + JoseComponent, + ListfilesComponent, LangSwitchComponent, LoadingComponent, ThemedLoadingComponent, diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts index eaff12c169d..a7d9c053017 100644 --- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts +++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts @@ -247,7 +247,7 @@ export class SystemWideAlertFormComponent implements OnInit { * Navigate back to the homepage */ back() { - this.router.navigate(['/home']); + this.router.navigate(['/documents']); } diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts index 61393d9f64e..d75c184053e 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts @@ -13,7 +13,7 @@ import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete @NgModule({ imports: [ RouterModule.forChild([ - { path: '', redirectTo: '/home', pathMatch: 'full' }, + { path: '', redirectTo: '/documents', pathMatch: 'full' }, { path: ':id', resolve: { wsi: WorkspaceItemPageResolver }, diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index dffbdf20393..cd6d0125e21 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2824,7 +2824,7 @@ "menu.section.browse_community_by_title": "By Title", - "menu.section.browse_global": "All of DSpace", + "menu.section.browse_global": "All of Deep Blue Documents", "menu.section.browse_global_by_author": "By Author", @@ -3834,7 +3834,7 @@ "search.form.search_dspace": "All repository", - "search.form.scope.all": "All of DSpace", + "search.form.scope.all": "All of Deep Blue Documents", "search.results.head": "Search Results", diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index a6e9e092e46..c85f416012c 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -249,7 +249,7 @@ export class DefaultAppConfig implements AppConfig { // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items) defaultLowerLimit: 1900, // Whether to add item thumbnail images to BOTH browse and search result lists. - showThumbnails: true, + showThumbnails: false, // The number of entries in a paginated browse results list. // Rounded to the nearest size in the list of selectable sizes on the // settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. @@ -361,7 +361,7 @@ export class DefaultAppConfig implements AppConfig { tagName: 'link', attributes: { 'rel': 'icon', - 'href': 'assets/dspace/images/favicons/favicon.svg', + 'href': 'assets/dspace/images/favicons/favicon.ico', 'type': 'image/svg+xml', } }, diff --git a/src/index.html b/src/index.html index 216f497173a..bd76d688c44 100644 --- a/src/index.html +++ b/src/index.html @@ -8,6 +8,10 @@ + + + + diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss index 5dfc03fbd36..220714b4f4d 100644 --- a/src/styles/_bootstrap_variables.scss +++ b/src/styles/_bootstrap_variables.scss @@ -27,7 +27,7 @@ $cyan: #006666 !default; $yellow: #ec9433 !default; $red: #CF4444 !default; $dark: darken($blue, 17%) !default; - +$umanchors: #1d7491 !default; $theme-colors: ( diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index ddf490c7a7a..10651c0d511 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -26,8 +26,8 @@ --ds-header-icon-color-hover: #{$link-hover-color}; --ds-header-navbar-border-top-color: #{$white}; --ds-header-navbar-border-bottom-color: #{$gray-400}; - --ds-navbar-link-color: #{$cyan}; - --ds-navbar-link-color-hover: #{darken($cyan, 15%)}; + --ds-navbar-link-color: #{$white}; + --ds-navbar-link-color-hover: #{$white}; $admin-sidebar-bg: darken(#2B4E72, 17%); $admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%); diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss index b714d399a08..47079eec802 100644 --- a/src/styles/_global-styles.scss +++ b/src/styles/_global-styles.scss @@ -1,3 +1,4 @@ + html { position: relative; min-height: 100%; @@ -5,6 +6,56 @@ html { body { overflow-x: hidden; + font-family: "Muli", sans-serif; + color: #212b36; +} + +h1 { + font-size: 3.5rem; + font-weight: 400; + line-height: var(--line-height-heading); +} + +h2 { + font-size: 1.75rem; + font-weight: var(--bold); + line-height: var(--line-height-heading); +} + +h3 { + font-size: 1.5rem; + font-weight: normal; + line-height: var(--line-height-heading); +} + +h4 { + font-size: 1.25rem; + line-height: var(--line-height-heading); +} + +h5, +h6 { + font-size: 1rem; + line-height: var(--line-height-heading); +} + +a { + text-decoration: underline; + &:focus, &:hover{ + text-decoration: underline; + } +} + +a.nav-link:hover { + text-decoration: underline; +} + +.list-group-item +{ + text-decoration: none; + &:hover{ + text-decoration: none; + } } // Sticky Footer @@ -209,6 +260,10 @@ ds-dynamic-form-control-container.d-none { } } +.btn { + text-decoration: none; +} + .btn.btn-link.btn-link-inline { display: inline; padding: 0; diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html index dbc98098ae5..8cc58fdc071 100644 --- a/src/themes/dspace/app/header/header.component.html +++ b/src/themes/dspace/app/header/header.component.html @@ -1,10 +1,15 @@ + + + +
- + diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.html b/src/themes/dspace/app/home-page/home-news/home-news.component.html index ef576ed99cd..0e6e78d5ec0 100644 --- a/src/themes/dspace/app/home-page/home-news/home-news.component.html +++ b/src/themes/dspace/app/home-page/home-news/home-news.component.html @@ -1,39 +1,20 @@ +

-

DSpace 7

-

DSpace is the world leading open source repository platform that enables - organisations to:

+

Deep Blue Documents

+

Deep Blue provides access to the work that makes the University of Michigan a leader in research, teaching, and creativity.

+

To find work by U-M authors, browse or search the contents of Deep Blue, then link to what you find using a URL that will always work (available to all). To deposit your work, please contact us (available to U-M faculty and staff).

-
    -
  • easily ingest documents, audio, video, datasets and their corresponding Dublin Core - metadata -
    • -
  • open up this content to local and global audiences, thanks to the OAI-PMH interface and - Google Scholar optimizations -
    • -
  • issue permanent urls and trustworthy identifiers, including optional integrations with - handle.net and DataCite DOI -
    • -
-

Join an international community of leading institutions using DSpace.

-

The test user accounts below have their password set to the name of this - software in lowercase.

-
    -
  • Demo Site Administrator = dspacedemo+admin@gmail.com
    • -
  • Demo Community Administrator = dspacedemo+commadmin@gmail.com
    • -
  • Demo Collection Administrator = dspacedemo+colladmin@gmail.com
    • -
  • Demo Submitter = dspacedemo+submit@gmail.com
    • -
+
- - - + + Photo by @inspiredimages
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.scss b/src/themes/dspace/app/home-page/home-news/home-news.component.scss index 93ec1763f34..d0ccc05de3f 100644 --- a/src/themes/dspace/app/home-page/home-news/home-news.component.scss +++ b/src/themes/dspace/app/home-page/home-news/home-news.component.scss @@ -3,11 +3,13 @@ margin-top: calc(var(--ds-content-spacing) * -1); div.background-image-container { + background: rgba(0,39,76,0.8); color: white; position: relative; + .background-image > img { - background-color: var(--bs-info); + position: absolute; z-index: -1; top: 0; @@ -19,30 +21,13 @@ } .container { - position: relative; - text-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6); - - &:before, &:after { - content: ''; - display: block; - width: var(--ds-banner-background-gradient-width); - height: 100%; - top: 0; - position: absolute; - } - &:before { - background: linear-gradient(to left, var(--ds-banner-text-background), transparent); - left: calc(-1 * var(--ds-banner-background-gradient-width)); - } - &:after { - background: linear-gradient(to right, var(--ds-banner-text-background), transparent); - right: calc(-1 * var(--ds-banner-background-gradient-width)); - } - background-color: var(--ds-banner-text-background); + + + } diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html index 05afac7d7e9..c114a5dc11a 100644 --- a/src/themes/dspace/app/navbar/navbar.component.html +++ b/src/themes/dspace/app/navbar/navbar.component.html @@ -1,24 +1,34 @@ + + + + + diff --git a/src/themes/dspace/app/navbar/navbar.component.scss b/src/themes/dspace/app/navbar/navbar.component.scss index d3aea9f0780..2f62a237e26 100644 --- a/src/themes/dspace/app/navbar/navbar.component.scss +++ b/src/themes/dspace/app/navbar/navbar.component.scss @@ -1,6 +1,5 @@ nav.navbar { - border-top: 1px var(--ds-header-navbar-border-top-color) solid; - border-bottom: 5px var(--ds-header-navbar-border-bottom-color) solid; + align-items: baseline; } @@ -49,8 +48,8 @@ a.navbar-brand img { .navbar-nav { ::ng-deep a.nav-link { color: var(--ds-navbar-link-color); - } - ::ng-deep a.nav-link:hover { - color: var(--ds-navbar-link-color-hover); + &:hover, &:focus { + color: var(--ds-navbar-link-color-hover); + } } } diff --git a/src/themes/dspace/assets/images/doc_icons/audio_icon18x18.png b/src/themes/dspace/assets/images/doc_icons/audio_icon18x18.png new file mode 100644 index 00000000000..d7e18cf76f7 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/audio_icon18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/audio_icon32x32.png b/src/themes/dspace/assets/images/doc_icons/audio_icon32x32.png new file mode 100644 index 00000000000..dabee6bd71c Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/audio_icon32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/droplet.jpg b/src/themes/dspace/assets/images/doc_icons/droplet.jpg new file mode 100644 index 00000000000..c39ede37a25 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/droplet.jpg differ diff --git a/src/themes/dspace/assets/images/doc_icons/excel_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/excel_icon-18x18.png new file mode 100644 index 00000000000..6360fc3e4ae Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/excel_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/excel_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/excel_icon-32x32.png new file mode 100644 index 00000000000..cc34dbeed72 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/excel_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/feed-icon-14x14.png b/src/themes/dspace/assets/images/doc_icons/feed-icon-14x14.png new file mode 100644 index 00000000000..b3c949d2244 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/feed-icon-14x14.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/feed-icon-28x28.png b/src/themes/dspace/assets/images/doc_icons/feed-icon-28x28.png new file mode 100644 index 00000000000..d64c669c758 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/feed-icon-28x28.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/fulcrum_icon.png b/src/themes/dspace/assets/images/doc_icons/fulcrum_icon.png new file mode 100644 index 00000000000..5f32708008d Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/fulcrum_icon.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/generic_bitstream18x18.png b/src/themes/dspace/assets/images/doc_icons/generic_bitstream18x18.png new file mode 100644 index 00000000000..924aaae452f Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/generic_bitstream18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/generic_bitstream32x32.png b/src/themes/dspace/assets/images/doc_icons/generic_bitstream32x32.png new file mode 100644 index 00000000000..58ab3bba707 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/generic_bitstream32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/generic_image_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/generic_image_icon-18x18.png new file mode 100644 index 00000000000..e4e4d7187ad Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/generic_image_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/generic_image_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/generic_image_icon-32x32.png new file mode 100644 index 00000000000..c8190d65dce Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/generic_image_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/hathi_trust_icon18x18.png b/src/themes/dspace/assets/images/doc_icons/hathi_trust_icon18x18.png new file mode 100644 index 00000000000..f3eb2f3d97e Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/hathi_trust_icon18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/html_icon-18x18.PNG b/src/themes/dspace/assets/images/doc_icons/html_icon-18x18.PNG new file mode 100644 index 00000000000..cc24f6af865 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/html_icon-18x18.PNG differ diff --git a/src/themes/dspace/assets/images/doc_icons/icons_for_deep_blue b/src/themes/dspace/assets/images/doc_icons/icons_for_deep_blue new file mode 100644 index 00000000000..22b6a34d37c --- /dev/null +++ b/src/themes/dspace/assets/images/doc_icons/icons_for_deep_blue @@ -0,0 +1,82 @@ +ICONS TO USE FOR DEEP BLUE FORMATS + + + +pdf_icon-18x18.png +pdf-icon32x32.png + .pdf + +text_icon-18x18.png +text_icon-32x32.png + .txt + .rtf + +word_icon-18x18.png +word-icon32x32.png + .doc + .docx + +excel_icon-18x18.png +excel_icon-32x32.png + .xls + .xlsx + +powerpoint_icon-18x18.png +powerpoint_icon-32x32.png + .ppt + .pptx + +jpeg_icon-18x18.png +jpeg_icon-32x32.png + .jpg + .jpeg + +tiff_icon-18x18.png +tiff_icon-32x32.png + .tiff + .tif + +generic_image_icon-18x18.png +generic_image_icon-32x32.png + .png + .bmp + .gif + .pcd + .psd + +audio_icon18x18.png +audio_icon32x32.png + .aif + .aiff + .wav + .au + .snd + .mp3 + .m4a + .mp4 + .ra + .rm + .ram + .wma + +video_icon18x18.png +video_icon32x32.png + .avi + .mov + .mp1 + .mp2 + .mp4 + .wmv + +zip_icon-18x18.png +zip_icon-32x32.png + .zip + .gz + .tar.gz + +generic_bitstream18x18.png +generic_bitstream32x32.png + [everything else] + +u-m_campus_only_access_icon.png + [added when we know an item/bitstream has campus-only restrictions] \ No newline at end of file diff --git a/src/themes/dspace/assets/images/doc_icons/jpeg_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/jpeg_icon-18x18.png new file mode 100644 index 00000000000..35d24e736d9 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/jpeg_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/jpeg_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/jpeg_icon-32x32.png new file mode 100644 index 00000000000..c2792138501 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/jpeg_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/lock.gif b/src/themes/dspace/assets/images/doc_icons/lock.gif new file mode 100644 index 00000000000..d2fa3241ed8 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/lock.gif differ diff --git a/src/themes/dspace/assets/images/doc_icons/pdf-icon32x32.png b/src/themes/dspace/assets/images/doc_icons/pdf-icon32x32.png new file mode 100644 index 00000000000..7c93b3342bf Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/pdf-icon32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/pdf_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/pdf_icon-18x18.png new file mode 100644 index 00000000000..92fce52311f Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/pdf_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/powerpoint_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/powerpoint_icon-18x18.png new file mode 100644 index 00000000000..e80a14f1be8 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/powerpoint_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/powerpoint_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/powerpoint_icon-32x32.png new file mode 100644 index 00000000000..e1c8b886bd7 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/powerpoint_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/text_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/text_icon-18x18.png new file mode 100644 index 00000000000..fcc918760cd Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/text_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/text_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/text_icon-32x32.png new file mode 100644 index 00000000000..f474e416e56 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/text_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/tiff_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/tiff_icon-18x18.png new file mode 100644 index 00000000000..33f8b0a70df Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/tiff_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/tiff_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/tiff_icon-32x32.png new file mode 100644 index 00000000000..340d2cc94d3 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/tiff_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/u-m_campus_only_access_icon.png b/src/themes/dspace/assets/images/doc_icons/u-m_campus_only_access_icon.png new file mode 100644 index 00000000000..c0f8a70f621 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/u-m_campus_only_access_icon.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/video_icon18x18.png b/src/themes/dspace/assets/images/doc_icons/video_icon18x18.png new file mode 100644 index 00000000000..16aaf3222f5 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/video_icon18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/video_icon32x32.png b/src/themes/dspace/assets/images/doc_icons/video_icon32x32.png new file mode 100644 index 00000000000..8e29926d7c7 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/video_icon32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/word-icon32x32.png b/src/themes/dspace/assets/images/doc_icons/word-icon32x32.png new file mode 100644 index 00000000000..1810c3e3b87 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/word-icon32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/word_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/word_icon-18x18.png new file mode 100644 index 00000000000..fcc918760cd Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/word_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/zip_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/zip_icon-18x18.png new file mode 100644 index 00000000000..a7fa8f3cfe9 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/zip_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/zip_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/zip_icon-32x32.png new file mode 100644 index 00000000000..362fcc90f43 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/zip_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/favicons/favicon.ico b/src/themes/dspace/assets/images/favicons/favicon.ico index a5dfd5e3226..94b8fd4fe86 100644 Binary files a/src/themes/dspace/assets/images/favicons/favicon.ico and b/src/themes/dspace/assets/images/favicons/favicon.ico differ diff --git a/src/themes/dspace/assets/images/favicons/favicon.svg b/src/themes/dspace/assets/images/favicons/favicon.svg deleted file mode 100644 index 8ea65cb72f0..00000000000 --- a/src/themes/dspace/assets/images/favicons/favicon.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/themes/dspace/eager-theme.module.ts b/src/themes/dspace/eager-theme.module.ts index 63dff9da317..fb080ed2d3d 100644 --- a/src/themes/dspace/eager-theme.module.ts +++ b/src/themes/dspace/eager-theme.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SharedModule } from '../../app/shared/shared.module'; import { HomeNewsComponent } from './app/home-page/home-news/home-news.component'; @@ -10,6 +10,7 @@ import { NavbarModule } from '../../app/navbar/navbar.module'; import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module'; import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module'; + /** * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS. * This will ensure that decorator gets picked up when the app loads @@ -34,6 +35,7 @@ const DECLARATIONS = [ NavbarModule, ], declarations: DECLARATIONS, + schemas: [ CUSTOM_ELEMENTS_SCHEMA ], providers: [ ...ENTRY_COMPONENTS.map((component) => ({provide: component})) ], diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts index cdaae815ada..be168af216c 100644 --- a/src/themes/dspace/lazy-theme.module.ts +++ b/src/themes/dspace/lazy-theme.module.ts @@ -116,7 +116,7 @@ const DECLARATIONS = [ SearchModule, FormsModule, ResourcePoliciesModule, - ComcolModule, + ComcolModule ], declarations: DECLARATIONS, }) diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss index 516eff9f7e9..52ce4b0dd63 100644 --- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss +++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss @@ -7,5 +7,6 @@ --ds-home-news-link-color: #{$green}; --ds-home-news-link-hover-color: #{darken($green, 15%)}; --ds-header-navbar-border-bottom-color: #{$green}; + --ds-anchors-color: #{$umanchors}; } diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss index b5799c97496..53a9964201c 100644 --- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss +++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss @@ -16,6 +16,8 @@ $cyan: #207698 !default; $yellow: #ec9433 !default; $red: #CF4444 !default; $dark: #43515f !default; +$umblue: #00274c !default; +$umanchors: #1d7491 !default; $gray-800: #343a40 !default; $gray-700: #495057 !default; @@ -30,7 +32,7 @@ $table-hover-bg: $gray-400 !default; // Bootstrap $gray-400 $yiq-contrasted-threshold: 170 !default; $theme-colors: ( - primary: $dark, + primary: $umblue, secondary: $gray-700, success: $green, info: $cyan,