From 1e2e23142bc5ed75b696eb18160e2bbf366f6e83 Mon Sep 17 00:00:00 2001
From: Andris Reinman <andris@kreata.ee>
Date: Sun, 17 Apr 2016 12:13:02 +0200
Subject: [PATCH] updated public key download link

---
 views/subscription/manage.hbs    | 12 ++++++------
 views/subscription/subscribe.hbs | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/views/subscription/manage.hbs b/views/subscription/manage.hbs
index dc578bef..b70bbcb0 100644
--- a/views/subscription/manage.hbs
+++ b/views/subscription/manage.hbs
@@ -48,8 +48,13 @@
             {{/if}}
 
             {{#if typeGpg}}
+                {{#if ../hasPubkey}}
+                    <div class="pull-right">
+                        <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>
-                <span class="help-block">(optional) Insert your GPG public key here to encrypt messages sent to your address</span>
+                <span class="help-block">Insert your GPG public key here to encrypt messages sent to your address <em>(optional)</em></span>
             {{/if}}
 
             {{#if typeDateUs}}
@@ -111,11 +116,6 @@
     {{/each}}
 
     <div class="form-group">
-        <div class="pull-right">
-            {{#if hasPubkey}}
-                <button type="submit" class="btn btn-default" form="download-pubkey"><span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span> Download our public GPG key</button>
-            {{/if}}
-        </div>
         <button type="submit" class="btn btn-primary"><i class="glyphicon glyphicon-ok"></i> Update Profile</button> or <a href="/subscription/{{lcid}}/unsubscribe/{{cid}}">Unsubscribe</a>
     </div>
 </form>
diff --git a/views/subscription/subscribe.hbs b/views/subscription/subscribe.hbs
index d943b86f..4f12956a 100644
--- a/views/subscription/subscribe.hbs
+++ b/views/subscription/subscribe.hbs
@@ -45,8 +45,13 @@
             {{/if}}
 
             {{#if typeGpg}}
+                {{#if ../hasPubkey}}
+                    <div class="pull-right">
+                        <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>
-                <span class="help-block">(optional) Insert your GPG public key here to encrypt messages sent to your address</span>
+                <span class="help-block">Insert your GPG public key here to encrypt messages sent to your address <em>(optional)</em></span>
             {{/if}}
 
             {{#if typeDateUs}}
@@ -108,11 +113,6 @@
     {{/each}}
 
     <div class="form-group">
-        <div class="pull-right">
-            {{#if hasPubkey}}
-                <button type="submit" class="btn btn-default" form="download-pubkey"><span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span> Download our public GPG key</button>
-            {{/if}}
-        </div>
         <button type="submit" class="btn btn-primary">Subscribe to list</button>
     </div>
 </form>