Skip to content

Commit

Permalink
Merge 6c651be into e7f2574
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmmavis
mmmavis committed Aug 19, 2019
2 parents e7f2574 + 6c651be commit a6257b0
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -76,7 +76,7 @@ For more information on how to run the project with Docker, check the [local dev

## Mozilla Festival

The fake data generator can generate a site structure for the Mozilla Festival that can be served under it's own domain, or in the case of review apps on Heroku, where we're limited to a single domain, as a sub-directory of the main foundation site, at `{review_app_host}/en/mozilla-festival`.
The fake data generator can generate a site structure for the Mozilla Festival that can be served under it's own domain, or in the case of review apps on Heroku, where we're limited to a single domain, as a sub-directory of the main foundation site, at `{review_app_host}/mozilla-festival`.

In order to access the Mozilla Festival site locally on a different domain than the main Foundation site, you'll need to edit your hosts file (`/etc/hosts` on *nix systems, `C:\Windows\System32\Drivers\etc\hosts` on Windows) to allow you to access the site at `mozillafestival.localhost:8000`. To enable this, add the following line to your hosts file: `127.0.0.1 mozillafestival.localhost`

Expand Down
2 changes: 1 addition & 1 deletion network-api/networkapi/buyersguide/templates/buyersguide_home.html
View file
Expand Up @@ -62,7 +62,7 @@ <h1 class="h1-heading text-center mt-4">Be Smart. Shop Safe.</h1>
{% endif %}
{% endif %}

<a class="product-image text-center mt-4 h-100 d-flex flex-column justify-content-between" href="/en/privacynotincluded/products/{{ product.slug }}">
<a class="product-image text-center mt-4 h-100 d-flex flex-column justify-content-between" href="{% url 'product-view' product.slug %}">
{% if USE_CLOUDINARY %}
<img
class="product-thumbnail"
Expand Down
2 changes: 1 addition & 1 deletion network-api/networkapi/buyersguide/templates/category_page.html
View file
Expand Up @@ -19,7 +19,7 @@ <h1 class="h2-heading">{{ category.name }}</h1>
<div class="row">
{% for product in products %}
<div class="category-item-container col-6 {% if product.draft %} draft-product{% endif %}{% if product.adult_content %} adult-content{% endif %}">
<a href="/en/privacynotincluded/products/{{ product.slug }}">
<a href="{% url 'product-view' product.slug %}">
<div class="category-image-container">
{% include "fragments/seal-of-approval.html" with product=product %}
{% include "fragments/adult-content-badge.html" with product=product %}
Expand Down
2 changes: 1 addition & 1 deletion network-api/networkapi/buyersguide/templates/primary_nav.html
View file
Expand Up @@ -30,7 +30,7 @@ <h3 class="h2-heading">Help us keep the Internet healthy</h3>
<div class="d-flex align-items-center py-3 logo-section">
<a href="/" class="moz-logo mb-0 mr-3"><span class="sr-only">Mozilla</span></a>
<p class="mb-0 h3-heading flex-wrap">
<a class="link-back" href="/en/privacynotincluded">*privacy not included</a>
<a class="link-back" href="{% url 'buyersguide-home' %}">*privacy not included</a>
</p>
</div>
{% include "./social.html" %}
Expand Down
4 changes: 2 additions & 2 deletions network-api/networkapi/buyersguide/templates/product_page.html
View file
Expand Up @@ -59,7 +59,7 @@ <h2 class="h1-heading col-md-10">{{product.name}}</h2>
<div id="product-research" class="mt-5">
<div class="mb-5 d-flex flex-column flex-sm-row align-items-sm-center">
<h3 class="h5-heading d-inline-block mb-2 mb-sm-0 mr-3">Our Research</h3>
<a href="/en/privacynotincluded/about" class="info-help">How to use this guide</a>
<a href="{% url 'about-view' %}" class="info-help">How to use this guide</a>
</div>

<h3 class="h3-heading">Can it spy on me</h3>
Expand Down Expand Up @@ -158,7 +158,7 @@ <h3 class="h2-heading mb-4">Compare products</h3>
<div class="row">
{% for product in product.related_products %}
<div class="related-product col-6 col-md-3 mb-3 mb-md-0">
<a class="d-block{% if product.adult_content %} adult-content{% endif %}" href="/en/privacynotincluded/products/{{ product.slug }}">
<a class="d-block{% if product.adult_content %} adult-content{% endif %}" href="{% url 'product-view' product.slug %}">
{% if USE_CLOUDINARY %}
<img class="product-thumbnail thumb-border"
width="300"
Expand Down
22 changes: 11 additions & 11 deletions network-api/networkapi/mozfest/templates/mozfest/404.html
View file
Expand Up @@ -21,14 +21,14 @@
<div class="row">
<div class="col">
<div class="nav-links pt-3">
<div><a class="active" href="https://www.mozillafestival.org/en/">Home</a></div>
<div><a class="" href="https://www.mozillafestival.org/en/spaces/">Spaces</a>
<div><a class="active" href="https://www.mozillafestival.org/">Home</a></div>
<div><a class="" href="https://www.mozillafestival.org/spaces/">Spaces</a>
</div>
<div><a class="" href="https://www.mozillafestival.org/en/team/">Team</a></div>
<div><a class="" href="https://www.mozillafestival.org/en/tickets/">Tickets</a>
<div><a class="" href="https://www.mozillafestival.org/team/">Team</a></div>
<div><a class="" href="https://www.mozillafestival.org/tickets/">Tickets</a>
</div>
<div><a class=""
href="https://www.mozillafestival.org/en/sponsors/">Sponsors</a></div>
href="https://www.mozillafestival.org/sponsors/">Sponsors</a></div>
</div>
</div>
</div>
Expand All @@ -47,13 +47,13 @@
<div class="burger-bar burger-bar-middle"></div>
<div class="burger-bar burger-bar-bottom"></div>
</button>
<a class="logo text-hide" href="https://www.mozillafestival.org/en/">Home</a>
<a class="logo text-hide" href="https://www.mozillafestival.org/">Home</a>
<div class="wide-screen-menu">
<div class="nav-links d-none d-lg-block">
<a class="" href="https://www.mozillafestival.org/en/spaces/">Spaces</a>
<a class="" href="https://www.mozillafestival.org/en/team/">Team</a>
<a class="" href="https://www.mozillafestival.org/en/tickets/">Tickets</a>
<a class="" href="https://www.mozillafestival.org/en/sponsors/">Sponsors</a>
<a class="" href="https://www.mozillafestival.org/spaces/">Spaces</a>
<a class="" href="https://www.mozillafestival.org/team/">Team</a>
<a class="" href="https://www.mozillafestival.org/tickets/">Tickets</a>
<a class="" href="https://www.mozillafestival.org/sponsors/">Sponsors</a>
</div>
</div>
</div>
Expand All @@ -74,4 +74,4 @@
<div class="py-4 my-4">
{% include "partials/404.html" with email="info@mozillafestival.org" %}
</div>
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion network-api/networkapi/utility/middleware.py
View file
Expand Up @@ -37,7 +37,7 @@ def __call__(self, request):
redirect_url = '{protocol}://{hostname}{path}'.format(
protocol=protocol,
hostname=hostnames[0],
path='/en/mozfest/'
path='/mozfest/'
)

return HttpResponseTemporaryRedirect(redirect_url)
Expand Down

0 comments on commit a6257b0

Please sign in to comment.