From 17dcc3ae4fee1df63d73369550b699d679b6b6d7 Mon Sep 17 00:00:00 2001
From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Sun, 16 Dec 2012 13:47:13 +0100
Subject: [PATCH] Move logo part into bits/logo.html

To make it easier for themers to replace the logo, move it
out into its own logo.html.
---
 mediagoblin/templates/mediagoblin/base.html   |  8 +-----
 .../templates/mediagoblin/bits/logo.html      | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 mediagoblin/templates/mediagoblin/bits/logo.html

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 3f5e2c79..0a9a56d3 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -41,13 +41,7 @@
     {% block mediagoblin_body %}
       {% block mediagoblin_header %}
         <header>
-          {% block mediagoblin_logo %}
-            <a class="logo"
-               href="{{ request.urlgen('index') }}"
-               ><img src="{{ request.staticdirect('/images/logo.png') }}"
-                   alt="{% trans %}MediaGoblin logo{% endtrans %}" />
-            </a>
-          {% endblock mediagoblin_logo %}
+          {%- include "mediagoblin/bits/logo.html" -%}
           {% block mediagoblin_header_title %}{% endblock %}
           <div class="header_right">
             {% if request.user %}
diff --git a/mediagoblin/templates/mediagoblin/bits/logo.html b/mediagoblin/templates/mediagoblin/bits/logo.html
new file mode 100644
index 00000000..5bd8edd8
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/bits/logo.html
@@ -0,0 +1,25 @@
+{#
+# 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/>.
+-#}
+
+{% block mediagoblin_logo %}
+  <a class="logo"
+     href="{{ request.urlgen('index') }}"
+     ><img src="{{ request.staticdirect('/images/logo.png') }}"
+         alt="{% trans %}MediaGoblin logo{% endtrans %}" />
+  </a>
+{% endblock mediagoblin_logo -%}
-- 
2.25.1