Project

General

Profile

« Previous | Next » 

Revision 56058

[Trunk | Connect]:
1. curators.component: Rename 'Show all details' to 'View more details' | pass to affiliations component 'affiliationsInSlider' the number of affiliations if <=2.
2. affiliations.component: Rename 'Show all details' to 'View more details' | Add number of affiliations next to title 'Related Organizations' |
Align organizations in center according to their length | Align 'View more details' link to be on the under and on the right side of the last organization

View differences:

modules/uoa-connect-portal/trunk/src/app/curators/curators.component.html
33 33
                      <div class="uk-width-expand uk-margin-left uk-text-meta uk-flex-first">
34 34
                        Affiliations
35 35
                      </div>
36
                      <affiliations [fullView]="false" [affiliations]="curator.affiliations" [affiliationsInSlider]="2"></affiliations>
36
                      <affiliations [fullView]="false" [affiliations]="curator.affiliations" [affiliationsInSlider]="curator.affiliations.length"></affiliations>
37 37
                    </div>
38 38
                  </div>
39 39

  
......
73 73
   <span class="lowOpacityColor  uk-width-1-1">
74 74
      Curators
75 75
    </span>
76
  <div class="uk-margin-small-top uk-grid">
77
    <div *ngFor="let curator of curators let i=index;" class="uk-flex uk-flex-middle uk-width-1-2">
76
  <div class="uk-grid">
77
    <div *ngFor="let curator of curators let i=index;" class="uk-flex uk-flex-middle uk-width-1-2 uk-margin-small-top">
78 78
      <div>
79 79
        <img *ngIf="curator.photo && curator.photo !== ''" class="uk-border-circle curator-photo" src="{{downloadUrl + curator.photo}}" alt="Curator Photo">
80 80
        <img *ngIf="!curator.photo || curator.photo == ''" class="uk-border-circle curator-photo" src="../../assets/common-assets/curator-default.png" alt="Curator Photo">
......
108 108
            </div>
109 109
            <div class="uk-width-1-1">
110 110
              <a routerLink="/curators" class="uk-align-right uk-link ignoreCommunityPanelBackground">
111
                Show all details
111
                View more details
112 112
              </a>
113 113
            </div>
114 114
          </div>
modules/uoa-connect-portal/trunk/src/app/affiliations/affiliations.component.html
35 35
  </div>
36 36

  
37 37
  <div *ngIf="communityFirstPage" class="uk-margin-large-top uk-margin uk-text-center uk-text-large uk-text-meta uk-text-bold">
38
    Related Organizations
38
    Related Organizations ({{affiliations.length}})
39 39
  </div>
40
  <div *ngIf="!fullView" class="uk-position-relative uk-visible-toggle" tabindex="-1" [attr.uk-slider]="sliderOptions">
40
  <div *ngIf="!fullView" [class]="'uk-position-relative uk-visible-toggle uk-align-center uk-width-'+(affiliations.length >= affiliationsInSlider ? affiliationsInSlider : affiliations.length)+'-'+affiliationsInSlider" tabindex="-1" [attr.uk-slider]="sliderOptions">
41 41
    <ul class="uk-slider-items uk-grid-small" uk-height-match="target: > li > .uk-card" uk-grid>
42
      <!-- uk-align-center uk-margin-remove-top uk-margin-remove-bottom  -->
43 42
      <li *ngFor="let affiliation of affiliations"
44
          [class]="'uk-width-1-'+affiliationsInSlider">
43
          [class]="'uk-width-1-'+(affiliations.length >= affiliationsInSlider ? affiliationsInSlider : affiliations.length)">
45 44
        <div class="uk-card uk-card-small uk-card-default uk-flex uk-flex-middle uk-flex-center"
46 45
             [attr.uk-tooltip]="(affiliation.name) ? affiliation.name : 'cls: uk-invisible'">
47 46
          <a *ngIf="affiliation.website_url" target="_blank" [href]="affiliation.website_url" class="affiliation-content">
......
58 57
    <a *ngIf="(affiliations.length > affiliationsInSlider) && arrows"
59 58
        class="uk-position-center-right uk-position-small uk-hidden-hover" href="#" uk-slidenav-next uk-slider-item="next"></a>
60 59
  </div>
61
  <div class="uk-width-1-1">
60
  <div *ngIf="communityFirstPage" [class]="'uk-align-center uk-width-'+(affiliations.length >= affiliationsInSlider ? affiliationsInSlider : affiliations.length)+'-'+affiliationsInSlider">
62 61
    <a routerLink="/organizations" class="uk-align-right uk-link">
63
      Show all details
62
      View more details
64 63
    </a>
65 64
  </div>
66 65
</ng-container>

Also available in: Unified diff