Project

General

Profile

« Previous | Next » 

Revision 58574

[Trunk | Connect]:
1. app-routing.module.ts: Add route '/subjects'.
2. app.component.ts: Group subscribe and invite buttons under id="subscribeAndInviteBtn" (keep distance between them alwayes the same) | uncomment menu item 'Subjects' in About.
3. app.module.ts: import 'SubscribeService' (singleton service to update everywhere subscriber status).
4. libUser.module.ts & subscribe.module.ts: remove import of 'SubscribeService' (singleton service to update everywhere subscriber status).
5. community.component.html:
a. Improve some checks
b. In main tabs of the page (class main-tabs) add class 'uk-text-truncate' and remove class 'uk-width-3-4' (each tab has max-width)
c. Add icon in 'Analytics' tab
d. [Bug fix] In description, fix overflow and max height of box
6. community.component.ts: Add field '@ViewChild(SubscribeComponent) subscribeComponent: SubscribeComponent' to add some checks in html.
7. curators.component.html: Remove div with class 'image-front-topbar' | Update css for title | Add <breadcrumbs> | Add user icon for each curator.
8. curators.component.ts: Initialize breadcrumb | [Bug fix] In methods 'getPageContents()' and 'getDivContents()' use communityId (instead of 'connect').
9. curators.module.ts & organizationsPage.module.ts & inviteBasic.module.ts: import 'BreadcrumbsModule'.
10. organizationsPage.component.ts: Update css for title | Add <breadcrumbs> | Initialize breadcrumb.
11. subjects.component.ts, subjects.module.ts, subjects-routing.module.ts: Add page for Subjects.
12. invite.component.html: Add <breadcrumbs> in longView | Add icon in button 'Invite users'.
13. invite.component.ts: Initialize breadcrumb.
14. subscribe.component.ts:
a. Add icon in button "Subscribe"/ "Subscribed"
b. Add class 'uk-display-inline-block' in showNumbers (members)
c. Initialize and get subscriber status with new methods of service (initIsSubscribedToCommunity() & isSubscribed - BehaviorSubject instead of isSubscribedToCommunity())
15. connect-custom.css: Group css for #subscribeBtn, #inviteBtn into #subscribeAndInviteBtn | Add css for class 'user-circle-background' (background of user icon in curators).

View differences:

curators.component.html
1 1
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>
2 2

  
3 3
<ng-container *ngIf="longView else shortView">
4
  <div class="image-front-topbar  uk-section-default uk-position-relative"
5
       uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}"
6
       tm-header-transparent="light">
7
    <div style=" min-height: 650px;" class="uk-section uk-padding-remove-bottom uk-flex uk-flex-middle">
4
<!--  <div class="image-front-topbar  uk-section-default uk-position-relative"-->
5
<!--       uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}"-->
6
<!--       tm-header-transparent="light">-->
7
<!--    uk-flex uk-flex-middle-->
8
    <div style=" min-height: 650px;" class="communityBackground uk-section uk-padding-remove-top uk-padding-remove-bottom ">
8 9
      <div class="uk-align-center">
9
        <div class="uk-section">
10
          <div class="uk-container">
11
            <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
12
                    [texts]="pageContents['top']"></helper>
10
          <breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
11

  
12
          <div class="uk-container uk-container-large">
13 13
            <div *ngIf="showLoading" class="uk-margin-large">
14 14
              <div class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><span
15 15
                class="loading-gif  uk-align-center"></span></div>
16 16
            </div>
17
            <div *ngIf="!showLoading && curators.length > 0">
18
              <h4 class="uk-margin-top uk-h4">
19
                <span class="uk-text-bold">Curators</span>
17
<!--            && curators.length > 0-->
18
            <div *ngIf="!showLoading">
19
              <div class="uk-margin-medium-top uk-h2">
20
                <span class="">Curators</span>
20 21
                <span> ({{curators.length}})</span>
21
              </h4>
22
              </div>
23
              <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
24
                      [texts]="pageContents['top']"></helper>
22 25
              <div *ngFor="let curator of curators let i=index;"
23 26
                   class="uk-width-1-1 uk-card uk-card-default uk-card-body uk-margin-top uk-animation-slide-top">
24 27
                <div
......
83 86
            <helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0"
84 87
                    [texts]="pageContents['bottom']"></helper>
85 88
          </div>
86
        </div>
87 89
      </div>
88 90
    </div>
89
  </div>
91
<!--  </div>-->
90 92
</ng-container>
91 93
<ng-template #shortView>
92 94
  <div class="uk-grid">
......
101 103
<!--        <img *ngIf="!curator.photo || curator.photo == ''" class="uk-border-circle curator-photo"-->
102 104
<!--             src="../../assets/common-assets/curator-default.png" alt="Curator Photo">-->
103 105
<!--      </span>-->
104
        <a>{{curator.name}}</a>
106

  
107
        <a>
108
          <span class="user-circle-background">
109
            <svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
110
              <path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path>
111
              <path d="M0 0h24v24H0z" fill="none"></path>
112
            </svg>
113
          </span>
114
          {{curator.name}}
115
        </a>
105 116
        <span class="default-dropdown uk-margin-remove-top uk-padding-medium uk-width-medium"
106 117
             uk-dropdown="pos: bottom-left; mode:click; ">
107 118
          <span class="uk-grid uk-grid-stack">

Also available in: Unified diff