Merge branch 'master' into celerysubmit

mediagoblin/models.py

@@ -49,7 +49,7 @@ class User(Document):
         'created': datetime.datetime.utcnow,
         'email_verified': False,
         # TODO: shouldn't be active by default, must have email registration
-        'status': 'active'}
+        'status': u'active'}
 
     def check_login(self, password):
         """

mediagoblin/templates/mediagoblin/root.html

@@ -0,0 +1,39 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# 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/>.
+#}
+{% extends "mediagoblin/base.html" %}
+
+{% block mediagoblin_content %}
+  <h2>Welcome to GNU MediaGoblin!</h2>
+
+  {% 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>
+  <p>
+    If you don't have an account, please 
+    <a href="{{ request.urlgen('mediagoblin.auth.register') }}">Register</a>.
+  </p>
+
+  {% endif %}
+{% endblock %}    

mediagoblin/views.py

@@ -22,7 +22,11 @@ import wtforms
 from mediagoblin import models
 
 def root_view(request):
-    return Response("This is the root")
+    template = request.template_env.get_template(
+        'mediagoblin/root.html')
+    return Response(
+        template.render(
+            {'request': request}))
 
 
 class ImageSubmitForm(wtforms.Form):