jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not override "content" block in content.html template

Browse source
This commit is contained in:
Yohan Boniface 2016-06-29 17:20:47 +02:00
parent a1676d56ca
commit a34d163449
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
umap/templates/auth/user_detail.html
View file

@ -2,7 +2,7 @@
{% load i18n %} {% load i18n %}
{% block content %} {% block maincontent %}
<div class="col wide"> <div class="col wide">
<h2 class="section">{% blocktrans %}Browse {{ current_user }}'s maps{% endblocktrans %}</h2> <h2 class="section">{% blocktrans %}Browse {{ current_user }}'s maps{% endblocktrans %}</h2>
</div> </div>
@ -17,4 +17,4 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% endblock content %} {% endblock maincontent %}

4
umap/templates/umap/about.html
View file

@ -1,5 +1,5 @@
{% extends "umap/content.html" %} {% extends "umap/content.html" %}
{% block content %} {% block maincontent %}
{% include "umap/about_summary.html" %} {% include "umap/about_summary.html" %}
{% endblock content %} {% endblock maincontent %}

2
umap/templates/umap/content.html
View file

@ -18,6 +18,8 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% block maincontent %}
{% endblock maincontent %}
{% endblock content %} {% endblock content %}
{% block bottom_js %} {% block bottom_js %}

4
umap/templates/umap/home.html
View file

@ -2,7 +2,7 @@
{% load leaflet_storage_tags i18n %} {% load leaflet_storage_tags i18n %}
{% block content %} {% block maincontent %}
{% include "umap/search_bar.html" %} {% include "umap/search_bar.html" %}
{% if DEMO_SITE %} {% if DEMO_SITE %}
<div class="wrapper demo-instance-warning"> <div class="wrapper demo-instance-warning">
@ -27,4 +27,4 @@
</div> </div>
</div> </div>
{% endblock content %} {% endblock maincontent %}

4
umap/templates/umap/search.html
View file

@ -2,7 +2,7 @@
{% load i18n %} {% load i18n %}
{% block content %} {% block maincontent %}
{% include "umap/search_bar.html" %} {% include "umap/search_bar.html" %}
{% if q %} {% if q %}
<div class="wrapper"> <div class="wrapper">
@ -15,4 +15,4 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% endblock content %} {% endblock maincontent %}