From a1592e45457d0791b82b8a9ff3cce7d7ca1c1855 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 21 Feb 2019 16:53:32 -0500 Subject: [PATCH] format html files --- jslib | 2 +- src/app/accounts/login.component.html | 9 +- src/app/accounts/premium.component.html | 2 +- src/app/accounts/register.component.html | 22 ++-- src/app/accounts/settings.component.html | 16 +-- .../two-factor-options.component.html | 2 +- src/app/accounts/two-factor.component.html | 7 +- src/app/vault/add-edit.component.html | 108 +++++++++--------- src/app/vault/attachments.component.html | 4 +- src/app/vault/ciphers.component.html | 17 ++- src/app/vault/collections.component.html | 2 +- src/app/vault/folder-add-edit.component.html | 6 +- src/app/vault/groupings.component.html | 27 ++--- .../password-generator-history.component.html | 4 +- .../vault/password-generator.component.html | 31 +++-- src/app/vault/password-history.component.html | 2 +- src/app/vault/share.component.html | 8 +- src/app/vault/vault.component.html | 51 +++------ src/app/vault/view.component.html | 50 ++++---- 19 files changed, 169 insertions(+), 201 deletions(-) diff --git a/jslib b/jslib index a19a30ffed..2b931963cd 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit a19a30ffed177e18d6e64801066510bc983a3e8d +Subproject commit 2b931963cd8dbebdcbdd6a418ac3ef72adb73539 diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html index daff1d93c9..6f6cd02886 100644 --- a/src/app/accounts/login.component.html +++ b/src/app/accounts/login.component.html @@ -12,13 +12,12 @@
+ class="monospaced" [(ngModel)]="masterPassword" required>
- - + +
diff --git a/src/app/accounts/premium.component.html b/src/app/accounts/premium.component.html index 8bb72df658..9ec4c65ea2 100644 --- a/src/app/accounts/premium.component.html +++ b/src/app/accounts/premium.component.html @@ -57,7 +57,7 @@
diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html index c7fc6c4cbf..d45abf44e0 100644 --- a/src/app/accounts/register.component.html +++ b/src/app/accounts/register.component.html @@ -6,7 +6,7 @@
+ [appAutofocus]="email === ''">
@@ -14,17 +14,17 @@ + name="MasterPassword" class="monospaced" [(ngModel)]="masterPassword" required + [appAutofocus]="email !== ''" (input)="updatePasswordStrength()">
- + @@ -47,14 +47,12 @@
+ name="MasterPasswordRetype" class="monospaced" [(ngModel)]="confirmMasterPassword" required>
- - + +
diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html index 89bfd86bc9..9ec4ab2f16 100644 --- a/src/app/accounts/settings.component.html +++ b/src/app/accounts/settings.component.html @@ -10,7 +10,7 @@
{{'lockOptionsDesc' | i18n}} @@ -34,7 +34,7 @@
@@ -43,8 +43,8 @@
@@ -54,7 +54,7 @@
@@ -64,7 +64,7 @@
@@ -73,8 +73,8 @@
diff --git a/src/app/accounts/two-factor-options.component.html b/src/app/accounts/two-factor-options.component.html index 740365d1ea..2127870c70 100644 --- a/src/app/accounts/two-factor-options.component.html +++ b/src/app/accounts/two-factor-options.component.html @@ -8,7 +8,7 @@
+ (click)="choose(p)"> {{p.name}} {{p.description}} diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html index 8bfe9fbf92..ef5db97727 100644 --- a/src/app/accounts/two-factor.component.html +++ b/src/app/accounts/two-factor.component.html @@ -6,7 +6,7 @@ {{'enterVerificationCodeEmail' | i18n : twoFactorEmail}}

