Skip to content

Commit

Permalink
Theme changes related to 7.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
JacobSanford committed Feb 7, 2024
1 parent c70e97c commit ee933e1
Show file tree
Hide file tree
Showing 25 changed files with 128 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { Component } from '@angular/core';
import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
import {
listableObjectComponent
} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
import {
PersonComponent as BaseComponent
} from '../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component';
import { Context } from '../../../../../../../app/core/shared/context.model';

@listableObjectComponent('Person', ViewMode.StandalonePage, Context.Any, 'custom')
@Component({
selector: 'ds-person',
// styleUrls: ['./person.component.scss'],
styleUrls: ['../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component.scss'],
// templateUrl: './person.component.html',
templateUrl: '../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component.html',
})
export class PersonComponent extends BaseComponent {
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<div>
<img class="mb-4 login-logo" src="assets/images/dspace-logo.png">
<h1 class="h3 mb-0 font-weight-normal">{{"login.form.header" | translate}}</h1>
<ds-log-in
[isStandalonePage]="true"></ds-log-in>
<ds-themed-log-in
[isStandalonePage]="true"></ds-themed-log-in>
</div>
</div>
</div>
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { Component } from '@angular/core';
import {
RegisterEmailFormComponent as BaseComponent
} from '../../../../app/register-email-form/register-email-form.component';

@Component({
selector: 'ds-register-email-form',
// templateUrl: './register-email-form.component.html',
templateUrl: '../../../../app/register-email-form/register-email-form.component.html',
})
export class RegisterEmailFormComponent extends BaseComponent {
}
Empty file.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Component } from '@angular/core';
import { UserMenuComponent as BaseComponent } from '../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component';

/**
* Component representing the {@link UserMenuComponent} of a page
*/
@Component({
selector: 'ds-user-menu',
// templateUrl: 'user-menu.component.html',
templateUrl: '../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component.html',
// styleUrls: ['user-menu.component.scss'],
styleUrls: ['../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component.scss'],
})
export class UserMenuComponent extends BaseComponent {
}
Empty file.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { Component } from '@angular/core';
import { fadeIn, fadeInOut } from '../../../../../app/shared/animations/fade';
import { BrowseByComponent as BaseComponent } from '../../../../../app/shared/browse-by/browse-by.component';

@Component({
selector: 'ds-browse-by',
// styleUrls: ['./browse-by.component.scss'],
styleUrls: ['../../../../../app/shared/browse-by/browse-by.component.scss'],
// templateUrl: './browse-by.component.html',
templateUrl: '../../../../../app/shared/browse-by/browse-by.component.html',
animations: [
fadeIn,
fadeInOut,
],
})
export class BrowseByComponent extends BaseComponent {
}
Empty file.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { Component } from '@angular/core';
import { LangSwitchComponent as BaseComponent } from '../../../../../app/shared/lang-switch/lang-switch.component';

@Component({
selector: 'ds-lang-switch',
// styleUrls: ['./lang-switch.component.scss'],
styleUrls: ['../../../../../app/shared/lang-switch/lang-switch.component.scss'],
// templateUrl: './lang-switch.component.html',
templateUrl: '../../../../../app/shared/lang-switch/lang-switch.component.html',
})
export class LangSwitchComponent extends BaseComponent {
}
Empty file.
Empty file.
12 changes: 12 additions & 0 deletions build/src/themes/custom/app/shared/log-in/log-in.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { Component } from '@angular/core';
import { LogInComponent as BaseComponent } from '../../../../../app/shared/log-in/log-in.component';

