From 4560328ba727b371b8292e45d42fae4bf56e534b Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@fsf.org>
Date: Thu, 29 Sep 2016 13:27:51 -0400
Subject: [PATCH] Added change for R#T1151046 plus previous modifications

---
 templates/CRM/Memberdashboard/Page/Benefits.tpl | 17 +++++++++++++++--
 .../Memberdashboard/Page/Element/CiviMember.tpl |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/templates/CRM/Memberdashboard/Page/Benefits.tpl b/templates/CRM/Memberdashboard/Page/Benefits.tpl
index c94a7c5..8c2d31c 100644
--- a/templates/CRM/Memberdashboard/Page/Benefits.tpl
+++ b/templates/CRM/Memberdashboard/Page/Benefits.tpl
@@ -26,13 +26,26 @@
     </a>
   </p>
 
+  <div class="header-dark">  Discount on Hardware from ThinkPenguin </div>
+
+  <p>
+    <a href="https://www.thinkpenguin.com/">ThinkPenguin</a> is a purveyor of computers and 
+    peripherals that provides 5% off all their products to FSF members. ThinkPenguin offers some 
+    devices that are certified by the FSF under our <a href="https://www.fsf.org/ryf">Respects 
+    Your Freedom hardware certification</a>, and all of their products are able to run or 
+    interface with <a href="https://www.gnu.org/distros/free-distros.html">free GNU/Linux 
+    distributions</a>. Use the discount code <strong>FSFMEMBER</strong> at checkout.
+  </p>
+
+
+
   <div class="header-dark">Jabber/XMPP</div>
 
   <p>
     Your Jabber/XMPP account is: <strong>{$user->name}@member.fsf.org</strong>
   </p>
 
-  <h3>Instructions</h3>
+  <h2>Instructions</h2>
 
   <p>
     Use your FSF username as the jabber username, and member.fsf.org as
@@ -97,7 +110,7 @@
     </form>
   {/if}
 
-  <h3>Add New Alias</h3>
+  <h2>Add New Alias</h2>
 
   <form method="POST"
         action="{crmURL p='civicrm/member-dashboard/benefits' q='action=add'}">
diff --git a/templates/CRM/Memberdashboard/Page/Element/CiviMember.tpl b/templates/CRM/Memberdashboard/Page/Element/CiviMember.tpl
index 4ee7029..7d1c215 100644
--- a/templates/CRM/Memberdashboard/Page/Element/CiviMember.tpl
+++ b/templates/CRM/Memberdashboard/Page/Element/CiviMember.tpl
@@ -44,7 +44,7 @@
           <td>{$activeMember.start_date|crmDate}</td>
           <td>{$activeMember.end_date|crmDate}</td>
           <td>{$activeMember.status}</td>
-          <td>{if $activeMember.renewPageId}<a href="{crmURL p='civicrm/contribute/transact' q="id=`$activeMember.renewPageId`&mid=`$activeMember.id`&reset=1"}">{ts}Renew{/ts}</a>{/if}</td>
+          <td>{if $activeMember.renewPageId}<a href="{crmURL p='civicrm/contribute/transact' q="id=`$activeMember.renewPageId`&mid=`$activeMember.id`&reset=1"}">[ {ts}Renew Now{/ts} ]</a>{/if}</td>
         </tr>
         {/foreach}
         </table>
-- 
2.25.1