From 0d5094cb3b417892a402d52be76297979762d30f Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Tue, 31 May 2011 00:45:42 +0200
Subject: Improved object_gallery.html spacing

---
 mediagoblin/templates/mediagoblin/utils/object_gallery.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
index c9c3e0db..8c88c174 100644
--- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html
+++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
@@ -19,7 +19,7 @@
 {% block object_gallery_content -%}
   <div>
     {% if media_entries %}
-      <ul>
+      <ul class="media_thumbnail">
         {% for entry in media_entries %}
           <li class="media_thumbnail">
             <a href="{{ entry.url_for_self(request.urlgen) }}">
-- 
cgit v1.2.3


From bb1f2f89e1c9c1bb50a7a31cab50f88252b0428f Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Tue, 7 Jun 2011 16:02:16 +0200
Subject: Changed edit page: new background image, image is included in form,
 submit button text changed, title text changed, created new css class for
 edit forms

---
 mediagoblin/templates/mediagoblin/edit/edit.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index 295d57eb..70cc17d1 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -20,19 +20,20 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
 {% block mediagoblin_content %}
-  <h1>Edit details for {{ media.title }}</h1>
 
   <form action="{{ request.urlgen('mediagoblin.edit.edit_media',
                                user= media.uploader().username,
                                media= media._id) }}"
         method="POST" enctype="multipart/form-data">
-    <div class="submit_box form_box">
+    <div class="edit_box form_box">
+      <h1>Editing {{ media.title }}</h1>
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
-        <input type="submit" value="submit" class="button" />
+        <input type="submit" value="save changes" class="button" />
       </div>
+      <img src="{{ request.app.public_store.file_url(
+         media['media_files']['thumb']) }}" />
     </div>
   </form>
-  <img src="{{ request.app.public_store.file_url(
-         media['media_files']['thumb']) }}" />
+  
 {% endblock %}    
-- 
cgit v1.2.3


From 82e64b1f122c1d6bef7099e423b9ceba14722f10 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Tue, 7 Jun 2011 16:28:54 +0200
Subject: Added cancel button, capitalised button labels

---
 mediagoblin/templates/mediagoblin/edit/edit.html    | 3 ++-
 mediagoblin/templates/mediagoblin/submit/start.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index 70cc17d1..51d0341d 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -29,7 +29,8 @@
       <h1>Editing {{ media.title }}</h1>
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
-        <input type="submit" value="save changes" class="button" />
+        <a href="{{ media.url_for_self(request.urlgen) }}">Cancel</a>
+        <input type="submit" value="Save changes" class="button" />
       </div>
       <img src="{{ request.app.public_store.file_url(
          media['media_files']['thumb']) }}" />
diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html
index 75c31df4..fe1f3369 100644
--- a/mediagoblin/templates/mediagoblin/submit/start.html
+++ b/mediagoblin/templates/mediagoblin/submit/start.html
@@ -27,7 +27,7 @@
       <h1>Submit yer media</h1>
       {{ wtforms_util.render_divs(submit_form) }}
       <div class="form_submit_buttons">
-      <input type="submit" value="submit" class="button" />
+      <input type="submit" value="Submit" class="button" />
       </div>
     </div>
   </form>
-- 
cgit v1.2.3


From 48693437391ddd9d3c9f732304b4990ff6967989 Mon Sep 17 00:00:00 2001
From: cfdv <caldavis@gmail.com>
Date: Fri, 17 Jun 2011 21:43:48 -0500
Subject: adds global link to user's home page in the base.html template

Issue #315 (add bio and website to user page)
  * enable profile edits
  * provide place in user's home page for details to appear
---
 mediagoblin/templates/mediagoblin/base.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mediagoblin/templates')

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>)
-- 
cgit v1.2.3


From 630b57a366d10495a89d392c9b02cf432e6a1599 Mon Sep 17 00:00:00 2001
From: cfdv <caldavis@gmail.com>
Date: Sat, 18 Jun 2011 16:42:22 -0500
Subject: baby step towards enabling profile edits

adds
* url and bio fields to database
* form for editing the user profile
* route to the edit profile controller
* view for the profile editing page
* template for the profile editing page
* link to edit profile in the welcome page

still needs
* thorough inspection to see if it makes sense
* tests
* ?
---
 .../templates/mediagoblin/edit/edit_profile.html   | 35 ++++++++++++++++++++++
 mediagoblin/templates/mediagoblin/root.html        |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 mediagoblin/templates/mediagoblin/edit/edit_profile.html

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
new file mode 100644
index 00000000..9f6667fd
--- /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 }}</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..7af572b0 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -23,7 +23,8 @@
 
   {% if request.user %}
   <p>
-    <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a>.
+    <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> 
+    <a href="{{ request.urlgen('mediagoblin.edit.profile') }}">Edit profile</a>
   </p>
 
   {% else %}
-- 
cgit v1.2.3


From 0bf340727e82ffdb03196a5a9a8ff94c7d4ec0f7 Mon Sep 17 00:00:00 2001
From: cfdv <caldavis@gmail.com>
Date: Sat, 18 Jun 2011 21:30:56 -0500
Subject: enables entering user details including website url and bio

fixes usage of objects. still need to display the data on user page
---
 mediagoblin/templates/mediagoblin/edit/edit_profile.html | 2 +-
 mediagoblin/templates/mediagoblin/root.html              | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
index 9f6667fd..63bf013f 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
@@ -20,7 +20,7 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
 {% block mediagoblin_content %}
