Moved frontpage "welcome" stuff into its own bits file.

This should make it easier to override just that part of the page.

This commit sponsored by David Rylander.  Thank you!

diff --git a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
new file mode 100644 (file)
index 0000000..544ee14
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
@@ -0,0 +1,35 @@
+{#
+# 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/>.
+#}
+
+{% if request.user %}
+  <h1>{% trans %}Explore{% endtrans %}</h1>
+{% else %}
+  <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
+  <img class="right_align" src="{{ request.staticdirect('/images/frontpage_image.png') }}" />
+  <p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p>
+  <p>{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
+  {% if allow_registration %}
+    <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
+    {% trans register_url=request.urlgen('mediagoblin.auth.register') -%}
+      <a class="button_action_highlight" href="{{ register_url }}">Create an account at this site</a>
+      or
+      <a class="button_action" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
+    {%- endtrans %}
+  {% endif %}
+  <div class="clear"></div>
+{% endif %}

diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index 529d89ef1253c6eace3539419f34a58ca2f881ea..15d53af100602e6fce1e70a20f3dd80f8cafb493 100644 (file)
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -27,23 +27,8 @@
 {%- endblock mediagoblin_head %}
 
 {% block mediagoblin_content %}
-  {% if request.user %}
-    <h1>{% trans %}Explore{% endtrans %}</h1>
-  {% else %}
-    <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
-    <img class="right_align" src="{{ request.staticdirect('/images/frontpage_image.png') }}" />
-    <p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p>
-    <p>{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
-    {% if allow_registration %}
-      <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
-      {% trans register_url=request.urlgen('mediagoblin.auth.register') -%}
-        <a class="button_action_highlight" href="{{ register_url }}">Create an account at this site</a>
-        or
-        <a class="button_action" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
-      {%- endtrans %}
-    {% endif %}
-    <div class="clear"></div>
-  {% endif %}
+  {% include "mediagoblin/bits/frontpage_welcome.html" %}
+
   <h2>{% trans %}Most recent media{% endtrans %}</h2>
   {{ object_gallery(request, media_entries, pagination) }}