From 15ed41741edd99f2b337998af4a73be9dd30c747 Mon Sep 17 00:00:00 2001
From: Andris Reinman <andris@kreata.ee>
Date: Thu, 21 Apr 2016 00:12:49 +0300
Subject: [PATCH] updated gpg textarea

---
 views/lists/subscription/add.hbs  |  2 +-
 views/lists/subscription/edit.hbs |  2 +-
 views/settings.hbs                | 15 ++++++++-------
 views/subscription/manage.hbs     |  2 +-
 views/subscription/subscribe.hbs  |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/views/lists/subscription/add.hbs b/views/lists/subscription/add.hbs
index 5ab8aac1..00293523 100644
--- a/views/lists/subscription/add.hbs
+++ b/views/lists/subscription/add.hbs
@@ -55,7 +55,7 @@
                 {{/if}}
 
                 {{#if typeGpg}}
-                    <textarea class="form-control gpg-text" rows="3" name="{{column}}">{{value}}</textarea>
+                    <textarea class="form-control gpg-text" rows="3" name="{{column}}" placeholder="Begins with &#39;-----BEGIN PGP PUBLIC KEY BLOCK-----&#39;">{{value}}</textarea>
                     <span class="help-block">Insert a GPG public key that will be used to encrypt messages sent this subscriber</span>
                 {{/if}}
 
diff --git a/views/lists/subscription/edit.hbs b/views/lists/subscription/edit.hbs
index b3cd5e97..59409708 100644
--- a/views/lists/subscription/edit.hbs
+++ b/views/lists/subscription/edit.hbs
@@ -68,7 +68,7 @@
                 {{/if}}
 
                 {{#if typeGpg}}
-                    <textarea class="form-control gpg-text" rows="3" name="{{column}}">{{value}}</textarea>
+                    <textarea class="form-control gpg-text" rows="3" name="{{column}}" placeholder="Begins with &#39;-----BEGIN PGP PUBLIC KEY BLOCK-----&#39;">{{value}}</textarea>
                     <span class="help-block">Insert a GPG public key that will be used to encrypt messages sent this subscriber</span>
                 {{/if}}
 
diff --git a/views/settings.hbs b/views/settings.hbs
index 7fd02c40..e060a849 100644
--- a/views/settings.hbs
+++ b/views/settings.hbs
@@ -37,10 +37,11 @@
         </div>
 
         <div class="form-group">
-            <div class="col-sm-offset-2 col-xs-4">
+            <div class="col-sm-offset-2 col-sm-10">
                 <div class="checkbox">
                     <label>
                         <input type="checkbox" name="disable-wysiwyg" {{#if disableWysiwyg}} checked {{/if}}> Disable WYSIWYG editor
+                        <span class="help-block">If checked then message editor displays HTML code without the preview</span>
                     </label>
                 </div>
             </div>
@@ -253,11 +254,11 @@
 
     <fieldset>
         <legend>
-            PGP Signing
+            GPG Signing
         </legend>
 
         <p>
-            Only messages that are encrypted can be signed. Subsribers who have not set up a PGP public key in their profile receive normal email messages. Users with PGP key set receive encrypted messages and if you have signing key also set, the messages are signed
+            Only messages that are encrypted can be signed. Subsribers who have not set up a GPG public key in their profile receive normal email messages. Users with GPG key set receive encrypted messages and if you have signing key also set, the messages are signed
             with this key.
         </p>
         <p class="text-warning">
@@ -267,16 +268,16 @@
         <div class="form-group">
             <label for="pgp-passphrase" class="col-sm-2 control-label">Private Key Passphrase</label>
             <div class="col-sm-10">
-                <input type="password" class="form-control" name="pgp-passphrase" id="pgp-passphrase" placeholder="Passprase" value="{{pgpPassphrase}}">
+                <input type="password" class="form-control" name="pgp-passphrase" id="pgp-passphrase" placeholder="Passphrase for the key if set" value="{{pgpPassphrase}}">
                 <span class="help-block">Only fill this if your private key is encrypted with a passphrase</span>
             </div>
         </div>
 
         <div class="form-group">
-            <label for="pgp-private-key" class="col-sm-2 control-label">PGP Private Key</label>
+            <label for="pgp-private-key" class="col-sm-2 control-label">GPG Private Key</label>
             <div class="col-sm-10">
-                <textarea class="form-control gpg-text" rows="3" id="pgp-private-key" name="pgp-private-key">{{pgpPrivateKey}}</textarea>
-                <span class="help-block">This value is optional. if you do not provide a private key, then PGP encrypted messages are sent without signing.</span>
+                <textarea class="form-control gpg-text" rows="3" id="pgp-private-key" name="pgp-private-key" placeholder="Begins with &#39;-----BEGIN PGP PRIVATE KEY BLOCK-----&#39;">{{pgpPrivateKey}}</textarea>
+                <span class="help-block">This value is optional. if you do not provide a private key GPG encrypted messages are sent without signing.</span>
             </div>
         </div>
 
diff --git a/views/subscription/manage.hbs b/views/subscription/manage.hbs
index b70bbcb0..ef578e53 100644
--- a/views/subscription/manage.hbs
+++ b/views/subscription/manage.hbs
@@ -53,7 +53,7 @@
                         <button type="submit" class="btn btn-link btn-xs" form="download-pubkey"><span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span> Download signature verififcation key</button>
                     </div>
                 {{/if}}
-                <textarea class="form-control gpg-text" rows="3" name="{{column}}">{{value}}</textarea>
+                <textarea class="form-control gpg-text" rows="3" name="{{column}}" placeholder="Begins with &#39;-----BEGIN PGP PUBLIC KEY BLOCK-----&#39;">{{value}}</textarea>
                 <span class="help-block">Insert your GPG public key here to encrypt messages sent to your address <em>(optional)</em></span>
             {{/if}}
 
diff --git a/views/subscription/subscribe.hbs b/views/subscription/subscribe.hbs
index 4f12956a..4f1347f1 100644
--- a/views/subscription/subscribe.hbs
+++ b/views/subscription/subscribe.hbs
@@ -50,7 +50,7 @@
                         <button type="submit" class="btn btn-link btn-xs" form="download-pubkey"><span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span> Download signature verififcation key</button>
                     </div>
                 {{/if}}
-                <textarea class="form-control gpg-text" rows="3" name="{{column}}">{{value}}</textarea>
+                <textarea class="form-control gpg-text" rows="3" name="{{column}}" placeholder="Begins with &#39;-----BEGIN PGP PUBLIC KEY BLOCK-----&#39;">{{value}}</textarea>
                 <span class="help-block">Insert your GPG public key here to encrypt messages sent to your address <em>(optional)</em></span>
             {{/if}}