website Changeset - 783cdc6189d5 · Conservancy Kallithea

Changeset - 783cdc6189d5

Parent rev.

Child rev.

[Not reviewed]

4 13 0

Ben Sturmfels (bsturmfels) - 24 days ago 2024-05-13 07:11:01
ben@sturm.com.au

Eliminate base_standard.html template and internalNavigate blocks

The base_standard.html template was an unnecessary level of template
inheritance.

Also removed unused `min` and `subtract` template tags.

17 files changed with 9 insertions and 77 deletions:

TODO.md

conservancy/content/fossy/index.html

conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html

conservancy/news/templatetags/min.py

conservancy/news/templatetags/subtract.py

conservancy/podjango/templates/podjango/frontpage.html

conservancy/static/css/conservancy.css

conservancy/templates/500.html

conservancy/templates/base_conservancy.html

conservancy/templates/base_error.html

conservancy/templates/base_news.html

conservancy/templates/base_standard.html

conservancy/templates/blog/query.html

conservancy/templates/feeds.html

conservancy/templates/supporters/banners.html

conservancy/templates/supporters/sustainers.html

conservancy/usethesource/templates/usethesource/base.html

0 comments (0 inline, 0 general)

TODO.md

➞

Show inline comments

@@ ... / @@ -4,11 +4,11 @@ @@
 * consider removing `events` and `worldmap` modules
 * ask Denver about why so many license files
 * serve a 400 in Apache for a hostname we don't explicitly support
 * replace `internalNavigate` with inline flexbox layout
 # Done
 * remove `internalNavigate`
 * add tests for main pages returning 200
 * move `SITE_FUNDGOAL` configuration to `settings.py`
 * move `sponsors.py` and `sponsors.html` into `supporters` app

conservancy/content/fossy/index.html

➞

Show inline comments

-{% extends "base_standard.html" %}
+{% extends "base_conservancy.html" %}
 {% load static %}
 {% block subtitle %}FOSSY - {% endblock %}
 {% block submenuselection %}FOSSY{% endblock %}

conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html

➞

Show inline comments

 {% load humanize %}
 {% load subtract %}
 {% if sitefundgoal.days_remaining >= -7 %}{# i.e. 7 days over completion #}
   <div class="fundraiser-top-text ph3 pt2 pb3 mb2 mb3-ns">

conservancy/news/templatetags/min.py

➞

Show inline comments

deleted file

conservancy/news/templatetags/subtract.py

➞

Show inline comments

deleted file

conservancy/podjango/templates/podjango/frontpage.html

➞

Show inline comments

@@ ... / @@ -7,8 +7,6 @@ @@
 {% endblock %}
 {% block content %}
 <div class="singleColumn">
 <h1>{{ podcast.title }}</h1>
 {{ podcast.long_description|safe }}
@@ ... / @@ -31,5 +29,4 @@ @@
 </div>
 {% endfor %}
 <p><a href="{% url 'podjango:cast' podcast_slug=podcast.slug %}">All oggcasts&hellip;</a></p>
 </div>
 {% endblock %}

conservancy/static/css/conservancy.css

➞

Show inline comments

@@ ... / @@ -2,7 +2,6 @@ @@
 img { border: 0; }
 body { margin: 0; padding: 0; }
 .clear { clear: both; }
 .hidden { display: none; }
 p, h1, h2, h3, h4, h5, h6, #mainContent ul, #mainContent ol {
   /* margin-top: 1em; */
@@ ... / @@ -161,10 +160,6 @@ h3 { margin-top: .6em; margin-bottom: .4em; } @@
 #mainContent ul, #mainContent ol { padding-left: 1.5em; }
 .internalNavigate { width: 19%; float: right; }
 #mainContent .internalNavigate ul { list-style-type: none; padding-left: 0; }
 .internalNavigate ul li { margin-top: .3em; margin-bottom: .3em; }
 /* Header */
 body > header {

conservancy/templates/500.html

➞

Show inline comments

-{% extends "base_error.html" %}
+{% extends "base_conservancy.html" %}
 {% block content %}
 <h1>500 Error</h1>

conservancy/templates/base_conservancy.html

➞

Show inline comments

 {% load min %}
 {% load static %}
 <!DOCTYPE html>
 <html lang="en" prefix="og: http://ogp.me/ns#">
   <head>
     <title>{% block title %}{% block subtitle %}{% endblock %}Software Freedom Conservancy{% endblock %}</title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />

conservancy/templates/base_error.html

➞

Show inline comments

deleted file

conservancy/templates/base_news.html

➞

Show inline comments

-{% extends "base_standard.html" %}
+{% extends "base_conservancy.html" %}
 {% block category %}News{% endblock %}

conservancy/templates/base_standard.html

➞

Show inline comments

deleted file

conservancy/templates/blog/query.html

➞

Show inline comments

@@ ... / @@ -2,29 +2,6 @@ @@
 {% block subtitle %}Conservancy Blog Query - {% endblock %}
 {% block head %}
 <script type="text/javascript">
 window.addEventListener('DOMContentLoaded', function() {
     function my_display (sel, b) {
         if (b) { sel.slideDown(); }
         else { sel.slideUp(); }
+    }
     function my_display_instantly (sel, b) {
         if (b) { sel.show(); }
         else { sel.hide(); }
+    }
     $("#all_authors").click(function () {
         my_display($("#authors"), !this.checked);
     });
     $("#all_tags").click(function () {
         my_display($("#tags"), !this.checked);
     });
     my_display_instantly($("#authors"), !$("#all_authors").attr("checked"));
     my_display_instantly($("#tags"), !$("#all_tags").attr("checked"));
 });
 </script>
 <style type="text/css">
 div.query_indent { padding-left: 2em; }
 div.query_indent table tr td { padding-right: 3em; padding-bottom: .3em; }
@@ ... @@
 {% endblock %}
 {% block content %}
 <form>
 <p>Return posts written by any of these authors...</p>
@@ ... @@
 <p><input type="submit" value="View RSS feed" name="rss"/></p>
 </form>
 {% endblock %}
 {# get rid of side bar #}
 {% block internal_navigate %}{% endblock %}

conservancy/templates/feeds.html

➞

Show inline comments

-{% extends "base_standard.html" %}
+{% extends "base_conservancy.html" %}
 {% block subtitle %}News Feeds - {% endblock %}

conservancy/templates/supporters/banners.html

➞

Show inline comments

@@ ... / @@ -5,7 +5,6 @@ @@
 {% block category %}sustainer{% endblock %}
 {% block content %}
 <div class="singleColumn">
 <h2>Conservancy Sustainer Banners</h2>
 <p>Help support Conservancy even more by sharing a banner on your own page and encourage other people to join you!  We have banners for individuals and member projects below; just copy the code for the version you want into your own site.</p>
@@ ... / @@ -51,6 +50,4 @@ @@
               Please donate to them today to support community-driven free software projects!"
   </a>
 </div>
 </div>
 {% endblock %}

conservancy/templates/supporters/sustainers.html

➞

Show inline comments

@@ ... / @@ -6,6 +6,9 @@ @@
 {% block head %}
 <script type="text/javascript" src="{% static 'js/supporter-page.js' %}" defer></script>
 <link href="{% static 'css/forms.css' %}" rel="stylesheet" type="text/css"/>
 <style>
   .hidden { display: none; }
 </style>
 {% 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='/static/img/conservancy-logo.png' %}
 {% endblock %}

conservancy/usethesource/templates/usethesource/base.html

➞

Show inline comments

-{% extends "base_standard.html" %}
+{% extends "base_conservancy.html" %}
 {% load static %}

0 comments (0 inline, 0 general)