From 587e508b6fe7acde3c23c5a3d87afb0ef436225d Mon Sep 17 00:00:00 2001 From: Daniel Pono Takamori Date: Tue, 19 Oct 2021 05:47:58 -0700 Subject: [PATCH] add /press and make that kit page fix urls for press and learn start work on new news partial submenu --- www/conservancy/static/press/index.html | 10 ++++++++++ www/conservancy/static/press/inthenews.html | 17 +++++++++++++++++ www/conservancy/templates/base_conservancy.html | 2 +- www/conservancy/templates/base_learn.html | 2 +- www/conservancy/templates/base_press.html | 2 +- .../templates/news/pressrelease_detail.html | 9 +++++++++ .../templates/news/pressrelease_list.html | 2 +- .../templates/submenus/learn_partial.html | 2 +- .../templates/submenus/news_partial.html | 2 +- .../templates/submenus/press_partial.html | 5 +++++ www/conservancy/urls.py | 2 ++ 11 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 www/conservancy/static/press/inthenews.html create mode 100644 www/conservancy/templates/submenus/press_partial.html diff --git a/www/conservancy/static/press/index.html b/www/conservancy/static/press/index.html index 9ecee0cc..4741bb1b 100644 --- a/www/conservancy/static/press/index.html +++ b/www/conservancy/static/press/index.html @@ -12,4 +12,14 @@ non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."

+

Here's a collection of documents (collated and individual) for distribution + and reference.

+ +

Full Press Kit

+

Press Release

+

Glossary

+

Q&A

+

Quotes

+ + {% endblock %} diff --git a/www/conservancy/static/press/inthenews.html b/www/conservancy/static/press/inthenews.html new file mode 100644 index 00000000..5692f754 --- /dev/null +++ b/www/conservancy/static/press/inthenews.html @@ -0,0 +1,17 @@ +{% extends "base_press.html" %} +{% block subtitle %}Press - {% endblock %} +{% block submenuselection %}Press{% endblock %} +{% block content %} +

Related News Stories

+ +

Here are some news articles related to the work that we do. If you have any + suggestions for pieces you think our sustainers would be interested in, + please send an email to info@sfconservancy.org.

+ +

Right to Repair

+ +

Vice - John Deere–Backed Lobbying Groups Host Anti-Right to Repair Conference

+ + + +{% endblock %} diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html index 742d584f..7b560c59 100644 --- a/www/conservancy/templates/base_conservancy.html +++ b/www/conservancy/templates/base_conservancy.html @@ -75,7 +75,7 @@
  • Who we are {% include 'submenus/who_we_are_partial.html' %}
    • -
  • Learn +
  • Learn {% include 'submenus/learn_partial.html' %}
  • News diff --git a/www/conservancy/templates/base_learn.html b/www/conservancy/templates/base_learn.html index a883f688..d782df20 100644 --- a/www/conservancy/templates/base_learn.html +++ b/www/conservancy/templates/base_learn.html @@ -7,7 +7,7 @@

    Resources for Journalists

    diff --git a/www/conservancy/templates/base_press.html b/www/conservancy/templates/base_press.html index 7d05e0dc..f3be5c07 100644 --- a/www/conservancy/templates/base_press.html +++ b/www/conservancy/templates/base_press.html @@ -16,7 +16,7 @@

    Resources for Journalists

    diff --git a/www/conservancy/templates/news/pressrelease_detail.html b/www/conservancy/templates/news/pressrelease_detail.html index 90ac7fcf..93cc22b0 100644 --- a/www/conservancy/templates/news/pressrelease_detail.html +++ b/www/conservancy/templates/news/pressrelease_detail.html @@ -8,6 +8,15 @@ {% block subtitle %}{{ object.headline|striptags|safe }} - {% endblock %} +{% block outercontent %} +
    + +
    +{% endblock %} + {% block content %}
    diff --git a/www/conservancy/templates/news/pressrelease_list.html b/www/conservancy/templates/news/pressrelease_list.html index 0c4c1e15..17ef2772 100644 --- a/www/conservancy/templates/news/pressrelease_list.html +++ b/www/conservancy/templates/news/pressrelease_list.html @@ -11,7 +11,7 @@

    Resources for Journalists

    diff --git a/www/conservancy/templates/submenus/learn_partial.html b/www/conservancy/templates/submenus/learn_partial.html index 014f8ceb..62ba58c4 100644 --- a/www/conservancy/templates/submenus/learn_partial.html +++ b/www/conservancy/templates/submenus/learn_partial.html @@ -1,5 +1,5 @@ diff --git a/www/conservancy/templates/submenus/news_partial.html b/www/conservancy/templates/submenus/news_partial.html index 8bc2bfcf..5f84fb0b 100644 --- a/www/conservancy/templates/submenus/news_partial.html +++ b/www/conservancy/templates/submenus/news_partial.html @@ -1,6 +1,6 @@ diff --git a/www/conservancy/templates/submenus/press_partial.html b/www/conservancy/templates/submenus/press_partial.html new file mode 100644 index 00000000..3f5d87c8 --- /dev/null +++ b/www/conservancy/templates/submenus/press_partial.html @@ -0,0 +1,5 @@ + diff --git a/www/conservancy/urls.py b/www/conservancy/urls.py index 304027fb..3a94533e 100644 --- a/www/conservancy/urls.py +++ b/www/conservancy/urls.py @@ -47,6 +47,8 @@ urlpatterns = [ url(r'^donate', static_views.index), url(r'^copyleft-compliance', static_views.index, {'fundraiser_sought' : 'vmware-match-0'}), + url(r'^learn', static_views.index), + url(r'^press', static_views.index), url(r'^projects', static_views.index), url(r'^npoacct', static_views.index, {'fundraiser_sought' : 'npoacct'}),