heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some small bits in base.html.

Browse Source 
1. Add a trailing slash to the mediagoblin.org URL.
   (The string changed anyway, so translations are not
   affected more than already.)
2. Order was wrong for those two at the end (old version):
     {% endblock mediagoblin_body %}
     </div>
3. Fix some little indenting issues.
4. Remove some useless space from the output.
This commit is contained in:
Elrond 2013-02-19 17:14:13 +01:00
parent 0c8073a3a3
commit 155438cdc1
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mediagoblin/templates/mediagoblin/base.html
View File

@ -48,7 +48,7 @@
{%- include "mediagoblin/bits/logo.html" -%} {%- include "mediagoblin/bits/logo.html" -%}
{% block mediagoblin_header_title %}{% endblock %} {% block mediagoblin_header_title %}{% endblock %}
<div class="header_right"> <div class="header_right">
{% if request.user %} {%- if request.user %}
{% if request.user and request.user.status == 'active' %} {% if request.user and request.user.status == 'active' %}
<div class="button_action header_dropdown_down">&#9660;</div> <div class="button_action header_dropdown_down">&#9660;</div>
<div class="button_action header_dropdown_up">&#9650;</div> <div class="button_action header_dropdown_up">&#9650;</div>
@ -60,11 +60,12 @@
{% trans %}Verify your email!{% endtrans %}</a> {% trans %}Verify your email!{% endtrans %}</a>
or <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a> or <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>
{% endif %} {% endif %}
{% else %} {%- else %}
<a href="{{ request.urlgen('mediagoblin.auth.login') }}?next={{ <a href="{{ request.urlgen('mediagoblin.auth.login') }}?next={{
request.base_url|urlencode }}"> request.base_url|urlencode }}">
{% trans %}Log in{% endtrans %}</a> {%- trans %}Log in{% endtrans -%}
{% endif %} </a>
{%- endif %}
</div> </div>
<div class="clear"></div> <div class="clear"></div>
{% if request.user and request.user.status == 'active' %} {% if request.user and request.user.status == 'active' %}
@ -113,17 +114,17 @@
{% block mediagoblin_content %} {% block mediagoblin_content %}
{% endblock mediagoblin_content %} {% endblock mediagoblin_content %}
</div> </div>
{% block mediagoblin_footer %} {%- block mediagoblin_footer %}
<footer> <footer>
{% trans -%} {% trans -%}
Powered by <a href="http://mediagoblin.org" title='Version {{ version }}'>MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project. Powered by <a href="http://mediagoblin.org/" title='Version {{ version }}'>MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project.
{%- endtrans %} {%- endtrans %}
{% trans source_link=app_config['source_link'] -%} {% trans source_link=app_config['source_link'] -%}
Released under the <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPL</a>. <a href="{{ source_link }}">Source code</a> available. Released under the <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPL</a>. <a href="{{ source_link }}">Source code</a> available.
{%- endtrans %} {%- endtrans %}
</footer> </footer>
{% endblock mediagoblin_footer %} {%- endblock mediagoblin_footer %}
{% endblock mediagoblin_body %}
</div> </div>
{%- endblock mediagoblin_body %}
</body> </body>
</html> </html>