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 'w2p-55693_Item-mapping-to-collections' into w2p-55946_Item-mapping-on-item-level

Browse Source 
Conflicts:
	src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
This commit is contained in:
Kristof De Langhe
2018-11-16 14:30:01 +01:00
parent 8d396f3832 904ee2cab4
commit 1c013bc85b
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
View File

@@ -5,16 +5,6 @@
<p [innerHTML]="'collection.item-mapper.collection' | translate:{ name: (collectionRD$ | async)?.payload?.name }" id="collection-name"></p> <p [innerHTML]="'collection.item-mapper.collection' | translate:{ name: (collectionRD$ | async)?.payload?.name }" id="collection-name"></p>
<p>{{'collection.item-mapper.description' | translate}}</p> <p>{{'collection.item-mapper.description' | translate}}</p>
<div class="row">
<div class="col-12 col-lg-6">
<ds-search-form id="search-form"
[query]="(searchOptions$ | async)?.query"
[scope]="(searchOptions$ | async)?.scope"
[currentUrl]="getCurrentUrl()">
</ds-search-form>
</div>
</div>
<ngb-tabset (tabChange)="tabChange($event)" [destroyOnHide]="false"> <ngb-tabset (tabChange)="tabChange($event)" [destroyOnHide]="false">
<ngb-tab title="{{'collection.item-mapper.tabs.browse' | translate}}"> <ngb-tab title="{{'collection.item-mapper.tabs.browse' | translate}}">
<ng-template ngbTabContent> <ng-template ngbTabContent>
@@ -31,7 +21,17 @@
</ngb-tab> </ngb-tab>
<ngb-tab title="{{'collection.item-mapper.tabs.map' | translate}}"> <ngb-tab title="{{'collection.item-mapper.tabs.map' | translate}}">
<ng-template ngbTabContent> <ng-template ngbTabContent>
<div class="mt-2"> <div class="row mt-2">
<div class="col-12 col-lg-6">
<ds-search-form id="search-form"
[query]="(searchOptions$ | async)?.query"
[scope]="(searchOptions$ | async)?.scope"
[currentUrl]="getCurrentUrl()">
</ds-search-form>
</div>
</div>
<div>
<ds-item-select class="mt-2" <ds-item-select class="mt-2"
[key]="'map'" [key]="'map'"
[dsoRD$]="mappingItemsRD$" [dsoRD$]="mappingItemsRD$"