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 4ea3fe2a7f5a18483b98ffacc3cb4cea9b0db568..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
@@ -19,34 +19,20 @@
 
 {% from "mediagoblin/utils/object_gallery.html" import object_gallery %}
 
-{% block mediagoblin_content %}
-  {% if request.user %}
-    <h1>Explore</h1>
-  {% else %}
-   <div class="grid_11 alpha">
-      <h1>{% trans %}Hi there, media lover! MediaGoblin is...{% endtrans %}</h1>
-      <ul>
-        <li>{% trans %}The perfect place for your media!{% endtrans %}</li>
-        <li>{% trans %}A place for people to collaborate and show off original and derived creations!{% endtrans %}</li>
-        <li>{% trans %}Free, as in freedom. (We’re a <a href="http://gnu.org">GNU project</a>, after all.){% endtrans %}</li>
-        <li>{% trans %}Aiming to make the world a better place through decentralization and (eventually, coming soon!) federation!{% endtrans %}</li>
-        <li>{% trans %}Built for extensibility.  (Multiple media types coming soon to the software, including video support!){% endtrans %}</li>
-        <li>{% trans %}Powered by people like you.  (<a href="http://mediagoblin.org/pages/join.html">You can help us improve this software!</a>){% endtrans %}</li>
-      </ul>
+{% set feed_url = request.urlgen('mediagoblin.listings.atom_feed') %}
 
-      {% if allow_registration %}
-        <p>Excited to join us? To add your own media, make collections and save favorites...<p>
-        <a class="header_submit_highlight" href="{{ request.urlgen('mediagoblin.auth.register') }}">Create a free account</a> or
-        <a class="header_submit" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
-      {% endif %}
-    </div>
+{% 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 %}
 
-    <div class="grid_5 omega">
-      <img src="{{ request.staticdirect('/images/frontpage_image.png') }}" />
-    </div>
+{% block mediagoblin_content %}
+  {% include "mediagoblin/bits/frontpage_welcome.html" %}
 
-    <div class="clear"></div>
-  {% endif %}
-  <h2>Most recent media</h2>
+  <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 %}