+ *ngIf="selectedProviderType === providerType.Email || selectedProviderType === providerType.Authenticator">
@@ -55,8 +55,7 @@
- + title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()"> + [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"> + title="{{'generatePassword' | i18n}}" (click)="generatePassword()">
@@ -51,7 +51,7 @@
+ [(ngModel)]="cipher.login.totp">
@@ -59,7 +59,7 @@
+ [(ngModel)]="cipher.card.cardholderName">
@@ -80,20 +80,19 @@
+ placeholder="{{'ex' | i18n}} 2019">
- +
+ title="{{'toggleVisibility' | i18n}}" (click)="toggleCardCode()"> + [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}">
@@ -109,27 +108,27 @@
+ [(ngModel)]="cipher.identity.firstName">
+ [(ngModel)]="cipher.identity.middleName">
+ [(ngModel)]="cipher.identity.lastName">
+ [(ngModel)]="cipher.identity.username">
+ [(ngModel)]="cipher.identity.company">
@@ -138,12 +137,12 @@
+ [(ngModel)]="cipher.identity.passportNumber">
+ [(ngModel)]="cipher.identity.licenseNumber">
@@ -156,17 +155,17 @@
+ [(ngModel)]="cipher.identity.address1">
+ [(ngModel)]="cipher.identity.address2">
+ [(ngModel)]="cipher.identity.address3">
@@ -179,12 +178,12 @@
+ [(ngModel)]="cipher.identity.postalCode">
+ [(ngModel)]="cipher.identity.country">
@@ -193,26 +192,26 @@
+ *ngFor="let u of cipher.login.uris; let i = index; trackBy:trackByFunction">
+ placeholder="{{'ex' | i18n}} https://google.com">
- +
@@ -236,12 +235,12 @@
+ (click)="attachments()" *ngIf="editMode">
{{'attachments' | i18n}}
 + (click)="editCollections()" *ngIf="editMode && cipher.organizationId">
{{'collections' | i18n}}
 @@ -264,8 +263,8 @@
+ *ngFor="let f of cipher.fields; let i = index; trackBy:trackByFunction" + [ngClass]="{'box-content-row-checkbox': f.type === fieldType.Boolean}"> @@ -273,21 +272,21 @@
+ class="row-label" placeholder="{{'name' | i18n}}"> + *ngIf="f.type === fieldType.Text" placeholder="{{'value' | i18n}}"> + name="Field.Value{{i}}" [(ngModel)]="f.value" class="monospaced" + *ngIf="f.type === fieldType.Hidden" placeholder="{{'value' | i18n}}">
- +
+ title="{{'toggleVisibility' | i18n}}" (click)="toggleFieldValue(f)"> + [ngClass]="{'fa-eye': !f.showValue, 'fa-eye-slash': f.showValue}">
@@ -311,7 +310,7 @@
@@ -325,11 +324,11 @@ {{'noCollectionsInList' | i18n}}
-
+
+ name="Collection[{{i}}].Checked">
@@ -345,12 +344,11 @@
- diff --git a/src/app/vault/attachments.component.html b/src/app/vault/attachments.component.html index 86394e8654..2181abcf68 100644 --- a/src/app/vault/attachments.component.html +++ b/src/app/vault/attachments.component.html @@ -14,8 +14,8 @@ {{a.sizeName}}
diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html index a8cf15a2e6..7ef12b60c0 100644 --- a/src/app/vault/ciphers.component.html +++ b/src/app/vault/ciphers.component.html @@ -1,23 +1,20 @@
+ [(ngModel)]="searchText" (input)="search(200)" appAutofocus>
- + {{c.name}} - - + + {{c.subTitle}} @@ -33,8 +30,8 @@
-
diff --git a/src/app/vault/collections.component.html b/src/app/vault/collections.component.html index 1e489cd655..b85fa618bd 100644 --- a/src/app/vault/collections.component.html +++ b/src/app/vault/collections.component.html @@ -11,7 +11,7 @@
+ *ngFor="let c of collections; let i = index" appBoxRow> diff --git a/src/app/vault/folder-add-edit.component.html b/src/app/vault/folder-add-edit.component.html index 5c11d956b1..7d69e39795 100644 --- a/src/app/vault/folder-add-edit.component.html +++ b/src/app/vault/folder-add-edit.component.html @@ -10,7 +10,7 @@
+ [appAutofocus]="!editMode">
@@ -23,8 +23,8 @@
diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html index fec7e6d598..c9ff1f91e0 100644 --- a/src/app/vault/groupings.component.html +++ b/src/app/vault/groupings.component.html @@ -45,27 +45,24 @@

