Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-28 12:45:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #730 from bitwarden/Send

Browse Source 
Send Cleanup
This commit is contained in:
Addison Beck 2021-02-23 11:31:26 -05:00 committed by GitHub
commit 3406734eed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 7941664a59f90a1b510b13d37062b90210da3b3c Subproject commit 42348e2fdc6206157d68d8a9f496eaa70520ab01

10
src/app/send/add-edit.component.html
View File

@ -25,7 +25,7 @@
<div class="item" *ngFor="let o of typeOptions"> <div class="item" *ngFor="let o of typeOptions">
<input type="radio" class="radio" [(ngModel)]="send.type" name="Type_{{o.value}}" <input type="radio" class="radio" [(ngModel)]="send.type" name="Type_{{o.value}}"
id="type_{{o.value}}" [value]="o.value" (change)="typeChanged(o)" id="type_{{o.value}}" [value]="o.value" (change)="typeChanged(o)"
[checked]="send.type === o.value"> [checked]="send.type === o.value" [disabled]="disableSend">
<label class="unstyled" for="type_{{o.value}}"> <label class="unstyled" for="type_{{o.value}}">
{{o.name}} {{o.name}}
</label> </label>
@ -33,7 +33,7 @@
</div> </div>
<div *ngIf="send.type === sendType.File" class="box-content-row" appBowRow> <div *ngIf="send.type === sendType.File" class="box-content-row" appBowRow>
<label for="file">{{'file' | i18n}}</label> <label for="file">{{'file' | i18n}}</label>
<input type="file" id="file" class="form-control-file" name="file" required> <input type="file" id="file" class="form-control-file" name="file" required [disabled]="disableSend">
<div class="subtext">{{'sendFileDesc' | i18n}} {{'maxFileSize' | i18n}}</div> <div class="subtext">{{'sendFileDesc' | i18n}} {{'maxFileSize' | i18n}}</div>
</div> </div>
</ng-container> </ng-container>
@ -69,7 +69,7 @@
<div class="box-content"> <div class="box-content">
<div class="box-content-row" appBoxRow *ngIf="!editMode"> <div class="box-content-row" appBoxRow *ngIf="!editMode">
<label for="deletionDate">{{'deletionDate' | i18n}}</label> <label for="deletionDate">{{'deletionDate' | i18n}}</label>
<select id="deletionDate" name="DeletionDateSelect" [(ngModel)]="deletionDateSelect" required [readOnly]="disableSend"> <select id="deletionDate" name="DeletionDateSelect" [(ngModel)]="deletionDateSelect" required>
<option *ngFor="let o of deletionDateOptions" [ngValue]="o.value">{{o.name}} <option *ngFor="let o of deletionDateOptions" [ngValue]="o.value">{{o.name}}
</option> </option>
</select> </select>
@ -78,7 +78,7 @@
<div class="box-content-row" *ngIf="deletionDateSelect === 0 || editMode"> <div class="box-content-row" *ngIf="deletionDateSelect === 0 || editMode">
<label *ngIf="editMode" for="deletionDateCustom">{{'deletionDate' | i18n}}</label> <label *ngIf="editMode" for="deletionDateCustom">{{'deletionDate' | i18n}}</label>
<input id="deletionDateCustom" type="datetime-local" name="deletionDate" <input id="deletionDateCustom" type="datetime-local" name="deletionDate"
[(ngModel)]="deletionDate" required placeholder="MM/DD/YYYY HH:MM AM/PM" [readOnly]="disableSend"> [(ngModel)]="deletionDate" required placeholder="MM/DD/YYYY HH:MM AM/PM">
<div class="subtext">{{'deletionDateDesc' | i18n}}</div> <div class="subtext">{{'deletionDateDesc' | i18n}}</div>
</div> </div>
<div class="box-content-row" appBoxRow *ngIf="!editMode"> <div class="box-content-row" appBoxRow *ngIf="!editMode">
@ -159,7 +159,7 @@
</div> </div>
<div class="box-content-row box-content-row-checkbox" appBoxRow> <div class="box-content-row box-content-row-checkbox" appBoxRow>
<label for="copyLink">{{'copySendLinkOnSave' | i18n}}</label> <label for="copyLink">{{'copySendLinkOnSave' | i18n}}</label>
<input id="copyLink" name="copyLink" [(ngModel)]="copyLink" type="checkbox"> <input id="copyLink" name="copyLink" [(ngModel)]="copyLink" type="checkbox" [disabled]="disableSend">
</div> </div>
</div> </div>
</div> </div>

3
src/locales/en/messages.json
View File

@ -1635,5 +1635,8 @@
"sendDisabledWarning": { "sendDisabledWarning": {
"message": "Due to an enterprise policy, you are only able to delete an existing Send.", "message": "Due to an enterprise policy, you are only able to delete an existing Send.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"copyLink": {
"message": "Copy link"
} }
} }