MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Library|Trunk] 

Helptexts: add in linking pages



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56756 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2019-07-24 15:46:49 +00:00
parent 837c722c1e
commit c6e0a5f165
10 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
claims/claim-utils/claimProjectSearchForm.component.html
View File

@ -1,5 +1,5 @@
<form class=" uk-margin-top uk-animation ">
<div class="">Start searching for projects and add them to the basket to link them to your sources
<div class="uk-margin-small-bottom">Start searching for projects and add them to the basket to link them to your sources
<!-- <helper div="link-project-form" tooltip=true></helper> -->
</div>

2
claims/claim-utils/claimResultSearchForm.component.html
View File

@ -1,5 +1,5 @@
<form class=" uk-margin-top">
<div class="">Start searching Research Results and add them to the Basket to Link
<div class="uk-margin-small-bottom">Start searching Research Results and add them to the Basket to Link
<!-- <helper div="link-entity-form" styleName="" tooltip=true></helper> -->
</div>

11
claims/claim-utils/displayClaims/displayClaims.component.html
View File

@ -1,10 +1,12 @@
<schema2jsonld *ngIf="url" [URL]="url" name="Manage links" type="other"></schema2jsonld>
<div class="uk-width-1-1">
<helper position="top"></helper>
</div>
<div class="uk-grid helper-grid">
<helper position="left" styleName=" uk-width-1-5 uk-padding-left"></helper>
<!-- <helper position="left" styleName=" uk-width-1-5 uk-padding-left"></helper>-->
<div class="uk-width-expand uk-margin-top">
<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
[texts]="pageContents['top']"></helper>
<form class="">
<div class=" ">
@ -206,9 +208,10 @@
(pageChange)="pageChange($event)" class="uk-float-right"></paging-no-load>
</div>
</div>
<helper position="bottom"></helper>
</div>
<helper *ngIf="pageContents && pageContents['right'] && pageContents['right'].length > 0"
[texts]="pageContents['right']" class="uk-width-1-5"></helper>
<!-- <div class="uk-width-1-5">
<div class="uk-card portal-card uk-padding" *ngIf="externalPortalUrl || claimsInfoURL">
<h6 *ngIf="!externalPortalUrl || externalPortalUrl.indexOf('http')==-1" class="uk-h6">
@ -225,6 +228,8 @@
<helper position="right" styleName=" uk-width-1-5"></helper>
</div>-->
</div>
<helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0"
[texts]="pageContents['bottom']"></helper>
<modal-alert (alertOutput)="confirmClose()">
<h4 class="modal-title uk-text-bold " id="myModalLabel">Are you sure?</h4>
<p>

7
claims/claim-utils/displayClaims/displayClaims.component.ts
View File

