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 bae033c415bcbcc5f4c2b7b7b85065f9c66ed516..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 Free Software Foundation, Inc
+# 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
@@ -17,27 +17,22 @@
 #}
 {% extends "mediagoblin/base.html" %}
 
-{% block mediagoblin_content %}
-  <h1>{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}</h1>
+{% from "mediagoblin/utils/object_gallery.html" import object_gallery %}
+
+{% set feed_url = request.urlgen('mediagoblin.listings.atom_feed') %}
 
-  {% if request.user %}
-    <p>
-      <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> 
-    </p>
-  {% else %}
-    <p>
-      If you have an account, you can
-      <a href="{{ request.urlgen('mediagoblin.auth.login') }}">Login</a>.
-    </p>
-    {% if allow_registration %}
-      <p>
-        If you don't have an account, please 
-        <a href="{{ request.urlgen('mediagoblin.auth.register') }}">Register</a>.
-      </p>
-    {% endif %}
-  {% endif %}
+{% 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 %}
+  {% include "mediagoblin/bits/frontpage_welcome.html" %}
 
-  {# temporarily, an "image gallery" that isn't one really ;) #}
+  <h2>{% trans %}Most recent media{% endtrans %}</h2>
+  {{ object_gallery(request, media_entries, pagination) }}
 
-    {% include "mediagoblin/utils/object_gallery.html" %}
+  {#- 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 %}