diff --git a/TODO.md b/TODO.md index 8cee694f..b79ae1f6 100644 --- a/TODO.md +++ b/TODO.md @@ -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 diff --git a/conservancy/content/fossy/index.html b/conservancy/content/fossy/index.html index 36894bcb..be08a33e 100644 --- a/conservancy/content/fossy/index.html +++ b/conservancy/content/fossy/index.html @@ -1,4 +1,4 @@ -{% extends "base_standard.html" %} +{% extends "base_conservancy.html" %} {% load static %} {% block subtitle %}FOSSY - {% endblock %} {% block submenuselection %}FOSSY{% endblock %} diff --git a/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html b/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html index f501b417..c2bec366 100644 --- a/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html +++ b/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html @@ -1,5 +1,4 @@ {% load humanize %} -{% load subtract %} {% if sitefundgoal.days_remaining >= -7 %}{# i.e. 7 days over completion #}
diff --git a/conservancy/news/templatetags/min.py b/conservancy/news/templatetags/min.py deleted file mode 100644 index 632d8369..00000000 --- a/conservancy/news/templatetags/min.py +++ /dev/null @@ -1,9 +0,0 @@ -from django import template - -register = template.Library() - -@register.filter -def min(value, arg): - if value > arg: - return arg - return value diff --git a/conservancy/news/templatetags/subtract.py b/conservancy/news/templatetags/subtract.py deleted file mode 100644 index 111daffc..00000000 --- a/conservancy/news/templatetags/subtract.py +++ /dev/null @@ -1,7 +0,0 @@ -from django import template - -register = template.Library() - -@register.filter -def subtract(value, arg): - return value - arg diff --git a/conservancy/podjango/templates/podjango/frontpage.html b/conservancy/podjango/templates/podjango/frontpage.html index 8711c224..1d6bda35 100644 --- a/conservancy/podjango/templates/podjango/frontpage.html +++ b/conservancy/podjango/templates/podjango/frontpage.html @@ -7,8 +7,6 @@ {% endblock %} {% block content %} -
-

{{ podcast.title }}

{{ podcast.long_description|safe }} @@ -31,5 +29,4 @@
{% endfor %}

All oggcasts…

-
{% endblock %} diff --git a/conservancy/static/css/conservancy.css b/conservancy/static/css/conservancy.css index 17101a5d..51d982b5 100644 --- a/conservancy/static/css/conservancy.css +++ b/conservancy/static/css/conservancy.css @@ -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 { diff --git a/conservancy/templates/500.html b/conservancy/templates/500.html index 66fb0d23..d55e1c1c 100644 --- a/conservancy/templates/500.html +++ b/conservancy/templates/500.html @@ -1,4 +1,4 @@ -{% extends "base_error.html" %} +{% extends "base_conservancy.html" %} {% block content %}

500 Error

diff --git a/conservancy/templates/base_conservancy.html b/conservancy/templates/base_conservancy.html index 3d2050a8..4b19de32 100644 --- a/conservancy/templates/base_conservancy.html +++ b/conservancy/templates/base_conservancy.html @@ -1,10 +1,7 @@ -{% load min %} {% load static %} - - {% block title %}{% block subtitle %}{% endblock %}Software Freedom Conservancy{% endblock %} diff --git a/conservancy/templates/base_error.html b/conservancy/templates/base_error.html deleted file mode 100644 index cdec6c66..00000000 --- a/conservancy/templates/base_error.html +++ /dev/null @@ -1 +0,0 @@ -{% extends "base_standard.html" %} diff --git a/conservancy/templates/base_news.html b/conservancy/templates/base_news.html index 8dd263c9..7c10afd1 100644 --- a/conservancy/templates/base_news.html +++ b/conservancy/templates/base_news.html @@ -1,4 +1,4 @@ -{% extends "base_standard.html" %} +{% extends "base_conservancy.html" %} {% block category %}News{% endblock %} diff --git a/conservancy/templates/base_standard.html b/conservancy/templates/base_standard.html deleted file mode 100644 index ec00f645..00000000 --- a/conservancy/templates/base_standard.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "base_conservancy.html" %} - -{% block outercontent %} -
-
-{% block internal_navigate %}{% endblock %} -
- -
{% block content %}{% endblock %}
-
-{% endblock %} diff --git a/conservancy/templates/blog/query.html b/conservancy/templates/blog/query.html index 923a359e..04bbb5b2 100644 --- a/conservancy/templates/blog/query.html +++ b/conservancy/templates/blog/query.html @@ -2,29 +2,6 @@ {% block subtitle %}Conservancy Blog Query - {% endblock %} {% block head %} - {% include "opengraph_partial.html" with url="/sustainer/" title="Support Conservancy!" description="Software freedom is critical to many of today’s most pressing social issues, but it’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 %} diff --git a/conservancy/usethesource/templates/usethesource/base.html b/conservancy/usethesource/templates/usethesource/base.html index 07bbf245..b498d862 100644 --- a/conservancy/usethesource/templates/usethesource/base.html +++ b/conservancy/usethesource/templates/usethesource/base.html @@ -1,4 +1,4 @@ -{% extends "base_standard.html" %} +{% extends "base_conservancy.html" %} {% load static %}