From bd6ed8d3c09c36fa1b705db15575a2e423938ef2 Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Thu, 23 Mar 2017 10:39:14 -0600 Subject: [PATCH] Keep messaging system alive when locked/encrypted Former-commit-id: becceb5fed276d2daa80eca4a41b9fa9d3eae9fd [formerly 4ac3d85f084df155b06e17eea289e34ea60faa50] [formerly 19561726e85e6c133c667d1ee948b0ff2978632d [formerly a3fe621f1947a2cf0b6af4ac6ccb01c3c744fc2e]] Former-commit-id: 3b7092e62e255f90d4ddcea9a104f5e6db22da2e [formerly 0dd41c8f221df6a21fad9da2ff2287ebb98f3b9a] Former-commit-id: 62a685d81f08d7b96596cbc236c540141cdd9e42 Former-commit-id: 4b75f663812ced74403c4bab3226ce5cb2195794 --- bindata.go.REMOVED.git-id | 2 +- templates/index.tmpl | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bindata.go.REMOVED.git-id b/bindata.go.REMOVED.git-id index 21d3f15..3e4a01b 100644 --- a/bindata.go.REMOVED.git-id +++ b/bindata.go.REMOVED.git-id @@ -1 +1 @@ -083d9060ba97213d049e1f19f11ff57620b5956e \ No newline at end of file +f74b6571b2ecfc146281dfaa007b62508b33b2f7 \ No newline at end of file diff --git a/templates/index.tmpl b/templates/index.tmpl index 1568bc2..2977a9f 100755 --- a/templates/index.tmpl +++ b/templates/index.tmpl @@ -277,6 +277,11 @@ e.preventDefault(); var passphrase = prompt("Please enter a passphrase to lock", ""); if (passphrase != null) { + if ($('#lockPage').text() == "Lock") { + $("#saveEditButton").text("Locking"); + } else { + $("#saveEditButton").text("Unlocking"); + } lockPage(passphrase); // POST encrypt page // reload page @@ -358,9 +363,9 @@
  • View
  • {{ if (or (.IsLocked) (.IsEncrypted) )}} {{ if .IsLocked }} -
  • Locked
  • +
  • Locked
  • {{ else }} -
  • Encrypted
  • +
  • Encrypted
  • {{ end }} {{else}}
  • List
  • Edit