From dbd01e8e7b6c96c174684f91a08a2c28464e051b Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn"
Date: Thu, 27 Dec 2018 16:54:49 -0800
Subject: [PATCH 1/3] Sponsors: Collabora is not a current sponsor of
Conservancy.
---
.../static/img/sponsors/collabora.png | Bin 7035 -> 0 bytes
www/conservancy/templates/sponsors.html | 1 -
2 files changed, 1 deletion(-)
delete mode 100644 www/conservancy/static/img/sponsors/collabora.png
diff --git a/www/conservancy/static/img/sponsors/collabora.png b/www/conservancy/static/img/sponsors/collabora.png
deleted file mode 100644
index a116862ea27fa9714c98b00b74b54d7f575bbc06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 7035
zcmV->8-(PEP)>K~#9!?LBu?)yUVAyvC!82(BVx#fn|AAT~fc(h;%OweRZw
zth;O5Vq@11Dk{^^_R@|M;;;Mg`%+Q`NVtP(aB^oGr4o`
zo!ce=2qA<}BodXDmcoW`d0_lSZJI!y~EYn&~EA%yvFDj|d^$!~~C+lhg$(?cPI&Xyq%LQq~_9v2rwKBL?(
zwfq@?ibTQz0|tVB4+s&25ODn9L0{TEn~7&&t3fe9
zX66gpjqFT1QN7NsfDj4=QV1c2;f&o$r5IVpFdV#n`-Z>|i6sIpI1bk=zQnk^dv~Th
zxLZVC5(MLJ6S`*cC2CF1%Thq=)OC8O)3hM6#(whIRuK<%od*x?j359(kT#>7Lx+5c
z>64sA(mN){TS@qeRXuw2AdWX!s0E%;@iEzLLo@H*75V!gq5e*vKB3&&e)3s2>rm>C
zHYe(<|Mv5B2;r6=uMm~RA8H|lBsma5g>1imc|1|Bt&uGBx&R@3`?`{-Idl9mgwSE~
zSqNdtM*)QJ(Y<%B(?jaT8kKgaKu{Ms1|g|v6IEWF@WAJGlLFms!bl-W_Ty|3Oi-np
zwSqkN?M!Kaph;)R#;(&t$Ppcs=y$fudF1Zh)MwA0ELyaTk*Yjw!yp6@0ssJlfQUFx
zT7$Hdf_=Z;R<8eV039=CECAs6@uSN3UZ$5o2qNM<&t3LBc+wUC;9(n1YqRgS+u+Lq
z0wDwd96tOPm&>EwQ(h2vn=o3<@^z->Q;fdY^r@7Tpa1sNtDI&z{bthZmoG}1Zc|wy
zBFnisWlif8;<|dVST2>+w|SLa#;m7E`V{_0iBi)<0
zM@-t;Q=yDszw(-~8IHp*IrXZlO2*qRUIRR54<^bo8AiLi(CY#KfaIPpuqzP~MpIMM
z!^0Z@keQj0l5&$q{bG@Pw##_{K*&GtY&Hr2@U#!dG04aO|LKORtPZ%jd1-5FQ)`|-
zDc-RunUNp9}PEoD2A(P(O7N&YcUZ
zs3=!9Z&)mrxAz<#kJs|vAKWe4v*Q+IV&i3N$4s{9(ekcN`8|rem<<4sN--4`R`{j*
z)t>1PAri^>e2z?p^&hOaefLzN-qS98{Z_LPW4bipUaOGE1O`#Q#3#C7sRXiSBB$8=p^3I%hp~^OiM2;c|hs&b%=4Ktr=W_z1Tmb-V
zvi8P}YuVX~U7XRT#4s!{Fn}m5UAm%aG`U%aHf@+5^-VkKn+72aiFW63SxxsA6ZJCn
zM*g|W44gH?BIE*POFVhx;ohAo>$XhzBpC?uL#{?D~p%Br^Gl%S9p_x-=61_wO#o
);
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
- Fiscal Year 2017 (from 2017-03-01 through 2018-02-28)
-
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 on 2018-07-16.
+ 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 on
+ 2019-01-15. They will be posted here shortly after filing.
- Fiscal Year 2016 (from 2016-03-01 through 2017-02-28)
From 742850eaf9d7957619b800ad24bd27f562e45fbf Mon Sep 17 00:00:00 2001
From: Brett Smith
Date: Tue, 8 Jan 2019 17:59:23 -0500
Subject: [PATCH 3/3] fundgoal: Display time remaining in progressbar.
---
www/conservancy/local_context_processors.py | 15 ++++++++++++++-
www/conservancy/templates/base_conservancy.html | 11 ++++++++++-
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/www/conservancy/local_context_processors.py b/www/conservancy/local_context_processors.py
index afbd5955..7b0f907d 100644
--- a/www/conservancy/local_context_processors.py
+++ b/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}
diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index 1e12166a..5efbd11e 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/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 — sign up now!
{% 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 }}! Support Conservancy today!
+ {% 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 }}! Support Conservancy today!
{% endif %}