MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 14 Wiki Activity

[Connect Trunk] 

customization.css: remove border radius css
connect css: add border radius for subscribe buttons

Zenodo Communities: 
	add breadcrumb
	use communityId for helptexts
	


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@58565 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2020-04-27 13:00:14 +00:00
parent c4c5a17ba6
commit b83ec64b45
5 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/deposit/zenodo/shareInZenodo.component.html
View File

@ -2,18 +2,19 @@
<div class="uk-section uk-padding-remove-bottom uk-padding-remove-top">
<div class="communityPanelBackground uk-margin-top uk-padding-small">
<div class="uk-container uk-container-large uk-margin-top uk-margin-bottom">
<ul class="uk-breadcrumb">
<!-- <ul class="uk-breadcrumb">
<li><a class="breadcrumb" routerLinkActive="router-link-active" routerLink="{{depositLearnHowPage}}"
[queryParams]="properties.environment!='development'?{}:routerHelper.createQueryParam('communityId',communityId)">
Deposit
</a></li>
<li><span class="active">Deposit in Zenodo</span></li>
</ul>
</ul>-->
<breadcrumbs [light]="true" [breadcrumbs]="breadcrumbs"></breadcrumbs>
</div>
</div>
</div>
<div class=" uk-section uk-margin-small-top tm-middle uk-container uk-container-large" id="tm-main">
<div class="communityBackground">
<div class=" uk-section uk-margin-small-top tm-middle uk-container uk-container-large " id="tm-main">
<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" [texts]="pageContents['top']"></helper>
<div class="uk-container uk-container-large uk-margin-bottom">
<div class="uk-h2">
@ -55,7 +56,8 @@
<!-- </a>-->
<!-- </div>-->
<span class="uk-width-expand uk-flex uk-flex-bottom uk-flex-right">
<a [href]="depositLink + masterZenodoCommunity.id " target="_blank" type="submit" class="uk-float-right uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-small-left">
<a [href]="depositLink + masterZenodoCommunity.id " target="_blank" type="submit"
class=" zenodoButton uk-float-right uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-small-left">
<span><span>New upload</span><span uk-icon="arrow-right"></span></span>
</a>
</span>
@ -108,7 +110,8 @@
<!-- </a>-->
<!-- </div>-->
<span class="uk-width-expand uk-flex uk-flex-bottom uk-flex-right">
<a [href]="depositLink + item.id " target="_blank" type="submit" class="uk-float-right uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-small-left">
<a [href]="depositLink + item.id " target="_blank" type="submit"
class=" zenodoButton uk-float-right uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-small-left">
<span><span>New upload</span><span uk-icon="arrow-right"></span></span>
</a>
</span>
@ -122,3 +125,4 @@
</div>
<helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0" [texts]="pageContents['bottom']"></helper>
</div>
</div>

10
src/app/deposit/zenodo/shareInZenodo.component.ts
View File

@ -16,6 +16,7 @@ import {RouterHelper} from "../../openaireLibrary/utils/routerHelper.class";
import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service";
import {PiwikService} from "../../openaireLibrary/utils/piwik/piwik.service";
import {PiwikHelper} from "../../utils/piwikHelper";
import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
@Component({
selector: 'share-in-zenodo',
@ -50,7 +51,7 @@ export class ShareInZenodoComponent {
depositLink = "https://zenodo.org/deposit/new?c=";
depositLearnHowPage: string = null;
public routerHelper:RouterHelper = new RouterHelper();
breadcrumbs:Breadcrumb[] = [];
constructor(private route: ActivatedRoute,
private _router: Router,
private _meta: Meta,
@ -76,7 +77,6 @@ export class ShareInZenodoComponent {
this.updateDescription("Zenodo, repository, deposit, share");
this.properties = data.envSpecific;
this.route.queryParams.subscribe(params => {
this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain);
if (!this.communityId) {
@ -90,6 +90,8 @@ export class ShareInZenodoComponent {
}
this.depositLearnHowPage = this.properties.depositLearnHowPage;
this.breadcrumbs.push({name: 'home', route: '/'}, {name: "Deposit", route: this.depositLearnHowPage},{name:"Deposit in zenodo",route:null});
//this.getDivContents();
this.getPageContents();
if (this.communityId && this.communityId != '') {
@ -162,13 +164,13 @@ export class ShareInZenodoComponent {
}
private getPageContents() {
this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
this.helper.getPageHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {
this.pageContents = contents;
})
}
private getDivContents() {
this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {
this.helper.getDivHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {
this.divContents = contents;
})
}

5
src/app/deposit/zenodo/shareInZenodo.module.ts
View File

@ -16,12 +16,13 @@ import {HelperModule} from "../../openaireLibrary/utils/helper/helper.module";
import {PiwikServiceModule} from "../../openaireLibrary/utils/piwik/piwikService.module";
import {Schema2jsonldModule} from "../../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
import {SEOServiceModule} from "../../openaireLibrary/sharedComponents/SEO/SEOService.module";
import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
@NgModule({
imports: [
CommonModule,ShareInZenodoRoutingModule, ZenodoCommunitiesServiceModule, SearchZenodoCommunitiesServiceModule,
CommonModule, ShareInZenodoRoutingModule, ZenodoCommunitiesServiceModule, SearchZenodoCommunitiesServiceModule,
RouterModule, HelperModule,
PiwikServiceModule, Schema2jsonldModule, SEOServiceModule
PiwikServiceModule, Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule
],
declarations: [
ShareInZenodoComponent

5
src/assets/connect-custom.css
View File

@ -257,8 +257,9 @@ Impact Factor - ATHENA CODE */
#subscribeBtn > * > button, #inviteBtn > * > button {
border-right: none;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
/*border-top-right-radius: 0;*/
/*border-bottom-right-radius: 0;*/
border-radius: 4px 0px 0px 4px;
box-shadow: 0px 2px 6px #00000038;
/*background-color: var(--portal-main-color);*/
}

10
src/assets/customization.css
View File

@ -113,7 +113,7 @@ a:not(.uk-button):hover,
}
.uk-button:not(.uk-button-text) {
border-radius: 4px;
/*border-radius: 4px;*/
}
/*.uk-button:not(.uk-button-text):not(.uk-button-default):not(.uk-button-primary),
@ -135,16 +135,18 @@ a:not(.uk-button):hover,
.communityPanelBackground .uk-button:not(.ignoreCommunityPanelBackground) {
background-color: #ffffff !important;
color: #4C9CD5 !important;
/*color: #4C9CD5 !important;*/
color: black !important;
border-color: #ffffff !important;
border-style: solid !important;
border-width: 1px !important;
border-radius: 4px !important;
/*border-radius: 4px !important;*/
}
.communityPanelBackground .uk-button:not(.ignoreCommunityPanelBackground):hover {
background-color: #eeeeee !important;
color: #4C9CD5 !important;
/*color: #4C9CD5 !important;*/
color: black !important;
border-color: #eeeeee !important;
}