Merge branch 'master' of ssh://k.sfconservancy.org/website

www/conservancy/local_context_processors.py

@@ -1,6 +1,16 @@
+from datetime import datetime as DateTime
+from pytz import utc as UTC
+
 import conservancy.settings
 from conservancy.apps.fundgoal.models import FundraisingGoal as FundraisingGoal
 
+SITE_FUNDGOAL = 'cy2018-end-year-match'
+# FIXME: Move this information into the model.
+FUNDGOAL_ENDTIMES = {
+    # End of 2019-01-15 AOE is 2019-01-16 noon UTC.
+    'cy2018-end-year-match': DateTime(2019, 1, 16, 12, tzinfo=UTC),
+}
+
 def fundgoal_lookup(fundraiser_sought):
     try:
         return FundraisingGoal.objects.get(fundraiser_code_name=fundraiser_sought)
@@ -9,7 +19,10 @@ def fundgoal_lookup(fundraiser_sought):
         return None
 
 def sitefundraiser(request):
-    return {'sitefundgoal': fundgoal_lookup('cy2018-end-year-match') }
+    return {
+        'sitefundgoal': fundgoal_lookup(SITE_FUNDGOAL),
+        'sitefundgoal_timeleft': FUNDGOAL_ENDTIMES[SITE_FUNDGOAL] - DateTime.now(UTC),
+    }
 
 if conservancy.settings.FORCE_CANONICAL_HOSTNAME:
     _HOST_URL_VAR = {'host_url': 'https://' + conservancy.settings.FORCE_CANONICAL_HOSTNAME}

www/conservancy/static/about/filings/index.html

@@ -13,8 +13,11 @@ public inspection, in reverse chronological order:</p>
 <ul>
 
 <li>Fiscal Year 2017 (from 2017-03-01 through 2018-02-28)
-  <p>Our FY 2017 ends on 2017-02-28.  Our annual filings will be due with the
-  USA Internal Revenue Service (IRS) and New York State <a href="https://www.irs.gov/charities-non-profits/return-due-dates-for-exempt-organizations-annual-return">on 2018-07-16</a>.</p>
+  <p>Our FY 2017 ended on 2017-02-28.  We were granted (as most organizations
+  are) the extended deadline.  Our annual filings are due with the USA
+  Internal Revenue Service (IRS) and New York
+  State <a href="https://www.irs.gov/charities-non-profits/return-due-dates-for-exempt-organizations-annual-return">on
+  2019-01-15</a>.  They will be posted here shortly after filing.</p>
 </li>
 
 <li>Fiscal Year 2016 (from 2016-03-01 through 2017-02-28)

www/conservancy/templates/base_conservancy.html

@@ -71,7 +71,16 @@ this_match_remaining: this_match_goal - this_match_so_far
         Thanks to {{ sitegoal.fundraiser_donation_count|intcomma }} Supporters we earned our full match!  Help us go further to stand up for software
         freedom &mdash; <a href="/supporter">sign up now</a>!
         {% else %}
-        The next ${{ this_match_remaining|floatformat:0|intcomma }} of support we receive will be matched thanks to Private Internet Access and a group of generous donors, including {{ sitefundgoal.random_providers }}!  <a href="/supporter/">Support Conservancy today!</a>
+          {% if sitefundgoal_timeleft.total_seconds <= 0 %}
+            The
+          {% elif sitefundgoal_timeleft.days == 0 %}
+            Through today only, the
+          {% elif sitefundgoal_timeleft.days == 1 %}
+            Through tomorrow only, the
+          {% else %}
+            For only {{ sitefundgoal_timeleft.days }} more days, the
+          {% endif %}
+        next ${{ this_match_remaining|floatformat:0|intcomma }} of support we receive will be matched thanks to Private Internet Access and a group of generous donors, including {{ sitefundgoal.random_providers }}!  <a href="/supporter/">Support Conservancy today!</a>
         {% endif %}
       </p>
 

www/conservancy/templates/sponsors.html

@@ -24,7 +24,6 @@ any of its sponsors.</p>
 
 <!-- logos should be 250x250 maximum. -->
 <ul id="sponsor">
-<li><a rel="nofollow" href="https://www.collabora.com/"><img src="/img/sponsors/collabora.png" height="42" width="250" alt="Collabora" /></a></li>
 <li><a rel="nofollow" href="https://google.com"><img src="/img/sponsors/google.png" height="76" width="238" alt="Google" /></a></li>
 <li><a rel="nofollow" href="https://joshtriplett.org"><img src="/img/sponsors/2018_Josh-Triplett.jpg" height="250" width="250" alt="Josh Triplett" /></a></li>
 <li><a rel="nofollow" href="https://www.linux.org.au/"><img src="/img/sponsors/linux-australia.png" alt="Linux Australia"></a></li>