From 44af1ccc450e44d1150bc615d5562ad01a28bbca Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 21 Feb 2019 16:53:57 -0500 Subject: [PATCH] format html files --- jslib | 2 +- src/popup/accounts/hint.component.html | 2 +- src/popup/accounts/lock.component.html | 13 +- src/popup/accounts/login.component.html | 13 +- src/popup/accounts/register.component.html | 23 ++-- .../two-factor-options.component.html | 3 +- src/popup/accounts/two-factor.component.html | 7 +- .../components/action-buttons.component.html | 18 +-- .../components/ciphers-list.component.html | 4 +- .../password-generator-history.component.html | 4 +- .../password-generator.component.html | 8 +- src/popup/settings/export.component.html | 9 +- .../settings/folder-add-edit.component.html | 7 +- src/popup/settings/folders.component.html | 2 +- src/popup/settings/options.component.html | 12 +- src/popup/settings/premium.component.html | 2 +- src/popup/settings/settings.component.html | 50 +++---- src/popup/settings/sync.component.html | 4 +- src/popup/vault/add-edit.component.html | 122 +++++++++--------- src/popup/vault/attachments.component.html | 4 +- src/popup/vault/ciphers.component.html | 19 ++- src/popup/vault/current-tab.component.html | 12 +- src/popup/vault/groupings.component.html | 36 +++--- .../vault/password-history.component.html | 2 +- src/popup/vault/share.component.html | 4 +- src/popup/vault/view.component.html | 55 ++++---- 26 files changed, 205 insertions(+), 232 deletions(-) diff --git a/jslib b/jslib index 43872f82ccd..2b931963cd8 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 43872f82ccd7453926c75240ecde196151e89ce9 +Subproject commit 2b931963cd8dbebdcbdd6a418ac3ef72adb73539 diff --git a/src/popup/accounts/hint.component.html b/src/popup/accounts/hint.component.html index f437a8418f2..a9693b745e5 100644 --- a/src/popup/accounts/hint.component.html +++ b/src/popup/accounts/hint.component.html @@ -19,7 +19,7 @@
+ inputmode="email" appInputVerbatim="false">
diff --git a/src/popup/accounts/lock.component.html b/src/popup/accounts/lock.component.html index 5ea4b872114..d2f96fed1d6 100644 --- a/src/popup/accounts/lock.component.html +++ b/src/popup/accounts/lock.component.html @@ -14,19 +14,18 @@
- +
+ class="monospaced" [(ngModel)]="masterPassword" required appInputVerbatim>
- - + +
diff --git a/src/popup/accounts/login.component.html b/src/popup/accounts/login.component.html index 84b852bb56d..66e5651ceeb 100644 --- a/src/popup/accounts/login.component.html +++ b/src/popup/accounts/login.component.html @@ -18,20 +18,19 @@
- +
+ class="monospaced" [(ngModel)]="masterPassword" required appInputVerbatim>
- - + +
diff --git a/src/popup/accounts/register.component.html b/src/popup/accounts/register.component.html index 3ac1b637cf9..ed98c66f180 100644 --- a/src/popup/accounts/register.component.html +++ b/src/popup/accounts/register.component.html @@ -19,7 +19,7 @@
+ [appAutofocus]="email === ''" inputmode="email" appInputVerbatim="false">
@@ -27,17 +27,17 @@ + name="MasterPassword" class="monospaced" [(ngModel)]="masterPassword" required + [appAutofocus]="email !== ''" appInputVerbatim (input)="updatePasswordStrength()">
- + @@ -60,14 +60,13 @@
+ name="MasterPasswordRetype" class="monospaced" [(ngModel)]="confirmMasterPassword" required + appInputVerbatim>
- - + +
diff --git a/src/popup/accounts/two-factor-options.component.html b/src/popup/accounts/two-factor-options.component.html index d2bbd3112a3..f9405d4837c 100644 --- a/src/popup/accounts/two-factor-options.component.html +++ b/src/popup/accounts/two-factor-options.component.html @@ -10,8 +10,7 @@
- + {{p.name}} {{p.description}} diff --git a/src/popup/accounts/two-factor.component.html b/src/popup/accounts/two-factor.component.html index 0ea74424e53..7dddc95b126 100644 --- a/src/popup/accounts/two-factor.component.html +++ b/src/popup/accounts/two-factor.component.html @@ -7,8 +7,7 @@ {{title}}
- diff --git a/src/popup/settings/settings.component.html b/src/popup/settings/settings.component.html index e67f812295c..a3ef6f06247 100644 --- a/src/popup/settings/settings.component.html +++ b/src/popup/settings/settings.component.html @@ -27,7 +27,7 @@
@@ -35,13 +35,13 @@
- +
{{'lockNow' | i18n}}
 - +
{{'twoStepLogin' | i18n}}
 @@ -57,18 +57,18 @@
