{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}
-
{{'collection.page.browse.recent.empty' | translate}}
@@ -74,7 +74,7 @@
{{ 'collection.edit.tabs.source.form.head' | translate }}
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
index aa6b71f588..0403a7ecad 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
@@ -6,7 +6,7 @@
diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
index 50bbb9a20e..821cb58473 100644
--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -1,4 +1,4 @@
-
@@ -57,7 +57,7 @@
-
-
-
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
index ac55a211e9..736d39d318 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
@@ -1,4 +1,4 @@
-
{{(user$ | async)?.name}} ({{(user$ | async)?.email}})
{{'nav.profile' | translate}}
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index ca9474f632..7d9153b9f8 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -14,7 +14,7 @@
(next)="goNext()">
-
diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index d71d100ca5..115261f161 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -38,6 +38,7 @@ import { HostWindowService } from '../host-window.service';
import { RouteService } from '../../core/services/route.service';
import { routeServiceStub } from '../testing/route-service.stub';
import SpyObj = jasmine.SpyObj;
+import { getMockThemeService } from '../mocks/theme-service.mock';
@listableObjectComponent(BrowseEntry, ViewMode.ListElement, DEFAULT_CONTEXT, 'custom')
@Component({
@@ -81,13 +82,10 @@ describe('BrowseByComponent', () => {
});
const paginationService = new PaginationServiceStub(paginationConfig);
- let themeService: SpyObj;
+ let themeService;
beforeEach(waitForAsync(() => {
- themeService = jasmine.createSpyObj('themeService', {
- getThemeName: 'dspace',
- getThemeName$: observableOf('dspace'),
- });
+ themeService = getMockThemeService('dspace');
TestBed.configureTestingModule({
imports: [
CommonModule,
@@ -112,19 +110,16 @@ describe('BrowseByComponent', () => {
],
schemas: [NO_ERRORS_SCHEMA]
}).compileComponents();
- }));
-
- beforeEach(() => {
fixture = TestBed.createComponent(BrowseByComponent);
comp = fixture.componentInstance;
comp.paginationConfig = paginationConfig;
fixture.detectChanges();
- });
+ }));
it('should display a loading message when objects is empty', () => {
(comp as any).objects = undefined;
fixture.detectChanges();
- expect(fixture.debugElement.query(By.css('ds-loading'))).toBeDefined();
+ expect(fixture.debugElement.query(By.css('ds-themed-loading'))).toBeDefined();
});
it('should display results when objects is not empty', () => {
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
index 87337d9084..db6c1fb41d 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.html
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -35,8 +35,8 @@
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
index b0a319b4ff..440785b89b 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
@@ -13,7 +13,7 @@
-
{{'comcol-role.edit.no-group' | translate}}
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index 198da8d3ed..8abb8ad558 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -31,7 +31,7 @@
-
-
-
-
diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html
index c86d4e0195..a80fe35f4e 100644
--- a/src/app/submission/form/submission-form.component.html
+++ b/src/app/submission/form/submission-form.component.html
@@ -22,7 +22,7 @@
{{'vocabulary-treeview.search.no-result' | translate}}
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.html b/src/app/statistics-page/statistics-page/statistics-page.component.html index 5cf1e9c8b5..c6938c7582 100644 --- a/src/app/statistics-page/statistics-page/statistics-page.component.html +++ b/src/app/statistics-page/statistics-page/statistics-page.component.html @@ -11,7 +11,7 @@
-
-
- {{ 'search.results.empty' | translate }}
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 20743540a8..6b9d542abc 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -4,7 +4,7 @@
-
-
diff --git a/src/app/submission/sections/form/section-form.component.html b/src/app/submission/sections/form/section-form.component.html
index cd7b45bb00..675b550b57 100644
--- a/src/app/submission/sections/form/section-form.component.html
+++ b/src/app/submission/sections/form/section-form.component.html
@@ -1,4 +1,4 @@
-
-
+
text-content
-
+
![]()
diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index 96aaaa7c02..11271ebeb4 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -115,7 +115,7 @@ describe('ThumbnailComponent', () => {
comp.thumbnail = thumbnail;
comp.ngOnChanges();
fixture.detectChanges();
- expect(de.query(By.css('ds-loading'))).toBeTruthy();
+ expect(de.query(By.css('ds-themed-loading'))).toBeTruthy();
});
});
diff --git a/src/themes/custom/app/shared/loading/loading.component.html b/src/themes/custom/app/shared/loading/loading.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/loading/loading.component.scss b/src/themes/custom/app/shared/loading/loading.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/loading/loading.component.ts b/src/themes/custom/app/shared/loading/loading.component.ts
new file mode 100644
index 0000000000..fb1a291dc0
--- /dev/null
+++ b/src/themes/custom/app/shared/loading/loading.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loading/loading.component';
+
+@Component({
+ selector: 'ds-loading',
+ styleUrls: ['../../../../../app/shared/loading/loading.component.scss'],
+ // styleUrls: ['./loading.component.scss'],
+ templateUrl: '../../../../../app/shared/loading/loading.component.html'
+ // templateUrl: './loading.component.html'
+})
+export class LoadingComponent extends BaseComponent {
+
+}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index 54cbe2cd7e..46607db98f 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -93,6 +93,7 @@ import { ItemMetadataComponent } from './app/item-page/edit-item-page/item-metad
import {
EditItemTemplatePageComponent
} from './app/collection-page/edit-item-template-page/edit-item-template-page.component';
+import { LoadingComponent } from './app/shared/loading/loading.component';
const DECLARATIONS = [
FileSectionComponent,
@@ -141,6 +142,7 @@ const DECLARATIONS = [
ExpandableNavbarSectionComponent,
ItemMetadataComponent,
EditItemTemplatePageComponent,
+ LoadingComponent,
];
@NgModule({