Skip to content

Commit

Permalink
Merge pull request #2455 from DSpace/backport-2438-to-dspace-7_x
Browse files Browse the repository at this point in the history
[Port dspace-7_x] 2437 Correct and clarify commented-out code in several custom components
  • Loading branch information
tdonohue authored Aug 23, 2023
2 parents 63345a3 + 3292222 commit 8feeedf
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/themes/custom/app/footer/footer.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { FooterComponent as BaseComponent } from '../../../../app/footer/footer.

@Component({
selector: 'ds-footer',
// styleUrls: ['footer.component.scss'],
// styleUrls: ['./footer.component.scss'],
styleUrls: ['../../../../app/footer/footer.component.scss'],
// templateUrl: 'footer.component.html'
// templateUrl: './footer.component.html'
templateUrl: '../../../../app/footer/footer.component.html'
})
export class FooterComponent extends BaseComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/h
*/
@Component({
selector: 'ds-header-navbar-wrapper',
// styleUrls: ['header-navbar-wrapper.component.scss'],
// styleUrls: ['./header-navbar-wrapper.component.scss'],
styleUrls: ['../../../../app/header-nav-wrapper/header-navbar-wrapper.component.scss'],
// templateUrl: 'header-navbar-wrapper.component.html',
// templateUrl: './header-navbar-wrapper.component.html',
templateUrl: '../../../../app/header-nav-wrapper/header-navbar-wrapper.component.html',
})
export class HeaderNavbarWrapperComponent extends BaseComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import { fadeInOut, fadeOut } from '../../../../../app/shared/animations/fade';
*/
@Component({
selector: 'ds-auth-nav-menu',
// templateUrl: 'auth-nav-menu.component.html',
// templateUrl: './auth-nav-menu.component.html',
templateUrl: '../../../../../app/shared/auth-nav-menu/auth-nav-menu.component.html',
// styleUrls: ['auth-nav-menu.component.scss'],
// styleUrls: ['./auth-nav-menu.component.scss'],
styleUrls: ['../../../../../app/shared/auth-nav-menu/auth-nav-menu.component.scss'],
animations: [fadeInOut, fadeOut]
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { ObjectListComponent as BaseComponent} from '../../../../../app/shared/o
selector: 'ds-object-list',
// styleUrls: ['./object-list.component.scss'],
styleUrls: ['../../../../../app/shared/object-list/object-list.component.scss'],
// templateUrl: 'object-list.component.html'
// templateUrl: './object-list.component.html'
templateUrl: '../../../../../app/shared/object-list/object-list.component.html'
})

Expand Down
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

0 comments on commit 8feeedf

Please sign in to comment.