mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
[#2719][CST-12825] Extracts new image-page-field component with css variable
This commit is contained in:
@@ -32,14 +32,18 @@
|
|||||||
</ds-generic-item-page-field>
|
</ds-generic-item-page-field>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12 col-md-7">
|
<div class="col-xs-12 col-md-7">
|
||||||
<ds-generic-item-page-field
|
<ds-item-page-img-field
|
||||||
[fields]="['organization.identifier.ror']"
|
[fields]="['organization.identifier.ror']"
|
||||||
[img]="'./assets/images/ror-icon.svg'"
|
[img]="{
|
||||||
|
URI: './assets/images/ror-icon.svg',
|
||||||
|
alt: 'item.page.image.alt.ROR',
|
||||||
|
heightVar: '--ds-item-page-img-field-ror-inline-height'
|
||||||
|
}"
|
||||||
[item]="object"
|
[item]="object"
|
||||||
[label]="'orgunit.page.ror'"
|
[label]="'orgunit.page.ror'"
|
||||||
[urlRegex]="'(.*)ror.org'"
|
[urlRegex]="'(.*)ror.org'"
|
||||||
>
|
>
|
||||||
</ds-generic-item-page-field>
|
</ds-item-page-img-field>
|
||||||
<ds-related-items
|
<ds-related-items
|
||||||
[parentItem]="object"
|
[parentItem]="object"
|
||||||
[relationType]="'isPublicationOfOrgUnit'"
|
[relationType]="'isPublicationOfOrgUnit'"
|
||||||
|
@@ -25,8 +25,11 @@
|
|||||||
|
|
||||||
<!-- Render value as a link with icon -->
|
<!-- Render value as a link with icon -->
|
||||||
<ng-template #linkImg let-img="img" let-value="value">
|
<ng-template #linkImg let-img="img" let-value="value">
|
||||||
<a [href]="value" class="dont-break-out ds-simple-metadata-link" target="_blank">
|
<a class="link-anchor" [href]="value" class="dont-break-out ds-simple-metadata-link" target="_blank">
|
||||||
<img alt="metadata logo" height="24" src="{{img}}"/>
|
<img class="link-logo"
|
||||||
|
[alt]="img.alt | translate"
|
||||||
|
[style.height]="'var(' + img.heightVar + ', --ds-item-page-img-field-default-inline-height)'"
|
||||||
|
[src]="img.URI"/>
|
||||||
{{value}}
|
{{value}}
|
||||||
</a>
|
</a>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
@@ -4,6 +4,7 @@ import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
|
|||||||
import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
|
import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
|
||||||
import { hasValue } from '../../../shared/empty.util';
|
import { hasValue } from '../../../shared/empty.util';
|
||||||
import { VALUE_LIST_BROWSE_DEFINITION } from '../../../core/shared/value-list-browse-definition.resource-type';
|
import { VALUE_LIST_BROWSE_DEFINITION } from '../../../core/shared/value-list-browse-definition.resource-type';
|
||||||
|
import { ImageField } from '../../simple/field-components/specific-field/img/item-page-img-field.component';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This component renders the configured 'values' into the ds-metadata-field-wrapper component.
|
* This component renders the configured 'values' into the ds-metadata-field-wrapper component.
|
||||||
@@ -55,7 +56,10 @@ export class MetadataValuesComponent implements OnChanges {
|
|||||||
|
|
||||||
@Input() browseDefinition?: BrowseDefinition;
|
@Input() browseDefinition?: BrowseDefinition;
|
||||||
|
|
||||||
@Input() img?: string;
|
/**
|
||||||
|
* Optional {@code ImageField} reference that represents an image to be displayed inline.
|
||||||
|
*/
|
||||||
|
@Input() img?: ImageField;
|
||||||
|
|
||||||
ngOnChanges(changes: SimpleChanges): void {
|
ngOnChanges(changes: SimpleChanges): void {
|
||||||
this.renderMarkdown = !!this.appConfig.markdown.enabled && this.enableMarkdown;
|
this.renderMarkdown = !!this.appConfig.markdown.enabled && this.enableMarkdown;
|
||||||
|
@@ -30,6 +30,7 @@ import { RelatedItemsComponent } from './simple/related-items/related-items-comp
|
|||||||
import {
|
import {
|
||||||
ThemedMetadataRepresentationListComponent
|
ThemedMetadataRepresentationListComponent
|
||||||
} from './simple/metadata-representation-list/themed-metadata-representation-list.component';
|
} from './simple/metadata-representation-list/themed-metadata-representation-list.component';
|
||||||
|
import { ItemPageImgFieldComponent } from './simple/field-components/specific-field/img/item-page-img-field.component';
|
||||||
|
|
||||||
const ENTRY_COMPONENTS = [
|
const ENTRY_COMPONENTS = [
|
||||||
ItemVersionsDeleteModalComponent,
|
ItemVersionsDeleteModalComponent,
|
||||||
@@ -46,6 +47,7 @@ const COMPONENTS = [
|
|||||||
MetadataRepresentationListComponent,
|
MetadataRepresentationListComponent,
|
||||||
ThemedMetadataRepresentationListComponent,
|
ThemedMetadataRepresentationListComponent,
|
||||||
RelatedItemsComponent,
|
RelatedItemsComponent,
|
||||||
|
ItemPageImgFieldComponent,
|
||||||
];
|
];
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
|
@@ -45,7 +45,5 @@ export class GenericItemPageFieldComponent extends ItemPageFieldComponent {
|
|||||||
*/
|
*/
|
||||||
@Input() urlRegex?: string;
|
@Input() urlRegex?: string;
|
||||||
|
|
||||||
@Input() img?: string;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -6,6 +6,5 @@
|
|||||||
[enableMarkdown]="enableMarkdown"
|
[enableMarkdown]="enableMarkdown"
|
||||||
[urlRegex]="urlRegex"
|
[urlRegex]="urlRegex"
|
||||||
[browseDefinition]="browseDefinition|async"
|
[browseDefinition]="browseDefinition|async"
|
||||||
[img]="img"
|
|
||||||
></ds-metadata-values>
|
></ds-metadata-values>
|
||||||
</div>
|
</div>
|
||||||
|
@@ -51,8 +51,6 @@ export class ItemPageFieldComponent {
|
|||||||
*/
|
*/
|
||||||
urlRegex?: string;
|
urlRegex?: string;
|
||||||
|
|
||||||
img?: string;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return browse definition that matches any field used in this component if it is configured as a browse
|
* Return browse definition that matches any field used in this component if it is configured as a browse
|
||||||
* link in dspace.cfg (webui.browse.link.<n>)
|
* link in dspace.cfg (webui.browse.link.<n>)
|
||||||
|
@@ -2464,6 +2464,8 @@
|
|||||||
|
|
||||||
"item.page.claim.tooltip": "Claim this item as profile",
|
"item.page.claim.tooltip": "Claim this item as profile",
|
||||||
|
|
||||||
|
"item.page.image.alt.ROR": "ROR logo",
|
||||||
|
|
||||||
"item.preview.dc.identifier.uri": "Identifier:",
|
"item.preview.dc.identifier.uri": "Identifier:",
|
||||||
|
|
||||||
"item.preview.dc.contributor.author": "Authors:",
|
"item.preview.dc.contributor.author": "Authors:",
|
||||||
|
@@ -101,4 +101,7 @@
|
|||||||
--ds-dso-edit-lang-width: 90px;
|
--ds-dso-edit-lang-width: 90px;
|
||||||
--ds-dso-edit-actions-width: 173px;
|
--ds-dso-edit-actions-width: 173px;
|
||||||
--ds-dso-edit-virtual-tooltip-min-width: 300px;
|
--ds-dso-edit-virtual-tooltip-min-width: 300px;
|
||||||
|
|
||||||
|
--ds-item-page-img-field-default-inline-height: 24px;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -7,5 +7,7 @@
|
|||||||
--ds-home-news-link-color: #{$green};
|
--ds-home-news-link-color: #{$green};
|
||||||
--ds-home-news-link-hover-color: #{darken($green, 15%)};
|
--ds-home-news-link-hover-color: #{darken($green, 15%)};
|
||||||
--ds-header-navbar-border-bottom-color: #{$green};
|
--ds-header-navbar-border-bottom-color: #{$green};
|
||||||
|
--ds-item-page-img-field-default-inline-height: 24px;
|
||||||
|
--ds-item-page-img-field-ror-inline-height: var(--ds-item-page-img-field-default-inline-height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user