From 2db6180af38a803438bb2f89ab3edccabac0f91b Mon Sep 17 00:00:00 2001
From: Andrew Engelbrecht <sudoman@ninthfloor.org>
Date: Thu, 22 Dec 2016 16:38:31 -0500
Subject: [PATCH] updated order of perks in member benefits page

zak requested the re-ordering of benefits on the member benefits page.
---
 .../CRM/Memberdashboard/Page/Benefits.tpl     | 80 ++++++++++---------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/templates/CRM/Memberdashboard/Page/Benefits.tpl b/templates/CRM/Memberdashboard/Page/Benefits.tpl
index 8c2d31c..da043ca 100644
--- a/templates/CRM/Memberdashboard/Page/Benefits.tpl
+++ b/templates/CRM/Memberdashboard/Page/Benefits.tpl
@@ -7,24 +7,6 @@
     using promotional code <strong>ASSOC</strong>
   </p>
 
-  <div class="header-dark">LibrePlanet</div>
-
-  <a href="https://libreplanet.org">
-    <img src="//static.fsf.org/nosvn/big-logo.png" alt="LibrePlanet" />
-  </a>
-
-  <p>
-    Associate members get gratis admission to
-    <a href="https://libreplanet.org">LibrePlanet</a>,
-    the FSF's annual conference.
-  </p>
-
-  <p>
-    Use your FSF account to join a
-    <a href="https://libreplanet.org/">
-      local free software group at LibrePlanet.
-    </a>
-  </p>
 
   <div class="header-dark">  Discount on Hardware from ThinkPenguin </div>
 
@@ -38,26 +20,38 @@
   </p>
 
 
+  {if !empty($buttonUrl) }
+    <div class="header-dark">Member button</div>
+
+    <p>
+      Display this member button proudly on your website to show how
+      long you have been an FSF member!
+    </p>
+
+    <img src="{$buttonUrl}{$contact.id}.png" />
+  {/if}
+
 
-  <div class="header-dark">Jabber/XMPP</div>
+  <div class="header-dark">LibrePlanet</div>
+
+  <a href="https://libreplanet.org">
+    <img src="//static.fsf.org/nosvn/big-logo.png" alt="LibrePlanet" />
+  </a>
 
   <p>
-    Your Jabber/XMPP account is: <strong>{$user->name}@member.fsf.org</strong>
+    Associate members get gratis admission to
+    <a href="https://libreplanet.org">LibrePlanet</a>,
+    the FSF's annual conference.
   </p>
 
-  <h2>Instructions</h2>
-
   <p>
-    Use your FSF username as the jabber username, and member.fsf.org as
-    the domain if your XMPP client supports server discovery via a DNS
-    SRV record lookup. Most XMPP clients support this. If your client
-    does not, you can use jabber.member.fsf.org as the server name. Make
-    sure to enable encryption: we support TLS on port 5222 only. Your
-    password is the same as your FSF member password.  (Please report
-    any problems you might encounter to
-    <a href="mailto:sysadmin@gnu.org">sysadmin@gnu.org</a>.)
+    Use your FSF account to join a
+    <a href="https://libreplanet.org/">
+      local free software group at LibrePlanet.
+    </a>
   </p>
 
+
   <div class="header-dark">Email Forwarding</div>
 
   <p>
@@ -121,16 +115,26 @@
     <input class="crm-form-submit default" type="submit" value="Add" />
   </form>
 
-  {if !empty($buttonUrl) }
-    <div class="header-dark">Member button</div>
 
-    <p>
-      Display this member button proudly on your website to show how
-      long you have been an FSF member!
-    </p>
+  <div class="header-dark">Jabber/XMPP</div>
+
+  <p>
+    Your Jabber/XMPP account is: <strong>{$user->name}@member.fsf.org</strong>
+  </p>
+
+  <h2>Instructions</h2>
+
+  <p>
+    Use your FSF username as the jabber username, and member.fsf.org as
+    the domain if your XMPP client supports server discovery via a DNS
+    SRV record lookup. Most XMPP clients support this. If your client
+    does not, you can use jabber.member.fsf.org as the server name. Make
+    sure to enable encryption: we support TLS on port 5222 only. Your
+    password is the same as your FSF member password.  (Please report
+    any problems you might encounter to
+    <a href="mailto:sysadmin@gnu.org">sysadmin@gnu.org</a>.)
+  </p>
 
-    <img src="{$buttonUrl}{$contact.id}.png" />
-  {/if}
 
   <div class="header-dark">Member Forums</div>
 
-- 
2.25.1