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

add avatar in the communities | change home image| colors in menu | add extra checks in searchEntries - results |in community get back columns for now 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@51859 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2018-04-21 16:24:07 +00:00
parent eb6712b0b5
commit 77117d08eb
9 changed files with 41 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/app/communities/communities.component.html
View File

@ -1,33 +1,33 @@
<div class="image-front-topbar uk-section-default uk-light" tm-header-transparent="light" tm-header-transparent-placeholder="">
<div
class="mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-top-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: 20">
<div class="uk-width-1-1">
<div class="uk-position-relative">
<div class="uk-container uk-margin-medium">
<div class="tm-header-placeholder uk-margin-medium" style="height: 84px;"></div>
<div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
<div class="uk-width-1-1@m uk-first-column">
<div data-id="page#4">
<p class="uk-text-large uk-text-center">Welcome to Research Community Dashboard! </p>
<p class="uk-text-large uk-text-center">Use a trusted partner to share, link, disseminate and monitor your research. </p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="image-front-topbar uk-section-muted uk-section-overlap uk-light" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-slide-top&quot;,&quot;delay&quot;:false}" tm-header-transparent="light" tm-header-transparent-placeholder="">
<div style=" background-color: #1e3040;" class=" mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-top-center uk-background-fixed uk-section uk-section-large uk-padding-remove-bottom">
<div class="tm-header-placeholder uk-margin-remove-adjacent" style="height: 84px;"></div>
<div class="uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid uk-grid-stack" uk-grid="">
<div class="uk-width-1-1@m uk-first-column">
<h5 class="uk-margin-large uk-text-center uk-h1 uk-scrollspy-inview uk-animation-slide-top" uk-scrollspy-class="" style="">
Research Community Dashboard
</h5>
<h1 class="uk-text-center uk-h2 uk-scrollspy-inview uk-animation-slide-top" uk-scrollspy-class="" style="">
Your view to open science
</h1>
</div>
</div>
</div>
</div>
<div *ngIf= "communitiesResults != null && communitiesResults.length > 0">
<div class="uk-container uk-margin-top uk-margin-bottom">
<div class="uk-child-width-1-3@m uk-text-center uk-grid-match " uk-grid >
<div *ngFor="let item of communitiesResults; let i = index">
<div class="uk-card uk-card-default uk-margin-bottom">
<span *ngIf= "item.logoUrl != null">
<span >
<div class="uk-card-media-top">
<img src="{{item.logoUrl}}" alt="{{(item.title)?item.title:item.shortTitle}} logo" class="uk-height-small uk-responsive-height ">
<img *ngIf= "item.logoUrl != null && item.logoUrl != '' " src="{{item.logoUrl}}" alt="{{(item.title)?item.title:item.shortTitle}} logo" class="uk-height-small uk-responsive-height ">
<span *ngIf= "item.logoUrl == null || item.logoUrl == '' " class="uk-icon uk-margin-top">
<svg width="50" height="50" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="2.5"> <circle fill="none" stroke="#000" stroke-width="1.1" cx="7.7" cy="8.6" r="3.5"></circle> <path fill="none" stroke="#000" stroke-width="1.1" d="M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3"></path> <path fill="none" stroke="#000" stroke-width="1.1" d="M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1"></path></svg>
</span>
</div>
</span>
<div class="uk-card-body">

33
src/app/community/community.component.html
View File

@ -103,47 +103,30 @@
</div>
</div>
<!--<div class="uk-grid-small uk-margin-medium uk-grid" uk-grid="">
<h2 class="uk-h3 uk-heading-line uk-text-primary">
Most recent research results
</h2>
</div>
<ul uk-tab class="uk-width-1-2 uk-width-1-2@m uk-width-1-2@l uk-width-1-2@xl">
<li class="uk-active"><a href="#">publications</a></li>
<li><a href="#">research data</a></li>
<li><a href="#">software</a></li>
</ul>
<ul class="uk-switcher uk-margin uk-width-1-2 uk-width-1-2@m uk-width-1-2@l uk-width-1-2@xl">
<li><results-comp [(results)]=publicationResults [(total)]=publicationTotal resultType="publication" [community]=community [params]=params></results-comp></li>
<li><results-comp [(results)]=researchDataResults [(total)]=researchDataTotal resultType="dataset" [community]=community [params]=params></results-comp></li>
<li><results-comp [(results)]=softwareResults [(total)]=softwareTotal resultType="software" [community]=community [params]=params></results-comp></li>
</ul>-->
<!-- <div *ngIf="communityId != null && communityId != ''" class="uk-grid-small uk-margin-medium uk-grid" uk-grid="">
<div class="uk-width-expand@m">
<div *ngIf="communityId != null && communityId != ''" class="uk-grid-small uk-margin-medium uk-grid" uk-grid="">
<div *ngIf="IsEntityEnabled('publication')" class="uk-width-expand@m">
<h2 class="uk-h3 uk-heading-line uk-text-primary">
<span>Most recent publications</span>
</h2>
<results-comp [(results)]=publicationResults [(total)]=publicationTotal resultType="publication" [community]=community [params]=params></results-comp>
</div>
<div class="uk-width-expand@m">
<div *ngIf="IsEntityEnabled('dataset')" class="uk-width-expand@m">
<h2 class="uk-h3 uk-heading-line uk-text-primary">
<span>Most recent research data</span>
</h2>
<results-comp [(results)]=researchDataResults [(total)]=researchDataTotal resultType="dataset" [community]=community [params]=params></results-comp>
</div>
<!--<div class="uk-width-expand@m">
<div *ngIf="IsEntityEnabled('software')" class="uk-width-expand@m">
<h2 class="uk-h3 uk-heading-line uk-text-primary">
<span>Most recent software</span>
</h2>
<results-comp [(results)]=softwareResults [(total)]=softwareTotal resultType="software" [community]=community [params]=params></results-comp>
</div>
</div> -->
</div>
<div>
<!--div>
<div class="uk-margin-large-top">
<h2 class="uk-h3 uk-text-primary">
Most recent research results
@ -161,7 +144,7 @@
<li *ngIf="IsEntityEnabled('dataset')"><results-comp [(results)]=researchDataResults [(total)]=researchDataTotal resultType="dataset" [community]=community [params]=params></results-comp></li>
<li *ngIf="IsEntityEnabled('software')"><results-comp [(results)]=softwareResults [(total)]=softwareTotal resultType="software" [community]=community [params]=params></results-comp></li>
</ul>
</div>
</div-->
<statistics-for-dashboard [currentMode]="'showInDashboard'"></statistics-for-dashboard>

