Commit aefea1db authored by Giuseppe Terrasi's avatar Giuseppe Terrasi

- change sidebar_upper and sidebar_lower position in homepage
- remove sidebar_upper and sidebar_lower from question.html and questions.html
parents 7c0e8ac6 ee961ba5
...@@ -18,20 +18,8 @@ ...@@ -18,20 +18,8 @@
</style> </style>
{% endblock %} {% endblock %}
{% block sidebar %} {% block sidebar %}
{% if not request.user.is_authenticated %}
{% if settings.SHOW_WELCOME_BOX %}
<div class="boxA">
<h3>{% trans "welcome to " %}{{ settings.APP_SHORT_NAME }}</h3>
<div class="body">
{{ settings.APP_INTRO|safe }}
<div class="more"><a href="{% url about %}">{% trans "about" %} </a></div>
<div class="more"><a href="{% url faq %}">{% trans "faq" %} </a></div>
</div>
</div>
{% endif %}
{% endif %}
{% include "question_list/count.html" %}
{% sidebar_upper %} {% sidebar_upper %}
{% include "question_list/count.html" %}
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
{% tag_selector %} {% tag_selector %}
{% endif %} {% endif %}
......
...@@ -284,8 +284,6 @@ ...@@ -284,8 +284,6 @@
{% markdown_help %} {% markdown_help %}
{% sidebar_upper %}
{% cache 60 questions_tags settings.APP_URL question.id %} {% cache 60 questions_tags settings.APP_URL question.id %}
<div class="boxC"> <div class="boxC">
<p> <p>
...@@ -310,7 +308,6 @@ ...@@ -310,7 +308,6 @@
</p> </p>
</div> </div>
{% endcache %} {% endcache %}
{% sidebar_lower %}
<div class="boxC"> <div class="boxC">
<h3 class="subtitle">{% trans "Related questions" %}</h3> <h3 class="subtitle">{% trans "Related questions" %}</h3>
<div class="questions-related"> <div class="questions-related">
......
...@@ -40,9 +40,7 @@ ...@@ -40,9 +40,7 @@
{% block sidebar %} {% block sidebar %}
{% include "question_list/count.html" %} {% include "question_list/count.html" %}
{% sidebar_upper %}
{% tag_selector %} {% tag_selector %}
{% sidebar_lower %}
{% question_list_related_tags questions.paginator.page %} {% question_list_related_tags questions.paginator.page %}
{% endblock %} {% endblock %}
......
Markdown is supported
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