fixing a few bug, asset updates, tweaks (#532)

* fixing a few bug, asset updates, tweaks

* dont save until save button clicked

src/app/settings/options.component.html

@@ -26,7 +26,7 @@
         </div>
         <div class="form-check mt-2 form-check-block">
             <input class="form-check-input" type="radio" name="vaultTimeoutAction" id="vaultTimeoutActionLogOut"
-                value="logOut" [(ngModel)]="vaultTimeoutAction">
+                value="logOut" [(ngModel)]="vaultTimeoutAction" (ngModelChange)="vaultTimeoutActionChanged($event)">
             <label class="form-check-label" for="vaultTimeoutActionLogOut">
                 {{'logOut' | i18n}}
                 <small>{{'vaultTimeoutActionLogOutDesc' | i18n}}</small>

src/app/settings/options.component.ts

@@ -70,15 +70,6 @@ export class OptionsComponent implements OnInit {
     }
 
     async submit() {
-        if (this.vaultTimeoutAction === 'logOut') {
-            const confirmed = await this.platformUtilsService.showDialog(
-                this.i18nService.t('vaultTimeoutLogOutConfirmation'),
-                this.i18nService.t('vaultTimeoutLogOutConfirmationTitle'),
-                this.i18nService.t('yes'), this.i18nService.t('cancel'), 'warning');
-            if (!confirmed) {
-                return;
-            }
-        }
         await this.vaultTimeoutService.setVaultTimeoutOptions(this.vaultTimeout != null ? this.vaultTimeout : null,
             this.vaultTimeoutAction);
         await this.storageService.save(ConstantsService.disableFaviconKey, this.disableIcons);
@@ -93,4 +84,18 @@ export class OptionsComponent implements OnInit {
             this.toasterService.popAsync('success', null, this.i18nService.t('optionsUpdated'));
         }
     }
+
+    async vaultTimeoutActionChanged(newValue: string) {
+        if (newValue === 'logOut') {
+            const confirmed = await this.platformUtilsService.showDialog(
+                this.i18nService.t('vaultTimeoutLogOutConfirmation'),
+                this.i18nService.t('vaultTimeoutLogOutConfirmationTitle'),
+                this.i18nService.t('yes'), this.i18nService.t('cancel'), 'warning');
+            if (!confirmed) {
+                this.vaultTimeoutAction = 'lock';
+                return;
+            }
+        }
+        this.vaultTimeoutAction = newValue;
+    }
 }

src/app/vault/add-edit.component.html

@@ -500,7 +500,7 @@
             <div class="modal-footer">
                 <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
                     <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-                    <span>{{(cipher.isDeleted ? 'restore' : 'save') | i18n}}</span>
+                    <span>{{(cipher?.isDeleted ? 'restore' : 'save') | i18n}}</span>
                 </button>
                 <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
                     {{'cancel' | i18n}}

src/app/vault/bulk-delete.component.html

@@ -10,7 +10,7 @@
                 </button>
             </div>
             <div class="modal-body">
-                {{permanent ? 'permanentlyDeleteSelectedItemsDesc' : 'deleteSelectedItemsDesc' | i18n: cipherIds.length}}
+                {{(permanent ? 'permanentlyDeleteSelectedItemsDesc' : 'deleteSelectedItemsDesc') | i18n: cipherIds.length}}
             </div>
             <div class="modal-footer">
                 <button appAutoFocus type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">

src/app/vault/bulk-restore.component.html

@@ -13,7 +13,7 @@
                 {{'restoreSelectedItemsDesc' | i18n: cipherIds.length}}
             </div>
             <div class="modal-footer">
-                <button appAutoFocus type="submit" class="btn btn-submit" [disabled]="form.loading">
+                <button appAutoFocus type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
                     <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
                     <span>{{'restore' | i18n}}</span>
                 </button>

src/app/vault/ciphers.component.html

@@ -12,7 +12,7 @@
                 <td (click)="checkCipher(c)" class="reduced-lh wrap">
                     <a href="#" appStopClick appStopProp (click)="selectCipher(c)"
                         title="{{'editItem' | i18n}}">{{c.name}}</a>
-                    <ng-container *ngIf="!organization && c.organizationId && !c.isDeleted">
+                    <ng-container *ngIf="!organization && c.organizationId">
                         <i class="fa fa-share-alt" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
                         <span class="sr-only">{{'shared' | i18n}}</span>
                     </ng-container>

src/images/icons/safari-pinned-tab.svg

