Skip to content

Commit

Permalink
About content updates cont. (#3932)
Browse files Browse the repository at this point in the history
* About content updates cont.

* new tab for everything

* remove bold

* update navitem url

* swapped lines
  • Loading branch information
Youri committed Nov 19, 2019
1 parent bf099fd commit cd68980
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 11 deletions.
@@ -1,17 +1,17 @@
{% load bg_nav_tags %}

{% with request.get_full_path as current_url %}
{% url 'how-to-use-view' as how_to_use_url %}
{% url 'why-view' as why_url %}
{% url 'how-to-use-view' as how_to_use_url %}
{% url 'min-security-view' as minimum_security_url %}
{% url 'methodology-view' as methodology_url %}
{% url 'contact-view' as contact_url %}
{% url 'press-view' as press_url %}

<div class="col-lg-3">
<div class="vertical-nav mt-5 pt-sm-2" id="multipage-nav">
<div class="multipage-link-wrapper"><a class="multipage-link {% bg_active_nav current_url how_to_use_url %}" href="{{ how_to_use_url }}">How to use this guide</a></div>
<div class="multipage-link-wrapper"><a class="multipage-link {% bg_active_nav current_url why_url %}" href="{{ why_url }}">Why we made this guide</a></div>
<div class="multipage-link-wrapper"><a class="multipage-link {% bg_active_nav current_url how_to_use_url %}" href="{{ how_to_use_url }}">How to use this guide</a></div>
<div class="multipage-link-wrapper"><a class="multipage-link {% bg_active_nav current_url minimum_security_url %}" href="{{ minimum_security_url }}">Minimum Security Standards explained</a></div>
<div class="multipage-link-wrapper"><a class="multipage-link {% bg_active_nav current_url methodology_url %}" href="{{ methodology_url }}">Methodology</a></div>
<div class="multipage-link-wrapper"><a class="multipage-link {% bg_active_nav current_url contact_url %}" href="{{ contact_url }}">Contact us</a></div>
Expand Down
Expand Up @@ -183,4 +183,12 @@ <h1 class="h2-heading">
</p>
</section>

<section aria-labelledby="further-reading">
<p id="further-reading"><b>Further reading</b></p>
<p class="body">
If you’d like to know how connected devices are created, and what could actually be done to make them better, check out Mozilla’s Internet Health Report special edition: <a
href="https://foundation.mozilla.org/en/privacy-included/" target="_blank">*Privacy Included: Rethinking the Smart Home</a>.
</p>
</section>

{% endblock %}
4 changes: 4 additions & 0 deletions network-api/networkapi/buyersguide/templates/about/press.html
Expand Up @@ -40,4 +40,8 @@ <h1 class="h2-heading">
</a>
</li>
</ul>

<p>
Seeking more background? Mozilla’s Internet Health Report have created a brief companion piece to our guide called <a href="https://foundation.mozilla.org/en/privacy-included/" target="_blank">*Privacy Included: Rethinking the Smart Home</a>.
</p>
{% endblock %}
Expand Up @@ -9,8 +9,7 @@ <h1 class="h2-heading">

<div class="why-we-made-intro mb-4">
<p class="body">
Welcome to <a href="https://foundation.mozilla.org/" target="_blank">Mozilla</a>’s third edition of our <em>*Privacy Not Included</em> buyer’s guide. Our goal is to help you shop
smart—and safe—for products that connect to the internet.
Welcome to the third edition of <a href="https://foundation.mozilla.org/" target="_blank">Mozilla’s</a> <em>*Privacy Not Included</em> buyer’s guide. Our goal is to help you shop smart—and safe—for products that connect to the internet.
</p>

<p class="body">
Expand Down Expand Up @@ -48,17 +47,24 @@ <h1 class="h2-heading">

<div class="why-we-made-outro">
<p class="body">
We hope you use and enjoy this guide to help you think about, shop for, and buy products from companies that show they value
privacy and security. We as consumers need to demand that value from the people who build our products. It’s how
we’ll start to make the internet, and our lives, a bit safer in this digital world. That is our goal every day here
at Mozilla.
We hope you use and enjoy this guide to help you think about, shop for, and buy products from companies that show they value privacy and security. If you want to dig deeper, our friends on Mozilla’s Internet Health Report team have created a companion to our buyer’s guide that explains what can be done to make things better. It’s called <a href="https://foundation.mozilla.org/en/privacy-included/" target="_blank">*Privacy Included: Rethinking the Smart Home</a>.
</p>

<p class="body">
We as consumers need to demand that value from the people who build our products. It’s how we’ll start to make the internet, and our lives, a bit safer in this digital world. That is our goal every day here at Mozilla.
</p>

<p class="body mb-4 pb-2">
Thank you! <br />
Thank you! <br>
The Team at Mozilla
</p>

<p class="body">
<em>
Mozilla fights daily for a healthier internet as a non-profit tech company that puts people before profit. This guide was created by the <a href="https://foundation.mozilla.org" target="_blank">Mozilla Foundation</a> which relies on <a href="https://donate.mozilla.org" target="_blank">donations</a> from people like you to do our work. You can also visit <a href="https://www.mozilla.org/" target="_blank">Mozilla.org</a> to learn more about our purpose driven products like Firefox and Common Voice.
</em>
</p>

<p class="body">
<em>
For any questions about the guide or to offer constructive feedback, please email <a href="mailto:jen@mozillafoundation.org">jen@mozillafoundation.org</a>
Expand Down
4 changes: 2 additions & 2 deletions network-api/networkapi/buyersguide/templates/bg_base.html
Expand Up @@ -80,8 +80,8 @@
{% url 'buyersguide-home' as home_url %}
<a class="{% bg_active_nav request.get_full_path home_url %}" href="{{ home_url }}">Home</a>
{% category_nav request.get_full_path category categories %}
{% url 'how-to-use-view' as how_to_use_url %}
<a class="{% bg_active_nav request.get_full_path how_to_use_url %}" href="{{ how_to_use_url }}">About the Guide</a>
{% url 'why-view' as why_url %}
<a class="{% bg_active_nav request.get_full_path why_url %}" href="{{ why_url }}">About the Guide</a>
</div>
</div>
</div>
Expand Down

0 comments on commit cd68980

Please sign in to comment.