Project

General

Profile

« Previous | Next » 

Revision 58549

[Trunk | Connect]: Connect redesing
1. app.component.ts: <subscribe> and <invite> components added (floating buttons on the right side of each page for communities).
2. community.component.html:
3. community.component.ts:
a. 'projectsCalculated' and 'contentProvidersCalculated' fields added, to calculate tootlip after both requests complete
b. added methods for building tootips
c. 'activeTab' set to 'summary'.
4. affiliations.component.html: minor phrasing changes (e.g. title).
5. curators.component.html: shortview changed.
6. results.component.ts: Title changed | 'View all' moved to the bottom.
7. customization.component.ts: Changed '--portal-main-color' from '#4C9CD5' to '#4687E6' | Changed '--portal-dark-color' from '#24857F' to '#2D72D6'.
8. invite.component.html: shortview changed.
9. invite.component.ts: 'properties' field as input (get it is called from app.component).
10. invite.module.ts & inviteBasic.module.ts: InviteBasicModule created to declare InviteComponent without routing and login guard | InviteModule imports InviteBasicModule and adds routing and login guar$
11. subscribe.component.ts: Changes for subscribe button and members | 'properties' field as input (get it is called from app.component).
12. connect-custom.css: css for subscribe and invite buttons and for tooltip with 'community-page-tooltip' class.
13. customization.css: class 'communityBackground' added and css for 'subtitle' class inside 'communityBackground'.

View differences:

results.component.ts
5 5

  
6 6
@Component({
7 7
    selector: 'results-comp',
8
    template: `        
9
     <div class="uk-h5 uk-text-bold  uk-margin-top uk-margin-remove-bottom">Recent research results</div>
8
    template: `      
9
    <div class="tab-header">Recent {{getEntityName(resultType, true, true)}}</div>
10 10
    <div *ngIf="!results && total != 0">
11 11
        <div *ngIf="showLoading" class="uk-animation-fade uk-width-1-1" role="alert"><span class="loading-gif uk-align-center"></span></div>
12 12
    </div>
13
    <div *ngIf="results != null && results.length > 0">
14
        <div class="uk-text-right">
15
            <div>
16
                <a class="el-content uk-button uk-button-text" [queryParams]="{type:getresultTypeLink(resultType, true), qf:false}" routerLinkActive="router-link-active" [routerLink]="properties.searchLinkToResults">
17
                View all
18
                </a>
19
            </div>
20
        </div>
21
    </div>
22 13
    <div *ngIf="results != null && results.length > 0 && !showLoading">
23 14
      <!--<div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid uk-grid-stack" uk-grid="">
24 15
        <li *ngFor="let item of results; let i = index">
......
52 43
                        [type]="resultType"  [properties] = properties class="communityRecentResults" [showImpactFactors]="(community.communityId == 'elixir-gr')" >
53 44
        </search-result>
54 45
    </div>
46
     <div *ngIf="results != null && results.length > 0">
47
       <div class="uk-text-right">
48
         <div>
49
           <a class="el-content uk-link portal-link uk-text-capitalize" [queryParams]="{type:getresultTypeLink(resultType, true), qf:false}" routerLinkActive="router-link-active" [routerLink]="properties.searchLinkToResults">
50
             View all {{getEntityName(resultType, true, true)}} >
51
           </a>
52
         </div>
53
       </div>
54
     </div>
55 55

  
56 56
    <div *ngIf="results != null && results.length == 0 || total == 0" class=" uk-alert uk-alert-primary"> No results available </div>
57 57

  
......
75 75
        }
76 76
        return type;
77 77
    }
78

  
79
  public getEntityName(entityType: string, plural: boolean, full: boolean): string {
80
    if (entityType == "publication") {
81
      return "publication" + (plural ? "s" : "");
82
    } else if (entityType == "dataset") {
83
      return (full ? "research data" : ("dataset" + (plural ? "s" : "")));
84
    } else if (entityType == "software") {
85
      return "software";
86
    } else if (entityType == "other") {
87
      return (full ? ("other research product" + (plural ? "s" : "")) : "other");
88
    } else if (entityType == "result") {
89
      return (full ? ("research outcome" + (plural ? "s" : "")) : "result");
90
    }
91
  }
78 92
 /*   getParamId(type:string){
79 93
        let param ="";
80 94
        if(type == "publication"){

Also available in: Unified diff