- +
{{'changeMasterPassword' | i18n}}
 - +
{{'fingerprintPhrase' | i18n}}
 - +
{{'logOut' | i18n}}
 @@ -77,23 +77,23 @@
{{'tools' | i18n}}
- +
{{'importItems' | i18n}}
 - +
{{'exportVault' | i18n}}
 - +
{{'shareVault' | i18n}}
 - +
{{'bitWebVault' | i18n}}
 @@ -106,18 +106,18 @@
{{'options' | i18n}}
- +
{{'about' | i18n}}
 - +
{{'helpFeedback' | i18n}}
 - +
{{'rateExtension' | i18n}}
 diff --git a/src/popup/settings/sync.component.html b/src/popup/settings/sync.component.html index bfb69e8a598..25815c1daa1 100644 --- a/src/popup/settings/sync.component.html +++ b/src/popup/settings/sync.component.html @@ -12,8 +12,8 @@
- diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html index 52ebd21827f..69a1415a266 100644 --- a/src/popup/vault/add-edit.component.html +++ b/src/popup/vault/add-edit.component.html @@ -33,30 +33,29 @@
- +
- +
- + + [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"> - +
@@ -64,7 +63,7 @@
+ [(ngModel)]="cipher.login.totp" appInputVerbatim>
@@ -72,12 +71,12 @@
+ [(ngModel)]="cipher.card.cardholderName">
+ appInputVerbatim>
@@ -94,20 +93,19 @@
+ placeholder="{{'ex' | i18n}} 2019">
- +
- + + [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}">
@@ -123,47 +121,46 @@
+ [(ngModel)]="cipher.identity.firstName">
+ [(ngModel)]="cipher.identity.middleName">
+ [(ngModel)]="cipher.identity.lastName">
+ [(ngModel)]="cipher.identity.username" appInputVerbatim>
- +
+ appInputVerbatim>
+ [(ngModel)]="cipher.identity.passportNumber" appInputVerbatim>
+ [(ngModel)]="cipher.identity.licenseNumber" appInputVerbatim>
+ appInputVerbatim>
@@ -172,17 +169,17 @@
+ [(ngModel)]="cipher.identity.address1">
+ [(ngModel)]="cipher.identity.address2">
+ [(ngModel)]="cipher.identity.address3">
@@ -195,12 +192,11 @@
+ [(ngModel)]="cipher.identity.postalCode">
- +
@@ -209,34 +205,33 @@
+ *ngFor="let u of cipher.login.uris; let i = index; trackBy:trackByFunction">
+ placeholder="{{'ex' | i18n}} https://google.com" inputmode="url" appInputVerbatim>
- +
+ class="box-content-row box-content-row-newmulti"> {{'newUri' | i18n}}
@@ -254,12 +249,12 @@
+ (click)="attachments()" *ngIf="editMode && showAttachments">
{{'attachments' | i18n}}
 + (click)="editCollections()" *ngIf="editMode && cipher.organizationId">
{{'collections' | i18n}}
 @@ -282,8 +277,8 @@
+ *ngFor="let f of cipher.fields; let i = index; trackBy:trackByFunction" + [ngClass]="{'box-content-row-checkbox': f.type === fieldType.Boolean}"> @@ -291,21 +286,20 @@
+ class="row-label" placeholder="{{'name' | i18n}}" appInputVerbatim> + *ngIf="f.type === fieldType.Text" placeholder="{{'value' | i18n}}" appInputVerbatim> + name="Field.Value{{i}}" [(ngModel)]="f.value" class="monospaced" appInputVerbatim + *ngIf="f.type === fieldType.Hidden" placeholder="{{'value' | i18n}}">
- +
- + + [ngClass]="{'fa-eye': !f.showValue, 'fa-eye-slash': f.showValue}">
@@ -343,8 +337,8 @@ {{'noCollectionsInList' | i18n}}
-
+
@@ -362,8 +356,8 @@ {{'shareItem' | i18n}}
- +
diff --git a/src/popup/vault/attachments.component.html b/src/popup/vault/attachments.component.html index 9fa06dea737..692c0c31893 100644 --- a/src/popup/vault/attachments.component.html +++ b/src/popup/vault/attachments.component.html @@ -26,8 +26,8 @@ {{a.sizeName}}
diff --git a/src/popup/vault/ciphers.component.html b/src/popup/vault/ciphers.component.html index af903b2e206..b8a3dab6bbf 100644 --- a/src/popup/vault/ciphers.component.html +++ b/src/popup/vault/ciphers.component.html @@ -7,7 +7,7 @@
+ [(ngModel)]="searchText" (input)="search(200)" appAutofocus>
@@ -23,8 +23,8 @@ {{'folders' | i18n}}
- +
- +
{{c.node.name}} @@ -62,17 +62,16 @@
-
+
{{groupingTitle}} {{isSearching() ? filteredCiphers.length : ciphers.length}}
+ (onSelected)="selectCipher($event)" (onDoubleSelected)="launchCipher($event)">
diff --git a/src/popup/vault/current-tab.component.html b/src/popup/vault/current-tab.component.html index eab4a7fa0c8..dff39e0e723 100644 --- a/src/popup/vault/current-tab.component.html +++ b/src/popup/vault/current-tab.component.html @@ -6,8 +6,8 @@
- +
@@ -28,8 +28,8 @@
+ (onSelected)="fillCipher($event)" (onView)="viewCipher($event)" *ngIf="loginCiphers.length"> +

{{'autoFillInfo' | i18n}}

+ (onSelected)="fillCipher($event)" (onView)="viewCipher($event)">
@@ -55,7 +55,7 @@
+ (onSelected)="fillCipher($event)" (onView)="viewCipher($event)">
diff --git a/src/popup/vault/groupings.component.html b/src/popup/vault/groupings.component.html index 3dac4713309..ca2c269f7e7 100644 --- a/src/popup/vault/groupings.component.html +++ b/src/popup/vault/groupings.component.html @@ -3,8 +3,8 @@
- +
@@ -30,8 +30,7 @@
+ (onSelected)="selectCipher($event)" (onDoubleSelected)="launchCipher($event)">
@@ -40,8 +39,7 @@ 4
- +
{{'typeLogin' | i18n}} @@ -49,8 +47,7 @@ {{typeCounts.get(cipherType.Login) || 0}} - +
{{'typeCard' | i18n}} @@ -58,8 +55,7 @@ {{typeCounts.get(cipherType.Card) || 0}} - +
{{'typeIdentity' | i18n}} @@ -68,7 +64,7 @@ + (click)="selectType(cipherType.SecureNote)">
{{'typeSecureNote' | i18n}} @@ -84,12 +80,12 @@ {{folderCount}}
- +
+ [ngClass]="{'fa-folder-open': f.node.id, 'fa-folder-open-o': !f.node.id}">
{{f.node.name}}
@@ -104,8 +100,8 @@ {{nestedCollections.length}}
- +
{{c.node.name}} @@ -122,8 +118,7 @@
+ (onSelected)="selectCipher($event)" (onDoubleSelected)="launchCipher($event)">
@@ -133,9 +128,8 @@
- +
diff --git a/src/popup/vault/password-history.component.html b/src/popup/vault/password-history.component.html index 0ff4422bd05..39d2154e0d2 100644 --- a/src/popup/vault/password-history.component.html +++ b/src/popup/vault/password-history.component.html @@ -21,7 +21,7 @@
+ (click)="copy(h.password)">
diff --git a/src/popup/vault/share.component.html b/src/popup/vault/share.component.html index bde4b00920b..00e7a77d110 100644 --- a/src/popup/vault/share.component.html +++ b/src/popup/vault/share.component.html @@ -40,8 +40,8 @@ {{'noCollectionsInList' | i18n}}
-
+
diff --git a/src/popup/vault/view.component.html b/src/popup/vault/view.component.html index 806125b52a3..5c4babfc02d 100644 --- a/src/popup/vault/view.component.html +++ b/src/popup/vault/view.component.html @@ -28,7 +28,7 @@
+ (click)="copy(cipher.login.username, 'username', 'Username')">
@@ -43,24 +43,23 @@
- + (click)="togglePassword()"> + + (click)="copy(cipher.login.password, 'password', 'Password')">
+ *ngIf="cipher.login.totp && totpCode">
{{'verificationCodeTotp' | i18n}} {{totpCodeFormatted}} @@ -70,14 +69,14 @@ + [ngStyle]="{'stroke-dashoffset.px': totpDash}">
+ (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')">
@@ -96,7 +95,7 @@
+ (click)="copy(cipher.card.number, 'number', 'Number')">
@@ -117,12 +116,11 @@
- + (click)="toggleCardCode()"> + + (click)="copy(cipher.card.code, 'securityCode', 'Security Code')">
@@ -163,7 +161,7 @@ {{cipher.identity.phone}}
+ *ngIf="cipher.identity.address1 || cipher.identity.city || cipher.identity.country"> {{'address' | i18n}}
{{cipher.identity.address1}}
{{cipher.identity.address2}}
@@ -187,12 +185,12 @@ {{u.hostnameOrUri}}
- + + (click)="copy(u.uri, u.isWebsite ? 'website' : 'uri', 'URI')">
@@ -229,13 +227,13 @@
+ *ngIf="field.type === fieldType.Hidden" (click)="toggleFieldValue(field)"> + [ngClass]="{'fa-eye': !field.showValue, 'fa-eye-slash': field.showValue}"> + *ngIf="field.value && field.type !== fieldType.Boolean" + (click)="copy(field.value, 'value', 'Field')">
@@ -247,9 +245,8 @@ {{'attachments' | i18n}}
- + {{attachment.fileName}} {{attachment.sizeName}} @@ -268,9 +265,9 @@ {{cipher.passwordRevisionDisplayDate | date:'medium'}}