Use the new logo.html thingy in airy.

This commit is contained in:
Elrond 2012-12-16 14:08:38 +01:00
parent 17dcc3ae4f
commit 56cf9f5ff1
2 changed files with 25 additions and 98 deletions

View File

@ -1,98 +0,0 @@
{#
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#}
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}{{ app_config['html_title'] }}{% endblock %}</title>
<link rel="stylesheet" type="text/css"
href="{{ request.staticdirect('/css/extlib/reset.css') }}"/>
<link rel="stylesheet" type="text/css"
href="{{ request.staticdirect('/css/base.css') }}"/>
<link rel="shortcut icon"
href="{{ request.staticdirect('/images/goblin.ico') }}" />
<script src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script>
<!--[if lt IE 9]>
<script src="{{ request.staticdirect('/js/extlib/html5shiv.js') }}"></script>
<![endif]-->
{% include "mediagoblin/extra_head.html" %}
{% block mediagoblin_head %}
{% endblock mediagoblin_head %}
</head>
<body>
{% block mediagoblin_body %}
{% block mediagoblin_header %}
<header>
{% block mediagoblin_logo %}
<a class="logo"
href="{{ request.urlgen('index') }}">
<img src="{{ request.staticdirect('/images/logo.png', 'theme') }}"
alt="{% trans %}MediaGoblin logo{% endtrans %}" />
</a>
{% endblock mediagoblin_logo %}
{% block mediagoblin_header_title %}{% endblock %}
<div class="header_right">
{% if request.user %}
{% trans
user_url=request.urlgen('mediagoblin.user_pages.user_home',
user= request.user.username),
user_name=request.user.username -%}
<a href="{{ user_url }}">{{ user_name }}</a>'s account
{%- endtrans %}
(<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>)
{% if request.user and request.user.status == 'active' %}
<a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}Add media{% endtrans %}</a>
{% elif request.user and request.user.status == "needs_email_verification" %}
{# the following link should only appear when verification is needed #}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user=request.user.username) }}"
class="button_action_highlight">
{% trans %}Verify your email!{% endtrans %}</a>
{% endif %}
{% else %}
<a href="{{ request.urlgen('mediagoblin.auth.login') }}?next={{
request.base_url|urlencode }}">
{% trans %}Log in{% endtrans %}</a>
{% endif %}
</div>
<div class="clear"></div>
</header>
{% endblock %}
<div class="container">
<div class="mediagoblin_content">
{% include "mediagoblin/utils/messages.html" %}
{% block mediagoblin_content %}
{% endblock mediagoblin_content %}
</div>
{% block mediagoblin_footer %}
<footer>
{% trans -%}
Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project.
{%- endtrans %}
{% 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.
{%- endtrans %}
</footer>
{% endblock mediagoblin_footer %}
{% endblock mediagoblin_body %}
</div>
</body>
</html>

View File

@ -0,0 +1,25 @@
{#
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2012 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#}
{% block mediagoblin_logo %}
<a class="logo"
href="{{ request.urlgen('index') }}">
<img src="{{ request.staticdirect('/images/logo.png', 'theme') }}"
alt="{% trans %}MediaGoblin logo{% endtrans %}" />
</a>
{% endblock mediagoblin_logo -%}