Project

General

Profile

« Previous | Next » 

Revision 60916

Added by Argiro Kokogiannaki about 3 years ago

[Library|Trunk]

- display claims:
rename property title to pageTitle > avoid confusion with HTML tooltip
add tooltip for claim status
 Search research results service - add check for year in most recent results
- Bottom component: update newsletter url
- Customization: initialize the colors with ligher versions for light background and form

View differences:

modules/uoa-services-library/trunk/ng-openaire-library/src/app/services/searchResearchResults.service.ts
144 144 
    url += "?format=json";
145 145 
    url += "&fq=" + params;
146 146 
    url += "&sortBy=resultdateofacceptance,descending";
147 
    url += "&fq=" + encodeURIComponent( "resultacceptanceyear <= " + (new Date()).getFullYear());
147 148 
    url += "&page=" + (page - 1) + "&size=" + size;
148 149
149 150 
    return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
modules/uoa-services-library/trunk/ng-openaire-library/src/app/connect/community/CustomizationOptions.ts
42 42 
        color: this.identity.mainColor,
43 43 
      },
44 44 
      light : {
45 
        color: CustomizationOptions.getRGBA(this.identity.mainColor,0.1),
45 
        color: CustomizationOptions.getRGBA(this.identity.mainColor,0.05),
46 46 
      },
47 47 
      form : {
48 
        color: CustomizationOptions.getRGBA(this.identity.mainColor,0.2),
48 
        color: CustomizationOptions.getRGBA(this.identity.mainColor,0.15),
49 49 
      }
50 50 
    };
51 51 

  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/connect/connectHelper.ts
    
  





  4
  4
  
    
export class ConnectHelper {


  		




  5
  5
  
    

  		




  6
  6
  
    
  public static  getCommunityFromDomain(domain: string): string{


  		




  7
  
  
    
    domain = "beta.covid-19.openaire.eu"; //for testing


  		




  
  7
  
    
    if(properties.environment == "development") {


  		




  
  8
  
    
      domain = "beta.enermaps.openaire.eu"; //for testing


  		




  
  9
  
    
    }


  		




  8
  10
  
    
    domain = domain.indexOf("//") != -1? domain.split("//")[1]:domain; //remove https:// prefix


  		




  9
  11
  
    
    if (domain.indexOf('openaire.eu') === -1) {


  		




  10
  12
  
    
      return null;


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/claims/claimsAdmin/claimsAdmin.component.ts
    
  





  24
  24
  
    
                             [fetchId]="(fetchId=='openaire')?null:fetchId"


  		




  25
  25
  
    
                             [communityId]="(fetchBy && fetchBy == 'Context' && fetchId && fetchId!='openaire')?fetchId:null"


  		




  26
  26
  
    
                             [externalPortalUrl]=externalPortalUrl [claimsInfoURL]=claimsInfoURL


  		




  27
  
  
    
                             title="Manage links"></displayClaims>


  		




  
  27
  
    
                             pageTitle="Manage links"></displayClaims>


  		




  28
  28
  
    
            </div>


  		




  29
  29
  
    
          </div>


  		




  30
  30
  
    
        </div>


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/claims/claim-utils/displayClaims/displayClaims.component.html
    
  





  1
  
  
    
<schema2jsonld *ngIf="url" [URL]="url" [name]="title" type="other"></schema2jsonld>


  		




  
  1
  
    
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>


  		




  2
  2
  
    
<div class="uk-width-1-1">


  		




  3
  3
  
    

  		




  4
  4
  
    
</div>


  		




  ......




  107
  107
  
    
                          [externalPortalUrl]=externalPortalUrl [source]="true"></claim-entity>


  		




  108
  108
  
    
            </div>


  		




  109
  109
  
    
            <div class="uk-margin-small-bottom">


  		




  110
  
  
    
              <span *ngIf="isClaimAvailable(claim) else notAvailable" class="uk-label uk-label-success">available</span>


  		




  111
  
  
    
              <ng-template #notAvailable><span class="uk-label uk-label-danger">pending</span></ng-template>


  		




  
  110
  
    
              <span *ngIf="isClaimAvailable(claim) else notAvailable" class="uk-label uk-label-success"


  		




  
  111
  
    
                    [attr.uk-tooltip]="'title:<div class=\'uk-margin uk-padding-small\'>The link information is available in the portal and the APIs.</div>'"


  		




  
  112
  
    
              >available


  		




  
  113
  
    
              </span>


  		




  
  114
  
    
              <ng-template #notAvailable><span class="uk-label uk-label-danger"


  		




  
  115
  
    
               [attr.uk-tooltip]="'title:<div class=\'uk-margin uk-padding-small\'>The link information  will be added in the portal and the APIs in the next content provision workflow.</div>'"


  		




  
  116
  
    
              >pending</span></ng-template>


  		




  112
  117
  
    
            </div>


  		




  113
  118
  
    

  		




  114
  119
  
    
            <div  class="uk-margin-small-bottom"><span *ngIf="showUserEmail" class="uk-margin-right"><span class="title">Claimed by:</span>


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/claims/claim-utils/displayClaims/displayClaims.component.ts
    
  





  30
  30
  
    
})


  		




  31
  31
  
    
export class DisplayClaimsComponent {


  		




  32
  32
  
    
  @Input() piwikSiteId = null;


  		




  33
  
  
    
  @Input() title: string = "";


  		




  
  33
  
    
  @Input() pageTitle: string = "";


  		




  34
  34
  
    
  properties: EnvProperties;


  		




  35
  35
  
    
  public searchTermStream = new Subject<string>();


  		




  36
  36
  
    
  subscriptions: any = [];


  		




  ......




  113
  113
  
    
      this.sortOptions.push( {label:"User (asc) ", value:{ sort: "user",descending:false }})


  		




  114
  114
  
    
    }


  		




  115
  115
  
    
    var description = "Openaire, linking, claim, publication, research data, software, other research product, project, community";


  		




  116
  
  
    
    this.updateTitle(this.title);


  		




  
  116
  
    
    this.updateTitle(this.pageTitle);


  		




  117
  117
  
    
    this.updateDescription(description);


  		




  118
  118
  
    
    this.updateUrl(this.url);


  		




  119
  119
  
    
    if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {


  		




  120
  
  
    
      this.subscriptions.push(this._piwikService.trackView(this.properties, this.title, this.piwikSiteId).subscribe());


  		




  
  120
  
    
      this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe());


  		




  121
  121
  
    
    }


  		




  122
  122
  
    

  		




  123
  123
  
    
    this.subscriptions.push(this.helper.getPageHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/claims/myClaims/myClaims.component.ts
    
  





  23
  23
  
    
            <div>


  		




  24
  24
  
    
              <displayClaims *ngIf="user" [user]="user" [enableDelete]=true [myClaims]=true [isAdmin]=false [showUserEmail]=false


  		




  25
  25
  
    
                              [claimsInfoURL]=claimsInfoURL [communityId]=communityId


  		




  26
  
  
    
                              [piwikSiteId]="piwikSiteId" title="My links">


  		




  
  26
  
    
                              [piwikSiteId]="piwikSiteId" pageTitle="My links">


  		




  27
  27
  
    
              </displayClaims>


  		




  28
  28
  
    
            </div>


  		




  29
  29
  
    
          </div>


  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/sharedComponents/bottom.component.html
    
  





  150
  150
  
    
                <li><a target="_blank" href="https://www.openaire.eu/news/">News</a></li>


  		




  151
  151
  
    
                <li><a target="_blank" href="https://www.openaire.eu/events">Events</a></li>


  		




  152
  152
  
    
                <li><a target="_blank" href="https://www.openaire.eu/blogs/magazine">Blogs</a></li>


  		




  153
  
  
    
                <li><a target="_blank" href="https://www.openaire.eu/newsletter/listing">Newsletters</a></li>


  		




  
  153
  
    
                <li><a target="_blank" href="https://www.openaire.eu/newsletter">Newsletters</a></li>


  		




  154
  154
  
    
                <li><a target="_blank" href="https://www.openaire.eu/documents">Documents</a></li>


  		




  155
  155
  
    
              </ul>


  		




  156
  156
  
    
            </div>


  		




  ......




  207
  207
  
    
              </a>


  		




  208
  208
  
    
            </div>


  		




  209
  209
  
    
            <div>


  		




  210
  
  
    
              <a target="_blank" href="https://www.openaire.eu/newsletter/listing" class="el-link newsletter">


  		




  
  210
  
    
              <a target="_blank" href="https://www.openaire.eu/newsletter" class="el-link newsletter">


  		




  211
  211
  
    
                 <span class="el-title uk-margin uk-text-large">


  		




  212
  212
  
    
                   Newsletter


  		




  213
  213
  
    
                   <span class="el-image uk-icon">


  		












Also available in:  Unified diff