{{'collections' | i18n}}

@@ -73,10 +70,9 @@
  • - + {{c.node.name}}
      @@ -86,8 +82,7 @@
    • - +
    diff --git a/src/app/vault/password-generator-history.component.html b/src/app/vault/password-generator-history.component.html index 57da7814ac..9baaaea457 100644 --- a/src/app/vault/password-generator-history.component.html +++ b/src/app/vault/password-generator-history.component.html @@ -10,12 +10,12 @@
    + [innerHTML]="h.password | colorPassword">
    {{h.date | date:'medium'}}
    + (click)="copy(h.password)">
    diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html index ceef60932b..c192638aec 100644 --- a/src/app/vault/password-generator.component.html +++ b/src/app/vault/password-generator.component.html @@ -5,12 +5,10 @@
    - + {{'regeneratePassword' | i18n}} - + {{'copyPassword' | i18n}}
    @@ -38,12 +36,12 @@
    + [(ngModel)]="options.numWords">
    + [(ngModel)]="options.wordSeparator">
    @@ -53,30 +51,29 @@
    + (blur)="saveOptions()"> + [(ngModel)]="options.length" (change)="sliderChanged()" (input)="sliderInput()">
    + [(ngModel)]="options.uppercase">
    + [(ngModel)]="options.lowercase">
    + [(ngModel)]="options.number">
    + [(ngModel)]="options.special">
    @@ -85,17 +82,17 @@
    + [(ngModel)]="options.minNumber">
    + [(ngModel)]="options.minSpecial">
    + [(ngModel)]="avoidAmbiguous">
    @@ -103,7 +100,7 @@
    diff --git a/src/app/vault/password-history.component.html b/src/app/vault/password-history.component.html index 627f49442d..b67318496e 100644 --- a/src/app/vault/password-history.component.html +++ b/src/app/vault/password-history.component.html @@ -16,7 +16,7 @@
    + (click)="copy(h.password)">
    diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html index d5668370cb..ee043f3c84 100644 --- a/src/app/vault/share.component.html +++ b/src/app/vault/share.component.html @@ -13,7 +13,7 @@
    @@ -31,17 +31,17 @@
    + *ngFor="let c of collections; let i = index" appBoxRow> + name="Collection[{{i}}].Checked">
    diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html index 2520d4f5a0..8213b3dc10 100644 --- a/src/app/vault/vault.component.html +++ b/src/app/vault/vault.component.html @@ -1,40 +1,25 @@
    - + - + - + - +
    + (click)="togglePassword()"> + [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"> + (click)="copy(cipher.login.password, 'password', 'Password')">
    + *ngIf="cipher.login.totp && totpCode">
    {{'verificationCodeTotp' | i18n}} {{totpCodeFormatted}} @@ -60,14 +60,14 @@ + [ngStyle]="{'stroke-dashoffset.px': totpDash}">
    + (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')">
    @@ -86,7 +86,7 @@
    + (click)="copy(cipher.card.number, 'number', 'Number')">
    @@ -107,12 +107,12 @@
    + (click)="toggleCardCode()"> + [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"> + (click)="copy(cipher.card.code, 'securityCode', 'Security Code')">
    @@ -153,7 +153,7 @@ {{cipher.identity.phone}}
    + *ngIf="cipher.identity.address1 || cipher.identity.city || cipher.identity.country"> {{'address' | i18n}}
    {{cipher.identity.address1}}
    {{cipher.identity.address2}}
    @@ -177,12 +177,12 @@ {{u.hostnameOrUri}}
    - + + (click)="copy(u.uri, u.isWebsite ? 'website' : 'uri', 'URI')">
    @@ -219,13 +219,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')">
    @@ -238,8 +238,8 @@
    + *ngFor="let attachment of cipher.attachments" href="#" appStopClick appBlurCLick + (click)="downloadAttachment(attachment)"> {{attachment.fileName}} {{attachment.sizeName}} @@ -258,7 +258,7 @@ {{cipher.passwordRevisionDisplayDate | date:'medium'}}
    - {{'passwordHistory' | i18n}}: + {{'passwordHistory' | i18n}}: {{cipher.passwordHistory.length}}