hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w2p-46063_truncation-implementation

Browse Source 
Conflicts:
	src/app/object-list/item-list-element/item-list-element.component.ts
	src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts
	src/styles/_custom_variables.scss
	src/styles/_mixins.scss
This commit is contained in:
Lotte Hofstede
2018-01-23 10:27:25 +01:00
parent 33e04fd324 90c3d16e8e
commit 136edddbdd
194 changed files with 4168 additions and 1160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/app/shared/shared.module.ts
View File

@@ -13,22 +13,32 @@ import { EnumKeysPipe } from './utils/enum-keys-pipe';
import { FileSizePipe } from './utils/file-size-pipe';
import { SafeUrlPipe } from './utils/safe-url-pipe';
import { CollectionListElementComponent } from '../object-list/collection-list-element/collection-list-element.component';
import { CollectionListElementComponent } from './object-list/collection-list-element/collection-list-element.component';
import { CommunityListElementComponent } from './object-list/community-list-element/community-list-element.component';
import { ItemListElementComponent } from './object-list/item-list-element/item-list-element.component';
import { SearchResultListElementComponent } from './object-list/search-result-list-element/search-result-list-element.component';
import { WrapperListElementComponent } from './object-list/wrapper-list-element/wrapper-list-element.component';
import { ObjectListComponent } from './object-list/object-list.component';
import { CollectionGridElementComponent} from './object-grid/collection-grid-element/collection-grid-element.component'
import { CommunityGridElementComponent} from './object-grid/community-grid-element/community-grid-element.component'
import { ItemGridElementComponent} from './object-grid/item-grid-element/item-grid-element.component'
import { AbstractListableElementComponent} from './object-collection/shared/object-collection-element/abstract-listable-element.component'
import { WrapperGridElementComponent} from './object-grid/wrapper-grid-element/wrapper-grid-element.component'
import { ObjectGridComponent } from './object-grid/object-grid.component';
import { ObjectCollectionComponent } from './object-collection/object-collection.component';
import { ComcolPageContentComponent } from './comcol-page-content/comcol-page-content.component';
import { ComcolPageHeaderComponent } from './comcol-page-header/comcol-page-header.component';
import { ComcolPageLogoComponent } from './comcol-page-logo/comcol-page-logo.component';
import { CommunityListElementComponent } from '../object-list/community-list-element/community-list-element.component';
import { ErrorComponent } from './error/error.component';
import { LoadingComponent } from './loading/loading.component';
import { ItemListElementComponent } from '../object-list/item-list-element/item-list-element.component';
import { ObjectListComponent } from '../object-list/object-list.component';
import { ObjectListElementComponent } from '../object-list/object-list-element/object-list-element.component';
import { PaginationComponent } from './pagination/pagination.component';
import { ThumbnailComponent } from '../thumbnail/thumbnail.component';
import { SearchResultListElementComponent } from '../object-list/search-result-list-element/search-result-list-element.component';
import { SearchFormComponent } from './search-form/search-form.component';
import { WrapperListElementComponent } from '../object-list/wrapper-list-element/wrapper-list-element.component';
import { SearchResultGridElementComponent } from './object-grid/search-result-grid-element/search-result-grid-element.component';
import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component';
import { GridThumbnailComponent } from './object-grid/grid-thumbnail/grid-thumbnail.component';
import { VarDirective } from './utils/var.directive';
import { TruncatePipe } from './utils/truncate.pipe';
import { TruncatableComponent } from './truncatable/truncatable.component';
@@ -61,10 +71,15 @@ const COMPONENTS = [
ErrorComponent,
LoadingComponent,
ObjectListComponent,
ObjectListElementComponent,
AbstractListableElementComponent,
WrapperListElementComponent,
ObjectGridComponent,
WrapperGridElementComponent,
ObjectCollectionComponent,
PaginationComponent,
SearchFormComponent,
ThumbnailComponent,
GridThumbnailComponent,
WrapperListElementComponent,
ViewModeSwitchComponent,
TruncatableComponent
@@ -72,10 +87,14 @@ const COMPONENTS = [
const ENTRY_COMPONENTS = [
// put shared entry components (components that are created dynamically) here
ItemListElementComponent,
CollectionListElementComponent,
CommunityListElementComponent,
ItemListElementComponent,
SearchResultListElementComponent
SearchResultListElementComponent,
ItemGridElementComponent,
CollectionGridElementComponent,
CommunityGridElementComponent,
SearchResultGridElementComponent
];
const PROVIDERS = [