Autolock wip

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

@@ -130,7 +130,12 @@
               .horizontal-group
                 %a.info{"ng-click" => "changePasscodePressed()"} Change Passcode
                 %a.danger{"ng-click" => "removePasscodePressed()"} Remove Passcode
-
+            .panel-row
+              .horizontal-group
+                %p Autolock:
+                %a.info{"ng-repeat" => "option in passcodeAutoLockOptions", "ng-click" => "selectAutoLockInterval(option.value)",
+                "ng-class" => "{'info bold' : option.value == selectedAutoLockInterval}"}
+                  {{option.label}}
 
 
         .panel-section{"ng-if" => "!importData.loading"}

app/assets/templates/directives/privileges-management-modal.html.haml

@@ -20,3 +20,14 @@
                   %p {{displayInfoForAction(action)}}
                 %th{"ng-repeat" => "credential in availableCredentials"}
                   %input{"type" => "checkbox", "ng-checked" => "isCredentialRequiredForAction(action, credential)", "ng-click" => "checkboxValueChanged(action, credential)"}
+      .footer
+        %h2 About Privileges
+        %p
+          Privileges represent interface level authentication for accessing certain items and features.
+          Note that when your application is unlocked, your data exists in temporary memory in an unencrypted state.
+          Privileges are meant to protect against unwanted access in the event of an unlocked application, but do not affect data encryption state.
+
+        %p
+          Privileges sync across your other devices (not including mobile); however, note that if you require
+          a "Local Passcode" privilege, and another device does not have a local passcode set up, the local passcode
+          requirement will be ignored on that device.

app/assets/templates/footer.html.haml

@@ -39,6 +39,6 @@
       .item{"ng-if" => "!ctrl.offline", "ng-click" => "ctrl.refreshData()"}
         .label Refresh
 
-      .item#lock-item{"ng-if" => "ctrl.hasPasscode()"}
+      .item#lock-item{"ng-if" => "ctrl.hasPasscode()", "title" => "Locks application and wipes unencrypted data from memory."}
         .label
           %i.icon.ion-locked#footer-lock-icon{"ng-if" => "ctrl.hasPasscode()", "ng-click" => "ctrl.lockApp()"}

app/assets/templates/notes.html.haml

@@ -59,9 +59,11 @@
             .faded {{note.savedTagsString || note.tagsString()}}
 
           .name{"ng-if" => "note.title"}
+            %span.locked.tinted{"ng-if" => "note.locked", "ng-class" => "{'tinted-selected' : ctrl.selectedNote == note}"}
+              %i.icon.ion-locked.medium-text
             {{note.title}}
 
-          .note-preview{"ng-if" => "!ctrl.hideNotePreview && !note.content.hidePreview"}
+          .note-preview{"ng-if" => "!ctrl.hideNotePreview && !note.content.hidePreview && !note.locked"}
             .html-preview{"ng-if" => "note.content.preview_html", "ng-bind-html" => "note.content.preview_html"}
             .plain-preview{"ng-if" => "!note.content.preview_html && note.content.preview_plain"} {{note.content.preview_plain}}
             .default-preview{"ng-if" => "!note.content.preview_html && !note.content.preview_plain"} {{note.text}}