@@ -1,26 +1,34 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.11, written by Peter Selinger 2001-2013
-</metadata>
-<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M824 4945 c-92 -16 -133 -30 -218 -71 -91 -45 -150 -90 -229 -173
--112 -119 -182 -263 -207 -427 -7 -47 -10 -598 -8 -1759 l3 -1690 22 -70 c32
--103 58 -160 108 -234 88 -132 222 -243 367 -300 157 -63 87 -61 1892 -61
-1797 0 1750 -1 1900 59 239 96 408 289 483 551 17 62 18 145 18 1790 0 1645
--1 1728 -18 1790 -44 155 -111 272 -214 372 -106 105 -218 170 -362 211 l-76
-22 -1695 2 c-1357 1 -1709 -1 -1766 -12z m3196 -617 c18 -13 41 -39 51 -58 18
--33 19 -79 19 -1000 -1 -866 -4 -1026 -25 -1131 -26 -136 -150 -397 -251 -534
--81 -109 -302 -330 -439 -441 -105 -85 -296 -216 -390 -270 -11 -6 -60 -34
--108 -62 -146 -86 -272 -142 -316 -142 -102 0 -530 247 -811 469 -143 112
--385 359 -462 471 -102 148 -175 300 -226 475 l-26 90 -4 1010 c-2 719 0 1021
-8 1048 7 25 24 47 52 67 l41 30 1427 0 1427 0 33 -22z"/>
-<path d="M2560 2540 l0 -1350 38 19 c231 118 489 307 683 500 181 180 265 309
-321 488 21 66 21 87 25 881 l4 812 -535 0 -536 0 0 -1350z"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{display:inline;}
+	.st2{fill:#FFFFFF;}
+</style>
+<g id="Layer_1" class="st0">
+	<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" class="st1">
+		<path d="M2560,2540V1190l38,19c231,118,489,307,683,500c181,180,265,309,321,488c21,66,21,87,25,881l4,812h-535h-536V2540z"/>
+	</g>
+</g>
+<g id="Layer_2">
+	<path d="M82.4,17.5c-9.2,1.6-13.3,3-21.8,7.1c-9.1,4.5-15,9-22.9,17.3C26.5,53.8,19.5,68.2,17,84.6c-0.7,4.7-1,59.8-0.8,175.9
+		l0.3,169l2.2,7c3.2,10.3,5.8,16,10.8,23.4c8.8,13.2,22.2,24.3,36.7,30c15.7,6.3,8.7,6.1,189.2,6.1c179.7,0,175,0.1,190-5.9
+		c23.9-9.6,40.8-28.9,48.3-55.1c1.7-6.2,1.8-14.5,1.8-179s-0.1-172.8-1.8-179c-4.4-15.5-11.1-27.2-21.4-37.2
+		c-10.6-10.5-21.8-17-36.2-21.1l-7.6-2.2L259,16.3C123.3,16.2,88.1,16.4,82.4,17.5z M82.4,17.5c-9.2,1.6-13.3,3-21.8,7.1
+		c-9.1,4.5-15,9-22.9,17.3C26.5,53.8,19.5,68.2,17,84.6c-0.7,4.7-1,59.8-0.8,175.9l0.3,169l2.2,7c3.2,10.3,5.8,16,10.8,23.4
+		c8.8,13.2,22.2,24.3,36.7,30c15.7,6.3,8.7,6.1,189.2,6.1c179.7,0,175,0.1,190-5.9c23.9-9.6,40.8-28.9,48.3-55.1
+		c1.7-6.2,1.8-14.5,1.8-179s-0.1-172.8-1.8-179c-4.4-15.5-11.1-27.2-21.4-37.2c-10.6-10.5-21.8-17-36.2-21.1l-7.6-2.2L259,16.3
+		C123.3,16.2,88.1,16.4,82.4,17.5z M402,79.2c1.8,1.3,4.1,3.9,5.1,5.8c1.8,3.3,1.9,7.9,1.9,100c-0.1,86.6-0.4,102.6-2.5,113.1
+		c-2.6,13.6-15,39.7-25.1,53.4c-8.1,10.9-30.2,33-43.9,44.1c-10.5,8.5-29.6,21.6-39,27c-1.1,0.6-6,3.4-10.8,6.2
+		c-14.6,8.6-27.2,14.2-31.6,14.2c-10.2,0-53-24.7-81.1-46.9c-14.3-11.2-38.5-35.9-46.2-47.1c-10.2-14.8-17.5-30-22.6-47.5l-2.6-9
+		l-0.4-101c-0.2-71.9,0-102.1,0.8-104.8c0.7-2.5,2.4-4.7,5.2-6.7l4.1-3H256h142.7L402,79.2z"/>
+	<path id="Identity" class="st2" d="M403.1,82.5c-3-3-6.6-4.6-10.7-4.6H118.4c-4.2,0-7.7,1.5-10.7,4.6c-3,3-4.6,6.5-4.6,10.7v182.7
+		c0,13.6,2.7,27.2,8,40.5c5.3,13.4,11.9,25.3,19.8,35.7c7.8,10.4,17.2,20.5,28.1,30.3c10.8,9.9,20.9,18,30.1,24.5
+		s18.8,12.6,28.8,18.4c10,5.8,17.1,9.7,21.3,11.8c4.2,2,7.6,3.7,10.1,4.7c1.9,1,4,1.5,6.2,1.5s4.3-0.5,6.2-1.5
+		c2.5-1.1,5.9-2.7,10.1-4.7c4.2-2,11.3-6,21.3-11.8c10-5.8,19.6-12,28.8-18.4c9.2-6.5,19.2-14.7,30.1-24.5
+		c10.8-9.9,20.2-19.9,28.1-30.3c7.8-10.4,14.4-22.3,19.7-35.7c5.3-13.4,8-26.9,8-40.5V93.2C407.6,89.1,406.1,85.6,403.1,82.5z
+		 M367.7,277.6c0,66.1-112.4,123.1-112.4,123.1V117.1h112.4C367.7,117.1,367.7,211.5,367.7,277.6z"/>
 </g>
 </svg>