Revision 58574
Added by Konstantina Galouni almost 4 years ago
| app.component.ts | ||
|---|---|---|
| 35 | 35 |
<router-outlet></router-outlet> |
| 36 | 36 |
</main> |
| 37 | 37 |
</div> |
| 38 |
<subscribe id="subscribeBtn" *ngIf="isClient && properties && communityId != null && communityId != ''" |
|
| 39 |
[communityId]="communityId" [properties]="properties"></subscribe> |
|
| 40 |
<!-- && managerOfCommunities --> |
|
| 41 |
<invite id="inviteBtn" *ngIf="isClient && properties && communityId != null && communityId != '' && managerOfCommunities" |
|
| 42 |
[longView]=false [buttonSizeSmall]=false [properties]="properties"></invite> |
|
| 43 |
|
|
| 38 |
<div id="subscribeAndInviteBtn" *ngIf="isClient && properties && communityId"> |
|
| 39 |
<subscribe [communityId]="communityId" [properties]="properties"></subscribe> |
|
| 40 |
<invite *ngIf="managerOfCommunities" [longView]=false [buttonSizeSmall]=false [properties]="properties"></invite> |
|
| 41 |
</div> |
|
| 44 | 42 |
<!--feedback *ngIf= "isClient && properties" portalName="Connect" [feedbackQuestionaire]=properties.feedbackQuestionaire></feedback--> |
| 45 | 43 |
<cookie-law *ngIf="isClient" position="bottom"> |
| 46 | 44 |
OpenAIRE uses cookies in order to function properly.<br> |
| ... | ... | |
| 201 | 199 |
new MenuItem("", "Sources and methology", "", "/content", false, [], ["/content"], this.properties.environment != "development" ? {} : {communityId: community.communityId}),
|
| 202 | 200 |
new MenuItem("", "Projects and funding Opportunities", "", "/projects", false, [], ["/projects"], this.properties.environment != "development" ? {} : {communityId: community.communityId}),
|
| 203 | 201 |
new MenuItem("", "National Bulletins", "", "/national-bulletins", false, [], ["/national-bulletins"], this.properties.environment != "development" ? {} : {communityId: community.communityId}),
|
| 204 |
//new MenuItem("", "Subjects", "", "/subjects", false, [], ["/subjects"], this.properties.environment != "development" ? {} : {communityId: community.communityId}),
|
|
| 202 |
new MenuItem("", "Subjects", "", "/subjects", false, [], ["/subjects"], this.properties.environment != "development" ? {} : {communityId: community.communityId}),
|
|
| 205 | 203 |
] |
| 206 | 204 |
}); |
| 207 | 205 |
if (isCommunityManager) {
|
Also available in: Unified diff
[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).