Merge remote-tracking branch 'upstream/stable'

gitcoinco · Jul 10, 2020 · 59e562a · 59e562a
2 parents e563a7d + 6e9e14f
commit 59e562a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 48 deletions.
diff --git a/app/retail/templates/emails/bounty_roundup.html b/app/retail/templates/emails/bounty_roundup.html
@@ -75,6 +75,26 @@ <h1 class="text-centre">{% trans "The Gitcoin Weekly" %}</h1>
 
   <div class='intro text-left'>
     {{ intro|safe }}
+    {% if sponsor %}
+    </div>
+  </div>
+      <div class="full-width text-center" style="padding:20px 0; background-color: #f2f6f9; text-align: center; margin: 0 auto;">
+        <div class="sponsor-text" style="margin-left: auto; margin-right: auto;">
+        <p style=" color: #000000;">Sponsored by <a href="{{ sponsor.link }}" style=" color: #3E00FF;">{{ sponsor.name }}</a></p>
+        <a href="{{ sponsor.link }}" style="text-align: center; color: #000000; font-weight: bold; font-size: 16px; display: block; text-decoration: none; line-height: 19px;">{{ sponsor.title }}</a>
+        {% for paragraph in sponsor.body %}
+          <p style="font-size: 14px; text-align: center; line-height: 18px;">{{ paragraph | safe }}</p>
+        {% endfor %}
+        <div style="margin-bottom: 1em; margin-top: 2em;">
+          <a class="button" style="color: #FFFFFF;" href="{{ sponsor.link }}">{{ sponsor.cta }}</a>
+        </div>
+        <small style="text-align: center; color: rgba(0,0,0,0.4); font-size: 10px; line-height: 12px;">Interested in sponsoring The Gitcoin Weekly?
+          <a href="https://share.hsforms.com/1--0ESFkIQ1m-y8wCW-3Q_g3bjxf" style="color: rgba(0,0,0,0.4); font-size: 10px; line-height: 12px;">Let us know</a>
+        </small>
+      </div>
+      </div>
+    {% endif %}
+
   </div>
 
   <div class="primary-content text-center" style="padding-top: 0">

diff --git a/app/retail/views.py b/app/retail/views.py
@@ -485,18 +485,6 @@ def about(request):
             "pixelant",
             True
         ),
-        (
-            "Eric Berry",
-            "OSS Funding",
-            "coderberry",
-            "ericberry",
-            "Chrome/Firefox Extension",
-            "Pastel de nata",
-            "eric",
-            "Burnout Healer",
-            "coderberry",
-            True
-        ),
         (
             "Vivek Singh",
             "Community Buidl-er",
@@ -557,30 +545,6 @@ def about(request):
             "",
             True
         ),
-        (
-            "Nate Hopkins",
-            "Engineering",
-            "hopsoft",
-            None,
-            "Bounties",
-            "Chicken tikka masala",
-            "nate",
-            "Lord of Night's Watch",
-            "hopsoft",
-            True
-        ),
-        (
-            "Alessandro Voto",
-            "DevRel",
-            "alexvotofuture",
-            None,
-            "Devvies",
-            "Tacos",
-            "alex",
-            "Starship Captain",
-            "avotofuture",
-            True
-        ),
         (
             "Dan Lipert",
             "Engineering",
@@ -605,18 +569,6 @@ def about(request):
             "connoroday0",
             True
         ),
-        (
-            "Joseph Chen",
-            "Operations",
-            "josephchen",
-            "josephchen",
-            "Ethical Ads",
-            "DIY",
-            "joseph",
-            "Arithmagician",
-            "",
-            True
-        ),
         (
             "gitcoinbot",
             "beep boop bop",