Merge remote-tracking branch 'gitorious/master'

5 files changed, 86 insertions, 13 deletions

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index c7313173..8e5fd55b 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -35,6 +35,8 @@
         <div class="mediagoblin_header_right">
           {% if request.user %}
                 {{ request.user['username'] }}'s account 
+                <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
+                                            user= request.user['username']) }}">home</a> 
                 <a href="{{ request.urlgen('mediagoblin.user_pages.user_gallery',
                                             user= request.user['username']) }}">gallery</a> 
                 (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
new file mode 100644
index 00000000..63bf013f
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
@@ -0,0 +1,35 @@
+{#
+# 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" %}
+
+{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+
+{% block mediagoblin_content %}
+  <h1>Edit details for {{ user['username'] }}</h1>
+
+  <form action="{{ request.urlgen('mediagoblin.edit.profile',
+                               user=user.username) }}"
+        method="POST" enctype="multipart/form-data">
+    <div class="submit_box form_box">
+      {{ wtforms_util.render_divs(form) }}
+      <div class="form_submit_buttons">
+        <input type="submit" value="submit" class="button" />
+      </div>
+    </div>
+  </form>
+{% endblock %}    
diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index e5344e08..7261f4fc 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -22,20 +22,19 @@
   <h1>{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}</h1>
 
   {% if request.user %}
-  <p>
-    <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a>.
-  </p>
-
+    <p>
+      <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> 
+      <a href="{{ request.urlgen('mediagoblin.edit.profile') }}">Edit profile</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>
-
+    <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 %}
 
   {# temporarily, an "image gallery" that isn't one really ;) #}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index b3708c85..f7a9f3c9 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -27,6 +27,8 @@
 {% block mediagoblin_content -%}
   {% if user %}
     <h1>User page for '{{ user.username }}'</h1>
+    
+    {% include "mediagoblin/utils/profile.html" %}
 
     {% include "mediagoblin/utils/object_gallery.html" %}
 
diff --git a/mediagoblin/templates/mediagoblin/utils/profile.html b/mediagoblin/templates/mediagoblin/utils/profile.html
new file mode 100644
index 00000000..b3f5f0f8
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/utils/profile.html
@@ -0,0 +1,35 @@
+{#
+# 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/>.
+#}
+
+{% block profile_content -%}
+  <div>
+    <ul>
+      {% if user.url %}
+          <li>
+            <a href="{{ user.url }}">homepage</a>
+          </li>
+      {%  endif %}
+      
+      {% if user.bio %}
+          <li>
+            {{ user.bio }}
+          </li>
+      {%  endif %}
+    </ul>
+  </div>
+{% endblock %}