website Changeset - caa0ff7b861d · Conservancy Kallithea

Changeset - caa0ff7b861d

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Ben Sturmfels (bsturmfels) - 2 months ago 2024-02-26 22:25:05
ben@sturm.com.au

Load JS through Django's staticfiles app

This avoids the need for adjustments during development and allows production to
be served under a single /static declaration in Apache.

3 files changed with 18 insertions and 16 deletions:

conservancy/static/sustainer/original-supporter-appeal.html

conservancy/templates/base_conservancy.html

conservancy/templates/supporter/index.html

0 comments (0 inline, 0 general)

conservancy/static/sustainer/original-supporter-appeal.html

➞

Show inline comments

 {% extends "base_conservancy.html" %}
 {% load static %}
 {% block subtitle %}Support Conservancy - {% endblock %}
 {% block category %}supporter{% endblock %}
 {% block head %}
-<script type="text/javascript" src="/js/supporter-page.js"></script>
+<script type="text/javascript" src="{% static 'js/supporter-page.js' %}"></script>
 <link href="/css/forms.css" rel="stylesheet" type="text/css"/>
 {% endblock %}
 {% block content %}
 <div class="donate-sidebar">
 <table style="background-color:#afe478;width:100%;">
@@ ... / @@ -18,33 +20,33 @@ @@
 <h3 class="donate-box-highlight">Become a Supporter Now:</h3>
 <p>Support us now!</p>
 <h4><a href="#annual"><span class="donate-box-highlight">Annual supporter</span> via PayPal, ACH, or credit card.</a></h4>
 <h4><a href="#monthly"><span class="donate-box-highlight">Monthly supporter</span> via PayPal, ACH, or credit card.</a></h4>
 <span class="donate-box-highlight">Other annual supporters methods:</span>
 <div class="toggle-unit">
-    <h4 class="toggle-control" data-text="Wire Transfer"
+    <h4 class="toggle-control" data-text="Wire Transfer"
     data-expanded-text="Wire Transfer:">Wire Transfer</h4>
     <div class="toggle-content">
        Contact <a href="mailto:accounting@sfconservancy.org">Conservancy
             by email</a><br/> for wire transfer instructions.<br/>
             Include  currency &amp; country.<br/>
     </div><!-- /.toggle-content -->
 </div><!-- /.toggle.unit -->
 <div class="toggle-unit">
-    <h4 class="toggle-control" data-text="Paper Check"
+    <h4 class="toggle-control" data-text="Paper Check"
     data-expanded-text="Paper Check:">Paper Check</h4>
     <div class="toggle-content">
     Send paper check for $120 to:<br/>
     Software Freedom Conservancy, Inc.<br/>
 MONTAGUE ST  STE 380<br/>
     BROOKLYN, NY 11201-3548 &nbsp; USA<br/>
-    Please write <q>SUPPORTER</q> and t-shirt size in memo line.
+    Please write <q>SUPPORTER</q> and t-shirt size in memo line.
     </div><!-- /.toggle-content -->
 </div><!-- /.toggle.unit -->
 <p><a href="/donate">Even More Ways to Donate</a></p>
 <!-- Flattr end -->
 </td></tr></table>
@@ ... / @@ -52,13 +54,13 @@ @@
 <div class="content-with-donate-sidebar">
 <p>Software Freedom Conservancy is an essential organization to free and
 open source software. We are the home of over
-<a href="/members/current/">30 projects</a> like
+<a href="/members/current/">30 projects</a> like
 <a href="http://git-scm.org">Git</a>,
 <a href="http://inkscape.org">Inkscape</a>, <a href="http://samba.org">Samba</a>,
 <a href="http://winehq.org">Wine</a>, <a href="http://www.seleniumhq.org/">Selenium</a>, the <a href="/copyleft-compliance/">GPL Compliance Project for Linux
 Developers</a>, <a href="http://pypy.org">PyPy</a> and
 <a href="http://sugarlabs.org/">Sugar Labs</a> just to name a few. Conservancy is a "fiscal sponsor plus",
 providing everything that our projects need in a nonprofit. We help our
@@ ... / @@ -85,19 +87,19 @@ way.</p> @@
 <li>we share our expertise across communities. We speak at many
 conferences, and publish materials to increase understanding about the
 organizational, community and legal issues around free and open source
 software. We advocate for free and open source software and provide
 education around that mission.  We form partnerships across our
-communities to work more effectively.  Check out <a
+communities to work more effectively.  Check out <a
 href="https://copyleft.org/">copyleft.org</a>
-or sign up to join the <a
+or sign up to join the <a
 href="/news/2014/aug/12/tax-exempt-working-group/">
 tax exempt working group</a>.</li>