@ -13,6 +13,7 @@ import {SEOService} from '../../../sharedComponents/SEO/SEO.service';
import {IndexInfoService} from "../../../utils/indexInfo.service";
import {ClaimDBRecord} from "../claimHelper.class";
import {Dates} from "../../../utils/string-utils.class";
import {HelperService} from "../../../utils/helper/helper.service";
@Component({
@ -73,9 +74,10 @@ export class DisplayClaimsComponent {
@Input() communityId: string = null;
url = null;
public pageContents = null;
constructor(private _claimService: ClaimsService, private route: ActivatedRoute, private _router: Router, private location: Location,
private seoService: SEOService, private indexInfoService:IndexInfoService) {
private seoService: SEOService, private indexInfoService:IndexInfoService, private helper: HelperService) {
}
ngOnInit() {
@ -83,6 +85,9 @@ export class DisplayClaimsComponent {
.subscribe((data: { envSpecific: EnvProperties }) => {
this.properties = data.envSpecific;
this.url = data.envSpecific.baseLink + this._router.url;
this.helper.getPageHelpContents(this._router.url, this.properties, this.communityId).subscribe(contents => {
this.pageContents = contents;
});
this.indexInfoService.getLastIndexDate(this.properties).subscribe(res => {
this.lastIndexDate = res;
});

10
claims/linking/linkingGeneric.component.html
View File

@ -1,7 +1,7 @@
<metadata-preview *ngIf="showOptions.show=='claim' && properties" class="uk-margin-top"
[results]="results" [sources]="sources"
[localStoragePrefix]="localStoragePrefix" [inlineEntity]="inlineEntity"
[showOptions]="showOptions" [properties]=properties>
[showOptions]="showOptions" [properties]=properties [pageContents]="pageContents">
</metadata-preview>
<div id="tm-main" class="uk-section uk-padding-remove-top tm-middle" *ngIf="showOptions.show != 'claim'">
<div class="uk-grid">
@ -13,7 +13,7 @@
<helper position="top"></helper>
</div> -->
<div class="uk-grid helper-grid">
<helper position="left" styleName=" uk-width-1-5 uk-padding-left"></helper>
<!-- <helper position="left" styleName=" uk-width-1-5 uk-padding-left"></helper>-->
<div class="uk-width-expand">
<div *ngIf="properties" class="uk-section uk-section-default uk-padding-remove-top">
@ -258,13 +258,13 @@
</div>
</div>
</div>
<helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0" [texts]="pageContents['bottom']"></helper>
</div>
<helper position="right" styleName=" uk-width-1-5"></helper>
<!-- <helper position="right" styleName=" uk-width-1-5"></helper>-->
</div>
<helper position="bottom"></helper>
<!-- <helper position="bottom"></helper>-->
</div>

8
claims/linking/linkingGeneric.component.ts
View File

@ -9,6 +9,7 @@ import {SearchDatasetsService} from '../../services/searchDatasets.service';
import {SEOService} from '../../sharedComponents/SEO/SEO.service';
import {AlertModal} from "../../utils/modal/alert";
import {HelperFunctions} from "../../utils/HelperFunctions.class";
import {HelperService} from "../../utils/helper/helper.service";
declare var UIkit:any;
@ -37,13 +38,13 @@ export class LinkingGenericComponent {
@Input() localStoragePrefix:string = "linking_";
url=null;
@ViewChild(AlertModal) alert;
public pageContents = null;
constructor (private _router: Router, private route: ActivatedRoute, private entitySearch:EntitiesSearchService,
private publicationsSearch:SearchPublicationsService, private datasetsSearch:SearchDatasetsService,
private _meta: Meta, private _title: Title,
private seoService: SEOService ) {
private seoService: SEOService, private helper: HelperService ) {
let title = "OpenAIRE | Linking";
this._meta.updateTag({content:title},"property='og:title'");
@ -63,6 +64,9 @@ export class LinkingGenericComponent {
this.properties = data.envSpecific;
this.url = data.envSpecific.baseLink+this._router.url;
this.seoService.createLinkForCanonicalURL(this.properties.baseLink+this._router.url, false);
this.helper.getPageHelpContents(this._router.url, this.properties, this.communityId).subscribe(contents => {
this.pageContents = contents;
})
});
if( typeof localStorage !== 'undefined') {

1
claims/linking/selected/metadataPreview.component.html
View File

@ -404,6 +404,7 @@
</div>
<helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0" [texts]="pageContents['bottom']"></helper>
</div>
</div>
</div>

1
claims/linking/selected/metadataPreview.component.ts
View File

@ -23,6 +23,7 @@ export class MetadataPreviewComponent {
@Input() inlineEntity: ClaimEntity = null;
@Input() showOptions:ShowOptions;
@Input() public properties: EnvProperties;
@Input() pageContents;
@ViewChild(AlertModal) alertApplyAll;
@Input() localStoragePrefix: string = "";

3
claims/linking/selected/metadataPreview.module.ts
View File

@ -5,6 +5,7 @@ import {AlertModalModule} from '../../../utils/modal/alertModal.module';
import {ClaimEntitiesMetadataModule} from "./ClaimEntitiesMetadata.module";
import {InsertClaimsModule} from "../insertClaim/insertClaim.module";
import { MatDatepickerModule, MatNativeDateModule, MatFormFieldModule, MatInputModule} from '@angular/material';
import {HelperModule} from "../../../utils/helper/helper.module";
@NgModule({
imports: [
@ -12,7 +13,7 @@ import { MatDatepickerModule, MatNativeDateModule, MatFormFieldModule, MatInputM
AlertModalModule,
ClaimEntitiesMetadataModule,
InsertClaimsModule,
MatDatepickerModule, MatNativeDateModule, MatFormFieldModule, MatInputModule
MatDatepickerModule, MatNativeDateModule, MatFormFieldModule, MatInputModule, HelperModule
],
declarations: [MetadataPreviewComponent],
exports:[MetadataPreviewComponent]

4
claims/myClaims/myClaims.component.ts
View File

@ -18,7 +18,7 @@ import {Meta, Title} from '@angular/platform-browser';
</div>
<div>
<displayClaims [enableDelete]=true [myClaims]=true [isAdmin]=false [showUserEmail]=false
moreClaimsURL="/participate/claim" [claimsInfoURL]=claimsInfoURL
[claimsInfoURL]=claimsInfoURL [communityId]=communityId
></displayClaims>
</div>
</div>
@ -30,7 +30,7 @@ import {Meta, Title} from '@angular/platform-browser';
})
export class MyClaimsComponent {
@Input() claimsInfoURL: string;
@Input() communityId:string;
constructor(private _meta: Meta, private _title: Title) {
let title = "OpenAIRE | My links";