Merge pull request #735 from bitwarden/SendBadges

Send badges
This commit is contained in:
Addison Beck 2021-02-25 16:57:03 -05:00 committed by GitHub
commit b8de7d2619
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 74 additions and 6 deletions

View File

@ -43,14 +43,40 @@
[infiniteScrollContainer]="'#items .content'" [fromRoot]="true" (scrolled)="loadMore()"> [infiniteScrollContainer]="'#items .content'" [fromRoot]="true" (scrolled)="loadMore()">
<a *ngFor="let s of filteredSends" appStopClick (click)="selectSend(s.id)" <a *ngFor="let s of filteredSends" appStopClick (click)="selectSend(s.id)"
href="#" title="{{'viewItem' | i18n}}" (contextmenu)="viewSendMenu(s)" href="#" title="{{'viewItem' | i18n}}" (contextmenu)="viewSendMenu(s)"
[ngClass]="{'active': s.id === sendId}"> [ngClass]="{'active': s.id === sendId}" class="flex-list-item">
<div class="icon" aria-hidden="true"> <div class="item-icon" aria-hidden="true">
<i class="fa fa-fw fa-lg" [ngClass]="s.type == 0 ? 'fa-file-o' : 'fa-file-text-o'"></i> <i class="fa fa-fw fa-lg" [ngClass]="s.type == 0 ? 'fa-file-o' : 'fa-file-text-o'"></i>
</div> </div>
<span class="text"> <div class="item-content">
{{s.name}} <div class="item-title">
</span> {{s.name}}
<span class="detail">{{s.deletionDate | date}}</span> <span class="title-badges">
<ng-container *ngIf="s.disabled">
<i class="fa fa-warning" appStopProp title="{{'disabled' | i18n}}" aria-hidden="true"></i>
<span class="sr-only">{{'disabled' | i18n}}</span>
</ng-container>
<ng-container *ngIf="s.password">
<i class="fa fa-key" appStopProp title="{{'password' | i18n}}" aria-hidden="true"></i>
<span class="sr-only">{{'password' | i18n}}</span>
</ng-container>
<ng-container *ngIf="s.maxAccessCountReached">
<i class="fa fa-ban" appStopProp title="{{'maxAccessCountReached' | i18n}}"
aria-hidden="true"></i>
<span class="sr-only">{{'maxAccessCountReached' | i18n}}</span>
</ng-container>
<ng-container *ngIf="s.expired">
<i class="fa fa-clock-o" appStopProp title="{{'expired' | i18n}}" aria-hidden="true"></i>
<span class="sr-only">{{'expired' | i18n}}</span>
</ng-container>
<ng-container *ngIf="s.pendingDelete">
<i class="fa fa-trash" appStopProp title="{{'pendingDeletion' | i18n}}"
aria-hidden="true"></i>
<span class="sr-only">{{'pendingDeletion' | i18n}}</span>
</ng-container>
</span>
</div>
<span class="item-details">{{s.deletionDate | date}}</span>
</div>
</a> </a>
</div> </div>
<div class="no-items" *ngIf="!filteredSends.length"> <div class="no-items" *ngIf="!filteredSends.length">

View File

@ -1638,5 +1638,17 @@
}, },
"copyLink": { "copyLink": {
"message": "Copy link" "message": "Copy link"
},
"disabled": {
"message": "Disabled"
},
"maxAccessCountReached": {
"message": "Max access count reached"
},
"expired": {
"message": "Expired"
},
"pendingDeletion": {
"message": "Pending deletion"
} }
} }

View File

@ -101,3 +101,33 @@
} }
} }
} }
.list > a.flex-list-item {
display: flex;
align-items: center;
.item-icon {
margin-left: -5px;
margin-right: 4px;
@include themify($themes) {
color: themed('mutedColor');
}
}
.item-content {
.item-title {
.title-badges {
@include themify($themes) {
color: themed('mutedColor');
}
}
}
.item-details {
font-size: $font-size-small;
@include themify($themes) {
color: themed('mutedColor');
}
}
}
}