Commit b89f7160 authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

Merge branch 'feature/new-template-merchandise' into 'master'

Migrate merchandise to new template

Closes #713

See merge request !971
parents 6ddc3c3f cc572623
{% extends 'old-base.html' %}
{% extends 'base.html' %}
{% load staticfiles %}
{% load i18n %}
......@@ -6,26 +6,27 @@
{% block opengraph_title %}{% trans "Merchandise" %} — {{ block.super }}{% endblock %}
{% block body %}
<h1>{% trans "Merchandise" %}</h1>
<section class="page-section">
<div class="container">
<h1 class="text-center section-title">{% trans "Merchandise" %}</h1>
<p class="text-center">{% trans "Below you can find all the merchandise Thalia has available. During every lunch break, the merchandise is for sale in the board room (M1.0.08). Outside those hours, please make an appointment or approach the board over drinks." %}</p
<p class="text-center">{% trans "Below you can find all the merchandise Thalia has available. During every lunch break, the merchandise is for sale in the board room (M1.0.08). Outside those hours, please make an appointment or approach the board over drinks." %}</p>
{% for item in items %}
{% for item in items %}
<hr />
<hr class="separator">
<div class="post" id="item">
<div class="row">
<div class="span3" id="merchandise-image">
<img src="{{ item.image.url }}" alt="" id="image">
<div class="col-12 col-md-3">
<img src="{{ item.image.url }}" alt="{{ item.name }}" id="image">
</div>
<div class="span9" id="merchandise-text">
<h1 id="merchandise-title">{{ item.name }}</h1>
<p id="merchandise-desc">{{ item.description }}</p>
<div id="merchandise-price">{% blocktrans with price=item.price %}Price: € {{ price }}{% endblocktrans %}</div>
<div class="col-12 col-md-9 pt-4 pt-md-0">
<h2>{{ item.name }}</h2>
<p>{{ item.description }}</p>
<p class="mb-0">{% blocktrans with price=item.price %}Price: €
{{ price }}{% endblocktrans %}</p>
</div>
</div>
</div>
{% endfor %}
{% endfor %}
</div>
</section>
{% endblock %}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment