1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-14 15:23:33 +00:00

Redefine cipher "share" to "move to organization" (#961)

* Redefine cipher "share" to "move to organization"

* Update jslib

* PR review
This commit is contained in:
Matt Gibson
2021-06-21 20:26:37 -04:00
committed by GitHub
parent 9c4ea9b491
commit 56a1cfe277
5 changed files with 24 additions and 14 deletions

2
jslib

Submodule jslib updated: 1f83c3c1ba...f568c87289

View File

@@ -374,9 +374,9 @@
{{'cancel' | i18n}}
</button>
<div class="right">
<button appBlurClick type="button" (click)="share()" appA11yTitle="{{'shareItem' | i18n}}"
<button appBlurClick type="button" (click)="share()" appA11yTitle="{{'moveToOrganization' | i18n}}"
*ngIf="editMode && cipher && !cipher.organizationId && !cloneMode">
<i class="fa fa-share-alt fa-lg fa-fw" aria-hidden="true"></i>
<i class="fa fa-arrow-circle-o-right fa-lg fa-fw" aria-hidden="true"></i>
</button>
<button #deleteBtn appBlurClick type="button" (click)="delete()" class="danger"
appA11yTitle="{{'delete' | i18n}}" *ngIf="editMode && !cloneMode" [disabled]="deleteBtn.loading"

View File

@@ -18,7 +18,7 @@
<span class="text">
{{c.name}}
<ng-container *ngIf="c.organizationId">
<i class="fa fa-share-alt text-muted" title="{{'shared' | i18n}}" aria-hidden="true"></i>
<i class="fa fa-cube text-muted" title="{{'shared' | i18n}}" aria-hidden="true"></i>
<span class="sr-only">{{'shared' | i18n}}</span>
</ng-container>
<ng-container *ngIf="c.hasAttachments">

View File

@@ -1,10 +1,10 @@
<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="shareTitle">
<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="moveToOrgTitle">
<div class="modal-dialog" role="document">
<form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
<div class="modal-body">
<div class="box">
<div class="box-header" id="shareTitle">
{{'share' | i18n}}
<div class="box-header" id="moveToOrgTitle">
{{'moveToOrganization' | i18n}}
</div>
<div class="box-content" *ngIf="!organizations || !organizations.length">
<div class="box-content-row">
@@ -21,7 +21,7 @@
</div>
</div>
<div class="box-footer">
{{'shareDesc' | i18n}}
{{'moveToOrgDesc' | i18n}}
</div>
</div>
<div class="box" *ngIf="organizations && organizations.length">

View File

@@ -44,14 +44,24 @@
"share": {
"message": "Share"
},
"shareItem": {
"message": "Share Item"
"moveToOrganization": {
"message": "Move to Organization"
},
"sharedItem": {
"message": "Shared Item"
"movedItemToOrg": {
"message": "$ITEMNAME$ moved to $ORGNAME$",
"placeholders": {
"itemname": {
"content": "$1",
"example": "Secret Item"
},
"orgname": {
"content": "$2",
"example": "Company Name"
}
}
},
"shareDesc": {
"message": "Choose an organization that you wish to share this item with. Sharing transfers ownership of the item to the organization. You will no longer be the direct owner of this item once it has been shared."
"moveToOrgDesc": {
"message": "Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved."
},
"attachments": {
"message": "Attachments"