Merge remote-tracking branch 'remotes/jiyda/220_rtl_language_support'

[mediagoblin.git] / mediagoblin / templates / mediagoblin / root.html

diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index 0f769f2f34821330ea52a6bc0ed93fa45eb42de6..15d53af100602e6fce1e70a20f3dd80f8cafb493 100644 (file)
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -1,6 +1,6 @@
 {#
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# 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
@@ -19,28 +19,20 @@
 
 {% from "mediagoblin/utils/object_gallery.html" import object_gallery %}
 
+{% set feed_url = request.urlgen('mediagoblin.listings.atom_feed') %}
+
+{% block mediagoblin_head -%}
+  {% set feed_url = request.urlgen('mediagoblin.listings.atom_feed') -%}
+  <link rel="alternate" type="application/atom+xml" href="{{ feed_url }}">
+{%- endblock mediagoblin_head %}
+
 {% block mediagoblin_content %}
-  {% if request.user %}
-    <h1>{% trans %}Explore{% endtrans %}</h1>
-  {% else %}
-   <div class="grid_11 alpha">
-      <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
-      <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, save your favourites 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>
-    <div class="grid_5 omega">
-      <img src="{{ request.staticdirect('/images/frontpage_image.png') }}" />
-    </div>
-    <div class="clear"></div>
-  {% endif %}
+  {% include "mediagoblin/bits/frontpage_welcome.html" %}
+
   <h2>{% trans %}Most recent media{% endtrans %}</h2>
   {{ object_gallery(request, media_entries, pagination) }}
+
+  {#- Need to set feed_url within this block so template can use it. -#}
+  {%- set feed_url = feed_url -%}
+  {%- include "mediagoblin/utils/feed_link.html" -%}
 {% endblock %}