4
src/app/searchEntries/results/results.component.ts
View File

@ -24,7 +24,7 @@ import { CommunityInfo } from '../../openaireLibrary/connect/community/community
{{item.title}} </a>
</div>
</h6>
<div class="el-content"><span class=" uk-label label-{{item.accessRights}}">{{item.accessRights}}</span><br></div>
<div *ngIf="item.accessRights" class="el-content"><span class=" uk-label label-{{item.accessRights}}">{{item.accessRights}}</span><br></div>
<div >
<span *ngIf="item.authors != null">
<span class="el-meta uk-margin uk-text-meta" *ngFor='let author of item.authors; let i = index'>
@ -34,7 +34,7 @@ import { CommunityInfo } from '../../openaireLibrary/connect/community/community
<span *ngIf="i == 10">...</span>
</span>
</span>
<span class="el-meta uk-text-meta"> ({{item.year}}) </span>
<span *ngIf="item.year !=''" class="el-meta uk-text-meta"> ({{item.year}}) </span>
</div>
<div class="text-justify descriptionText"> {{item.description}} </div>
</div>

2
src/app/searchEntries/searchEntries.service.ts
View File

@ -45,7 +45,7 @@ export class SearchEntriesService {
result['id'] = Array.isArray(data) ? data[i]['result']['header']['dri:objIdentifier'] : data['result']['header']['dri:objIdentifier'];
if(resData['bestaccessright'].hasOwnProperty("classid")) {
if(resData['bestaccessright'] && resData['bestaccessright'].hasOwnProperty("classid")) {
result['accessRights'] = resData['bestaccessright'].classid;
}

2
src/app/statistics/statistics.component.ts
View File

@ -74,7 +74,7 @@ export class StatisticsComponent {
private sanitizer: DomSanitizer) {
var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
var title = "OpenAIRE";
var title = "Monitor";
this._title.setTitle(title);
this._meta.updateTag({content:description},"name='description'");

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

@ -1,6 +1,6 @@
.tm-toolbar .uk-subnav-line .custom-connect-li {
display: block;
background:#DEAF50 !important; color:#fff !important;
background:#2C57D7 !important; color:#fff !important;
}
.custom-connect-toolbar ul.uk-subnav.uk-subnav-line{
@ -24,3 +24,5 @@
color:#5b5b5b !important;
box-shadow:0 6px 50px rgba(0,0,0,0.05)
}

2
src/assets/discover-custom.css
View File

@ -328,7 +328,7 @@ color: #414141}
border-bottom: none !important;
}
.mainPageSearchForm{
background-image: url("./explore_1.jpg"); background-color: rgb(255, 255, 255); box-sizing: border-box; min-height: calc(100vh - 412.767px);
background-image: url("./home.jpg"); background-color: rgb(255, 255, 255); box-sizing: border-box; min-height: calc(100vh - 412.767px);
}
.searchForm, .generalSearchForm{

2
src/assets/env-properties.json
View File

@ -56,7 +56,7 @@
"cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
"adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools",
"adminToolsAPIURL" :"http://scoobydoo.di.uoa.gr:8080/uoa-admin-tools",
"adminToolsCommunity" :"openaire",

6
src/index.html
View File

@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<base href="/" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="description" content="OpenAIRE, Connect,Community Dashboard, communities, open access, research, projects "/>
<!--meta name="description" content="OpenAIRE, Connect,Community Dashboard, communities, open access, research, projects "/>
<meta property="og:description" content="OpenAIRE, Connect,Community Dashboard, communities, open access, research, projects"/>
@ -15,7 +15,7 @@
<meta property="og:type" content="website"/>
<meta property="og:url" content="https://beta.connect.openaire.eu"/>
<meta property="og:site_name" content="OpenAIRE"/>
<meta property="og:site_name" content="OpenAIRE"/-->
<meta property="og:image" content="assets/common/Symbol.png"/>
<meta property="og:image:secure_url" content="assets/common/Symbol.png" />
@ -42,7 +42,7 @@
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff">
<title>OpenAIRE Connect</title>
<!--title>OpenAIRE Connect</title-->
<script>
window.onerror = function (errorMsg, url, lineNumber, column, errorObj) {
// console.log(errorMsg + " __" + url + " __" + lineNumber + " __" + column + " __" + errorObj);