V2

app/assets/templates/frontend/directives/account-menu.html.haml

@@ -6,7 +6,7 @@
       .mb-10
 
         .step-one{"ng-if" => "!formData.showLogin && !formData.showRegister"}
-          %h3 Sign in or register to enable sync and encryption.
+          %h3 Sign in or register to enable sync and end-to-end encryption.
           .small-v-space
 
           .button-group.mt-5
@@ -31,10 +31,14 @@
                 %label.pull-left Sync Server Domain
               %input.form-control.mt-5{:name => 'server', :placeholder => 'Server URL', :required => true, :type => 'text', 'ng-model' => 'formData.url'}
 
-            .checkbox.mt-10{"ng-if" => "localNotesCount() > 0"}
+            .checkbox.mt-10
+              %p
+                %input{"type" => "checkbox", "ng-model" => "formData.ephemeral", "ng-true-value" => "false", "ng-false-value" => "true"}
+                  Stay signed in
+            .checkbox.mt-10{"ng-if" => "notesAndTagsCount() > 0"}
               %p
                 %input{"type" => "checkbox", "ng-model" => "formData.mergeLocal", "ng-bind" => "true", "ng-change" => "mergeLocalChanged()"}
-                  Merge local notes ({{localNotesCount()}} notes)
+                  Merge local data ({{notesAndTagsCount()}} notes and tags)
             %button.ui-button.block.mt-10{"ng-click" => "submitAuthForm()"} {{formData.showLogin ? "Sign In" : "Register"}}
 
         .mt-15{"ng-if" => "formData.showRegister"}
@@ -48,8 +52,8 @@
     %div{"ng-if" => "user"}
       %h2 {{user.email}}
       %p {{server}}
-      %div.bold.mt-10.blue{"delay-hide" => "true", "show" => "syncStatus.syncOpInProgress || syncStatus.needsMoreSync", "delay" => "1000"}
-        .spinner.inline.mr-5.blue
+      %div.bold.mt-10.tinted{"delay-hide" => "true", "show" => "syncStatus.syncOpInProgress || syncStatus.needsMoreSync", "delay" => "1000"}
+        .spinner.inline.mr-5.tinted
         {{"Syncing" + (syncStatus.total > 0 ? ":" : "")}}
         %span{"ng-if" => "syncStatus.total > 0"} {{syncStatus.current}}/{{syncStatus.total}}
       %p.bold.mt-10.red.block{"ng-if" => "syncStatus.error"} Error syncing: {{syncStatus.error.message}}
@@ -104,20 +108,37 @@
               %input.form-control{:type => 'password', "ng-model" => "securityUpdateData.password", "placeholder" => "Enter password"}
               %button.ui-button.block{"ng-click" => "submitSecurityUpdateForm()"} Update
           %div.mt-5{"ng-if" => "securityUpdateData.processing"}
-            %p.blue Processing...
+            %p.tinted Processing...
 
 
+    .mt-25
+      %h4 Encryption Status
+      %p
+        {{encryptionStatusString()}}
+      %div.mt-5{"ng-if" => "encryptionEnabled()"}
+        %i {{encryptionStatusForNotes()}}
+
+    .mt-25
+      %h4 Passcode Lock
+      %div{"ng-if" => "!hasPasscode() && passcodeOptionAvailable()"}
+        %p Add an app passcode to lock the app and encrypt on-device key storage.
+        %a.block.mt-5{"ng-click" => "addPasscodeClicked()", "ng-if" => "!formData.showPasscodeForm"} Add Passcode
+
+        .mt-5{"ng-if" => "formData.showPasscodeForm"}
+          %p.bold Choose a passcode:
+          %input.form-control.mt-10{:type => 'password', "ng-model" => "formData.passcode", "placeholder" => "Passcode", "autofocus" => "true"}
+          %input.form-control.mt-10{:type => 'password', "ng-model" => "formData.confirmPasscode", "placeholder" => "Confirm Passcode"}
+          %button.standard.ui-button.block.tinted.mt-5{"ng-click" => "submitPasscodeForm()"} Set Passcode
+      %div{"ng-if" => "hasPasscode()"}
+        %p
+          Passcode lock is enabled.
+          %span{"ng-if" => "isDesktopApplication()"} Your passcode will be required on new sessions after app quit.
+        %a.block.mt-5{"ng-click" => "removePasscodePressed()"} Remove Passcode
+      %div{"ng-if" => "!passcodeOptionAvailable()"}
+        %p Passcode lock is only available to permanent sessions. (You chose not to stay signed in.)
 
 
 
-      .medium-v-space
-
-      %h4 Local Encryption
-      %p Notes are encrypted locally before being sent to the server. Neither the server owner nor an intrusive entity can decrypt your locally encrypted notes.
-      %div.mt-5
-        %label Status:
-        {{encryptionStatusForNotes()}}
-
     .mt-25{"ng-if" => "!importData.loading"}
       %h4 Data Archives
       .mt-5{"ng-if" => "user"}
@@ -132,25 +153,15 @@
 
       %label.block.mt-5
         %input{"type" => "file", "style" => "display: none;", "file-change" => "->", "handler" => "importFileSelected(files)"}
-        .fake-link Import Data from Archive
+        .fake-link.tinted Import Data from Archive
 
       %div{"ng-if" => "importData.requestPassword"}
         %p Enter the account password associated with the import file.
-        %input.form-control.mt-5{:type => 'password', "ng-model" => "importData.password"}
-        %button.standard.ui-button.block.blue.mt-5{"ng-click" => "submitImportPassword()"} Decrypt & Import
+        %input.form-control.mt-5{:type => 'password', "ng-model" => "importData.password", "autofocus" => "true"}
+        %button.standard.ui-button.block.tinted.mt-5{"ng-click" => "submitImportPassword()"} Decrypt & Import
 
       %p.mt-5{"ng-if" => "user"} Notes are downloaded in the Standard File format, which allows you to re-import back into this app easily. To download as plain text files, choose "Decrypted".
 
     .spinner.mt-10{"ng-if" => "importData.loading"}
 
-    .mt-25
-      %h4 Analytics
-      %p
-        Help Standard Notes improve by sending anonymous data on general usage.
-        %a{"href" => "https://standardnotes.org/privacy", "target" => "_blank"} Learn more.
-      %div.mt-5
-        %label Status:
-        {{analyticsManager.enabled ? "Enabled" : "Disabled"}}
-        %a{"ng-click" => "analyticsManager.toggleStatus()"} {{analyticsManager.enabled ? "Disable" : "Enable"}}
-
     %a.block.mt-25.red{"ng-click" => "destroyLocalData()"}  {{ user ? "Sign out and clear local data" : "Clear all local data" }}