-  <h1>Edit details for {{ user }}</h1>
+  <h1>Edit details for {{ user['username'] }}</h1>
 
   <form action="{{ request.urlgen('mediagoblin.edit.profile',
                                user=user.username) }}"
diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index 7af572b0..697ac15b 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -24,7 +24,9 @@
   {% if request.user %}
   <p>
     <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> 
-    <a href="{{ request.urlgen('mediagoblin.edit.profile') }}">Edit profile</a>
+    <a href="{{ request.urlgen(
+            'mediagoblin.edit.profile', 
+            user=request.user.username) }}">Edit profile</a>
   </p>
 
   {% else %}
-- 
cgit v1.2.3


From 699b5475806c43af339d48408a7ea04ae9027c1a Mon Sep 17 00:00:00 2001
From: cfdv <caldavis@gmail.com>
Date: Sat, 18 Jun 2011 22:24:32 -0500
Subject: enables primitive display of profile data on user page

---
 .../templates/mediagoblin/user_pages/user.html     |  2 ++
 .../templates/mediagoblin/utils/profile.html       | 35 ++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 mediagoblin/templates/mediagoblin/utils/profile.html

(limited to 'mediagoblin/templates')

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 %}    
-- 
cgit v1.2.3


From b9f097a6f91fbe773d5f5dcbb7d904758efeebc1 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 21 Jun 2011 23:25:15 -0500
Subject: Indenting some sections between if / else blocks in root.html

---
 mediagoblin/templates/mediagoblin/root.html | 30 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index 697ac15b..550e0847 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -22,23 +22,21 @@
   <h1>{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}</h1>
 
   {% if request.user %}
-  <p>
-    <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> 
-    <a href="{{ request.urlgen(
-            'mediagoblin.edit.profile', 
-            user=request.user.username) }}">Edit profile</a>
-  </p>
-
+    <p>
+      <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> 
+      <a href="{{ request.urlgen(
+                      'mediagoblin.edit.profile', 
+                      user=request.user.username) }}">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 ;) #}
-- 
cgit v1.2.3


From d220f87c120e4c8627a80adaa6fab18ebe85669f Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 21 Jun 2011 23:26:45 -0500
Subject: I don't think we need the username to be part of the profile editing
 URL

---
 mediagoblin/templates/mediagoblin/root.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index 550e0847..7261f4fc 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -24,9 +24,7 @@
   {% if request.user %}
     <p>
       <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> 
-      <a href="{{ request.urlgen(
-                      'mediagoblin.edit.profile', 
-                      user=request.user.username) }}">Edit profile</a>
+      <a href="{{ request.urlgen('mediagoblin.edit.profile') }}">Edit profile</a>
     </p>
   {% else %}
     <p>
-- 
cgit v1.2.3


From 1db7bed64b498da616a4c18e259d278880944ba1 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Wed, 22 Jun 2011 17:02:28 +0200
Subject: Several small UI changes to edit profile page: moved header, changed
 form wording, changed css class

---
 mediagoblin/templates/mediagoblin/edit/edit_profile.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
index 63bf013f..8ce474f0 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
@@ -20,12 +20,12 @@
 {% 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">
+    <div class="edit_box form_box">
+      <h1>Editing {{ user['username'] }}'s profile</h1>
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
         <input type="submit" value="submit" class="button" />
-- 
cgit v1.2.3


From ca9c7a07b2dc8b4fdb734f3a9e29901e086e86e2 Mon Sep 17 00:00:00 2001
From: Caleb Forbes Davis V <caldavis@gmail.com>
Date: Wed, 22 Jun 2011 12:13:29 -0500
Subject: adds conditional for display of media edit link

---
 mediagoblin/templates/mediagoblin/user_pages/media.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 44bc38b8..ade7f0c6 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -34,10 +34,12 @@
     by
     <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
                                user= media.uploader().username) }}">
-      {{- media.uploader().username }}</a></p>
-    <p><a href="{{ request.urlgen('mediagoblin.edit.edit_media',
-                               user= media.uploader().username,
-                               media= media._id) }}">Edit</a></p>
+      {{- media.uploader().username }}</a></p>   
+    {% if media.uploader().username == request.user.username %}
+      <p><a href="{{ request.urlgen('mediagoblin.edit.edit_media',
+                                    user= media.uploader().username,
+                                    media= media._id) }}">Edit</a></p>
+    {% endif %}
   {% else %}
   <p>Sorry, no such media found.<p/>
   {% endif %}
-- 
cgit v1.2.3


From 54de443a6a6cd673cfef0efa73a9d5e6fc6cde7c Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 22 Jun 2011 13:57:34 -0500
Subject: Check on media['uploader']'s id rather than the username

This skips making an extra query to retrieve the uploader object and
also checks on the canonical ID, which is probably good (even if
indexing should ensure uniqueness there).
---
 mediagoblin/templates/mediagoblin/user_pages/media.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index ade7f0c6..d221f61e 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -35,7 +35,7 @@
     <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
                                user= media.uploader().username) }}">
       {{- media.uploader().username }}</a></p>   
-    {% if media.uploader().username == request.user.username %}
+    {% if media['uploader'] == request.user['_id'] %}
       <p><a href="{{ request.urlgen('mediagoblin.edit.edit_media',
                                     user= media.uploader().username,
                                     media= media._id) }}">Edit</a></p>
-- 
cgit v1.2.3