Address immediate sponsorship feedback (#2127)

* Display all Packages/Years together in sponsor-list.

Fixes #2124

* Resolve #2125

Author: ewdurbin

sponsors/models/sponsorship.py

@@ -404,7 +404,7 @@ class SponsorshipBenefit(OrderedModel):
     package_only = models.BooleanField(
         default=False,
         verbose_name="Sponsor Package Only Benefit",
-        help_text="If a benefit is only available via a sponsorship package, select this option.",
+        help_text="If a benefit is only available via a sponsorship package and not as an add-on, select this option.",
     )
     new = models.BooleanField(
         default=False,

sponsors/templatetags/sponsors.py

@@ -41,12 +41,13 @@ def list_sponsors(logo_place, publisher=PublisherChoices.FOUNDATION.value):
     if logo_place == LogoPlacementChoices.SPONSORS_PAGE.value:
         sponsorships_by_package = OrderedDict()
         for pkg in packages:
-            sponsorships_by_package[pkg] = {
+            sponsorships_by_package[pkg.slug] = {
+                "label": pkg.name,
                 "logo_dimension": str(pkg.logo_dimension),
                 "sponsorships": [
                     sp
                     for sp in sponsorships
-                    if sp.package == pkg
+                    if sp.package.slug == pkg.slug
                 ]
             }
 

templates/sponsors/partials/sponsors-list.html

@@ -36,14 +36,14 @@ <h3 class="widget-title">Job Board Sponsors</h3>
 
   {% for package, placement_info in sponsorships_by_package.items %}
   {% if placement_info.sponsorships %}
-  <div title="{{ package.name }} Sponsors" align="center">
+  <div title="{{ package }} Sponsors" align="center">
     {% with dimension=placement_info.logo_dimension %}
 
-    <h1 style="font-size: {% if forloop.first %}350%{% else %}300%{% endif %}">{{ package }} Sponsors</h1>
+    <h1 style="font-size: {% if forloop.first %}350%{% else %}300%{% endif %}">{{ placement_info.label }} Sponsors</h1>
 
     <div style="display: grid; grid-gap: 2em; grid-template-columns: repeat(auto-fit, minmax({{ dimension }}px, 0fr)); grid-template-rows: repeat(1, minmax({{ dimension }}px, 0fr)); align-items: center; justify-content: center;">
       {% for sponsorship in placement_info.sponsorships %}
-        <div id="{{ sponsorship.sponsor.slug }}">
+        <div id="{{ sponsorship.sponsor.slug }}" data-internal-year={{ sponsorship.year }}>
             <div
                 data-ea-publisher="psf"
                 data-ea-type="psf-image-only"

templates/sponsors/sponsorship_benefits_form.html

@@ -139,7 +139,7 @@ <h4 class="benefit-title">{{ benefit.name }}</h4>
                   data-initial-state="{% static 'img/sponsors/tick-placeholder.png' %}"
                 />
                 <br/>
-                <small>Potential a la carte</small>
+                <small>Potential add-on</small>
               {% endif %}
               {% if benefit.has_tiers %}
                 <div><small>{% benefit_quantity_for_package benefit package %}</small></div>