-<li>we seek to solve problems for the public through free and open
+<li>we seek to solve problems for the public through free and open
 source
 software.  We've launched a <a href="https://npoacct.sfconservancy.org/">
 nonprofits accounting project</a> to help all
 nonprofits (in free software and in other fields) avoid paying millions
 of dollars in licensing fees for subpar accounting software.</li>
@@ ... @@
     called <cite><a href="http://faif.us">Free as in Freedom</a></cite> which
     discusses important legal and policy issues in open source and free
     software.</li></ul>
 <img class="appeal-footer" alt="*" src="/img/conservancy-supporter-heart.png"/>
-<p>As an organization, we try to do everything transparently; even
+<p>As an organization, we try to do everything transparently; even
 our
-<a
+<a
 href="https://gitorious.org/conservancy/policies/source/master:">
 internal policies</a> are published and available for scrutiny.</p>
 <p>Please <a href="#donate-box" class="donate-now">join our Supporter program</a> and spread software freedom!</p>
 <br clear="left"/>
@@ ... @@
                          <option name="os0" id="os0" value="LadiesXL">Ladies' XL</option>
                       </select><br/></span>
                       <label for="publicAck"><strong>
                           Should we <a href="/sponsors#supporters">list you publicly</a> as a Conservancy Supporter? </strong></label>
                       <input type="radio" checked="checked" name="on1" value="publicAckYes" />Yes
                       <input type="radio" name="on1" value="publicAckNo" />No<br/>
                       <label for="joinList"><strong>Join Conservancy's
                       Low-Traffic Announcement Email List? </strong></label>
                       <input type="radio" checked="checked" name="os1" value="joinListYes" />Yes
                       <input type="radio" name="os1" value="joinListNo" />No<br/>
                       <br />
                       <br /></div>

conservancy/templates/base_conservancy.html

➞

Show inline comments

@@ ... / @@ -12,14 +12,14 @@ @@
     <meta name="description" content="The Software Freedom Conservancy provides a non-profit home and services to Free, Libre and Open Source Software (FLOSS) projects." />
     <meta name="keywords" content="software, freedom, conservancy, open source, gnu, GNU, Open Source, Free and Open Source, Free and Open Source Software, FLOSS, FOSS, protect, protection, help, policy, linux, non-profit" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="/css/tachyons.css"/>
     <link rel="stylesheet" type="text/css" media="screen" href="/css/conservancy.css" />
     <link rel="stylesheet" type="text/css" media="(min-width: 67em)" href="/css/conservancy-bigscreen.css" />
     <script type="text/javascript" src="/js/jquery-1.7.2.js"></script>
     <script type="text/javascript" src="/js/conservancy.js"></script>
     <script type="text/javascript" src="{% static 'js/jquery-1.7.2.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/conservancy.js' %}"></script>
     {% block head %}{% endblock %}
   </head>
   <body class="conservancy-{% block category %}{% endblock %}">
     <header>
       <div class="flex-ns center mw8">

conservancy/templates/supporter/index.html

➞

Show inline comments

 {% extends "base_conservancy.html" %}
 {% load static %}
 {% block subtitle %}Support Conservancy - {% endblock %}
 {% block category %}sustainer{% endblock %}
 {% block head %}
-<script type="text/javascript" src="/js/supporter-page.js"></script>
+<script type="text/javascript" src="{% static 'js/supporter-page.js' %}"></script>
 <link href="/css/forms.css" rel="stylesheet" type="text/css"/>
 {% include "opengraph_partial.html" with url="/sustainer/" title="Support Conservancy!" description="Software freedom is critical to many of today&rsquo;s most pressing social issues, but it&rsquo;s only effective when FOSS is for everyone. Support Conservancy today to help make that happen!" %}
 {% include "opengraph_urllist_partial.html" with property='image' urls='' fallback='/img/conservancy-logo.png' %}
 {% endblock %}
 {% block content %}
@@ ... @@
 <h3 id="WritingAndSpeaking">Writing and Speaking</h3>
 <div data-read-more="Find out about our writing and speaking engagements&hellip;">
 <p>Our staff has been presenting and speaking about software freedom all year.
 Our Executive Director Karen Sandler received an honorary doctorate from
 Katholieke Universiteit Leuven for her incredible work in FOSS leadership, and
-her advocacy and pursuit of software freedom and rights for all.
+her advocacy and pursuit of software freedom and rights for all.
 In November she spoke at <a href="https://www.sfscon.it/talks/the-history-of-and-path-forward-for-copyleft-and-the-gpl/">SFSCON about "The History of, and Path forward for, Copyleft and the GPL"</a>.</p>
 <div class="picture-small right">
 <video class="small-right" controls="" poster="/videos/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate_still.png" id="doctorate_vid">
   <source src="/videos/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate.mp4">
   <track src="/docs/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate.en.txt" kind="subtitles" srclang="en" label="English" />

0 comments (0 inline, 0 general)