@Component({
selector: 'ds-log-in',
// templateUrl: './log-in.component.html',
templateUrl: '../../../../../app/shared/log-in/log-in.component.html',
// styleUrls: ['./log-in.component.scss'],
styleUrls: ['../../../../../app/shared/log-in/log-in.component.scss'],
})
export class LogInComponent extends BaseComponent {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { Component } from '@angular/core';
import { BrowseEntry } from '../../../../../../app/core/shared/browse-entry.model';
import { ViewMode } from '../../../../../../app/core/shared/view-mode.model';
import { listableObjectComponent } from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
import { Context } from '../../../../../../app/core/shared/context.model';
import {
BrowseEntryListElementComponent as BaseComponent
} from '../../../../../../app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component';

@Component({
selector: 'ds-browse-entry-list-element',
// styleUrls: ['./browse-entry-list-element.component.scss'],
styleUrls: ['../../../../../../app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.scss'],
// templateUrl: './browse-entry-list-element.component.html',
templateUrl: '../../../../../../app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html',
})
@listableObjectComponent(BrowseEntry, ViewMode.ListElement, Context.Any, 'custom')
export class BrowseEntryListElementComponent extends BaseComponent {
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import { WorkflowItemSendBackComponent as BaseComponent } from '../../../../../a

@Component({
selector: 'ds-workflow-item-send-back',
// styleUrls: ['workflow-item-send-back.component.scss'],
// NOTE: the SCSS file for workflow-item-action-page does not have a corresponding file in the original
// implementation, so this commented out line below is a stub, here if you
// need it, but you probably don't need it.
// styleUrls: ['./workflow-item-send-back.component.scss'],
// templateUrl: './workflow-item-send-back.component.html'
templateUrl: '../../../../../app/workflowitems-edit-page/workflow-item-action-page.component.html'
})
Expand Down
8 changes: 8 additions & 0 deletions build/src/themes/custom/eager-theme.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ import {
ItemSearchResultListElementComponent
} from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
import { TopLevelCommunityListComponent } from './app/home-page/top-level-community-list/top-level-community-list.component';
import { LogInComponent } from './app/shared/log-in/log-in.component';
import { BrowseEntryListElementComponent } from './app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component';
import { PersonComponent } from './app/entity-groups/research-entities/item-pages/person/person.component';
import { LangSwitchComponent } from './app/shared/lang-switch/lang-switch.component';


/**
Expand All @@ -64,6 +68,7 @@ const ENTRY_COMPONENTS = [
JournalComponent,
JournalIssueComponent,
JournalVolumeComponent,
PersonComponent,
PublicationComponent,
UntypedItemComponent,
CommunityListElementComponent,
Expand All @@ -75,6 +80,7 @@ const ENTRY_COMPONENTS = [
PublicationSidebarSearchListElementComponent,
ItemSearchResultListElementComponent,
TopLevelCommunityListComponent,
BrowseEntryListElementComponent,
];

const DECLARATIONS = [
Expand All @@ -91,6 +97,8 @@ const DECLARATIONS = [
EditCollectionSelectorComponent,
EditCommunitySelectorComponent,
EditItemSelectorComponent,
LogInComponent,
LangSwitchComponent,
];

@NgModule({
Expand Down
6 changes: 6 additions & 0 deletions build/src/themes/custom/lazy-theme.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@ import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/
import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
import { FormModule } from '../../app/shared/form/form.module';
import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
import {UserMenuComponent} from './app/shared/auth-nav-menu/user-menu/user-menu.component';
import { BrowseByComponent } from './app/shared/browse-by/browse-by.component';
import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component';

const DECLARATIONS = [
FileSectionComponent,
Expand Down Expand Up @@ -239,6 +242,9 @@ const DECLARATIONS = [
SubmissionSectionUploadFileComponent,
ItemStatusComponent,
EditBitstreamPageComponent,
UserMenuComponent,
BrowseByComponent,
RegisterEmailFormComponent,
];

@NgModule({
Expand Down
3 changes: 1 addition & 2 deletions build/src/themes/custom/styles/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
@import '../../../styles/_variables.scss';
@import '../../../styles/_mixins.scss';
@import '../../../styles/helpers/font_awesome_imports.scss';
@import '../../../../node_modules/bootstrap/scss/bootstrap.scss';
@import '../../../../node_modules/nouislider/distribute/nouislider.min';
@import '../../../styles/_vendor.scss';
@import '../../../styles/_custom_variables.scss';
@import './_theme_css_variable_overrides.scss';
@import '../../../styles/bootstrap_variables_mapping.scss';
Expand Down

0 comments on commit ee933e1

Please sign in to comment.