-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
83 changed files
with
2,525 additions
and
1,131 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| @import 'themes/overrides/descriptions-overrides.less'; | ||
|
|
||
| .alert-container { | ||
| position: absolute; | ||
| z-index: 100; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 37 additions & 90 deletions
127
client/src/app/components/organizations/organization-card/organization-card.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,91 +1,38 @@ | ||
| <nz-card | ||
| *ngIf="inCard; else noCard" | ||
| [nzTitle]="organization.name"> | ||
| <ng-template [ngTemplateOutlet]="content"> </ng-template> | ||
| <nz-card nz-size="small"> | ||
| <nz-card-meta | ||
| [nzTitle]="organization.name" | ||
| [nzDescription]="organizationTag" | ||
| [nzAvatar]="organizationAvatar"> | ||
| </nz-card-meta> | ||
| <ng-template #organizationAvatar> | ||
| <cvc-organization-avatar | ||
| [organization]="organization" | ||
| shape="square" | ||
| [size]="48"></cvc-organization-avatar> | ||
| </ng-template> | ||
| <ng-template #organizationTag> | ||
| <cvc-organization-tag | ||
| [org]="organization" | ||
| [enablePopover]="true"> | ||
| </cvc-organization-tag> | ||
| </ng-template> | ||
| <div class="organization-card-content"> | ||
| <nz-descriptions | ||
| nzBordered | ||
| nzSize="small" | ||
| [nzColumn]="2" | ||
| nzLayout="vertical"> | ||
| <nz-descriptions-item | ||
| nzTitle="Description" | ||
| [nzSpan]="1"> | ||
| <p | ||
| nz-typography | ||
| nzEllipsis | ||
| [nzEllipsisRows]="4" | ||
| [nzExpandable]="true"> | ||
| {{ organization.description }} | ||
| </p> | ||
| </nz-descriptions-item> | ||
| </nz-descriptions> | ||
| </div> | ||
| </nz-card> | ||
|
|
||
| <ng-template #noCard> | ||
| <ng-template [ngTemplateOutlet]="content"> </ng-template> | ||
| </ng-template> | ||
|
|
||
| <ng-template #content> | ||
| <nz-row [nzGutter]="16"> | ||
| <nz-col [nzSpan]="3"> | ||
| <div class="org-avatar"> | ||
| <cvc-organization-avatar | ||
| [organization]="organization" | ||
| [size]="128"></cvc-organization-avatar> | ||
| </div> | ||
| <div class="org-name"> | ||
| <span nz-typography> | ||
| <strong>{{ organization.name }}</strong> | ||
| </span> | ||
| </div> | ||
| </nz-col> | ||
| <nz-col [nzSpan]="13"> | ||
| <nz-card | ||
| nzTitle="Profile" | ||
| class="organization-profile" | ||
| nzSize="small" | ||
| [nzExtra]="orgLink"> | ||
| <ng-template #orgLink> | ||
| <cvc-link-tag [href]="organization.url"> | ||
| View Organization Website | ||
| </cvc-link-tag> | ||
| </ng-template> | ||
| <nz-descriptions | ||
| nzBordered | ||
| nzLayout="vertical" | ||
| nzSize="small" | ||
| [nzColumn]="1"> | ||
| <nz-descriptions-item | ||
| nzTitle="Description" | ||
| [nzSpan]="1"> | ||
| {{ organization.description }} | ||
| </nz-descriptions-item> | ||
| <nz-descriptions-item | ||
| nzTitle="Child Organizations" | ||
| [nzSpan]="1"> | ||
| <cvc-tag-list *ngIf="organization.subGroups.length > 0"> | ||
| <ng-container *ngFor="let suborg of organization.subGroups"> | ||
| <cvc-organization-tag [org]="suborg"></cvc-organization-tag> | ||
| </ng-container> | ||
| </cvc-tag-list> | ||
| <ng-container *ngIf="organization.subGroups.length === 0"> | ||
| <span | ||
| nz-typography | ||
| nzType="secondary"> | ||
| <i>No child organizations specified.</i> | ||
| </span> | ||
| </ng-container> | ||
| </nz-descriptions-item> | ||
| </nz-descriptions> | ||
| </nz-card> | ||
| </nz-col> | ||
|
|
||
| <nz-col [nzSpan]="8"> | ||
| <nz-card | ||
| nzSize="small" | ||
| nzTitle="Curation Stats" | ||
| [nzExtra]="subGroupToggle"> | ||
| <cvc-stats-card | ||
| [stats]=" | ||
| includeSubStats | ||
| ? organization.orgAndSuborgsStatsHash | ||
| : organization.orgStatsHash | ||
| " | ||
| header="User Statistics"></cvc-stats-card> | ||
| </nz-card> | ||
| <ng-template #subGroupToggle> | ||
| <ng-container *ngIf="organization.subGroups.length > 0"> | ||
| <label | ||
| nz-checkbox | ||
| [(ngModel)]="includeSubStats" | ||
| class="stats-toggle"> | ||
| Include sub-orgs | ||
| </label> | ||
| </ng-container> | ||
| </ng-template> | ||
| </nz-col> | ||
| </nz-row> | ||
| </ng-template> |
35 changes: 10 additions & 25 deletions
35
client/src/app/components/organizations/organization-card/organization-card.component.less
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,14 @@ | ||
| :host ::ng-deep { | ||
| .organization-profile { | ||
| .ant-card-body { | ||
| // remove card body padding | ||
| padding: 0; | ||
| // card title has a -1 bottom margin for some reason, partially occluding nz-description's top border | ||
| margin-top: 1px; | ||
| ::host { | ||
| display: block; | ||
| .ant-card-meta { | ||
| ::ng-deep .ant-card-meta-title { | ||
| line-height: 14px; | ||
| margin-bottom: 8px; | ||
| } | ||
| } | ||
| .ant-descriptions-view { | ||
| // removes nz-description container border - | ||
| // nz-card does provide an nzBordered option, but its label backgrounds | ||
| // and compact mode are only applied when its borders are toggled on | ||
| border: none; | ||
| } | ||
| .stats-toggle { | ||
| span { | ||
| padding-right: 0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .org-avatar, | ||
| .org-name { | ||
| text-align: center; | ||
| } | ||
| .org-name { | ||
| font-size: 120%; | ||
| .organization-card-content { | ||
| // provide some margin between avatar & name, | ||
| // and remove padding from card content area | ||
| margin: 12px -13px -13px -13px; | ||
| } |
17 changes: 8 additions & 9 deletions
17
client/src/app/components/organizations/organization-card/organization-card.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.