{% block title %}{{ app_config['html_title'] }}{% endblock %}

From 56cf9f5ff177f1cf2b7686a7625727a1f15bebc1 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sun, 16 Dec 2012 14:08:38 +0100 Subject: [PATCH] Use the new logo.html thingy in airy. --- .../airy/templates/mediagoblin/base.html | 98 ------------------- .../airy/templates/mediagoblin/bits/logo.html | 25 +++++ 2 files changed, 25 insertions(+), 98 deletions(-) delete mode 100644 mediagoblin/themes/airy/templates/mediagoblin/base.html create mode 100644 mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html diff --git a/mediagoblin/themes/airy/templates/mediagoblin/base.html b/mediagoblin/themes/airy/templates/mediagoblin/base.html deleted file mode 100644 index 6e177ddb..00000000 --- a/mediagoblin/themes/airy/templates/mediagoblin/base.html +++ /dev/null @@ -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 . --#} - - - - - - {% block title %}{{ app_config['html_title'] }}{% endblock %} - - - - - - - {% include "mediagoblin/extra_head.html" %} - - {% block mediagoblin_head %} - {% endblock mediagoblin_head %} - - - {% block mediagoblin_body %} - {% block mediagoblin_header %} -

- {% block mediagoblin_logo %} - -

- - {% endblock mediagoblin_logo %} - {% block mediagoblin_header_title %}{% endblock %} -

- {% if request.user %} - {% trans - user_url=request.urlgen('mediagoblin.user_pages.user_home', - user= request.user.username), - user_name=request.user.username -%} - {{ user_name }}'s account - {%- endtrans %} - ({% trans %}log out{% endtrans %}) - {% if request.user and request.user.status == 'active' %} - {% trans %}Add media{% endtrans %} - {% elif request.user and request.user.status == "needs_email_verification" %} - {# the following link should only appear when verification is needed #} - - {% trans %}Verify your email!{% endtrans %} - {% endif %} - {% else %} - - {% trans %}Log in{% endtrans %} - {% endif %} -

- {% endblock %} -

- {% include "mediagoblin/utils/messages.html" %} - {% block mediagoblin_content %} - {% endblock mediagoblin_content %} -

- {% block mediagoblin_footer %} - - {% endblock mediagoblin_footer %} - {% endblock mediagoblin_body %} -

- - diff --git a/mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html b/mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html new file mode 100644 index 00000000..c8500159 --- /dev/null +++ b/mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html @@ -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 . +-#} + +{% block mediagoblin_logo %} + +

+ +{% endblock mediagoblin_logo -%} -- 2.25.1