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: [PATCH 01/26] Improved object_gallery.html spacing

---
 mediagoblin/static/css/base.css               | 23 +++++++++++--------
 .../mediagoblin/utils/object_gallery.html     |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 5d928b9a..1092dccf 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -147,14 +147,17 @@ img.media_image {
   margin-right:auto;
 }
 
-li.media_thumbnail {
-        width: 200px;
-        min-height: 250px;
-        display: -moz-inline-stack;
-        display: inline-block;
-        vertical-align: top;
-        margin: 5px;
-        zoom: 1;
-        *display: inline;
-        _height: 250px;
+ul.media_thumbnail {
+  padding:0px;
+}
+
+li.media_thumbnail {
+  width:200px;
+  height:133px;
+  display:-moz-inline-stack;
+  display:inline-block;
+  vertical-align:top;
+  margin:0px 10px 10px 0px;
+  zoom:1;
+. *display:inline;
 }
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) }}">

From 69dadf429d10e1719d932acde071425739218085 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Thu, 2 Jun 2011 22:44:34 +0200
Subject: [PATCH 02/26] Right-aligned input buttons, added gradient

---
 mediagoblin/static/css/base.css | 43 ++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 1092dccf..153e5ab0 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -69,23 +69,6 @@ a.mediagoblin_logo:hover {
   float:right;
 }
 
-.button {
-  font-family:'Carter One', arial, serif;
-  height:32px;
-  min-width:99px;
-  background-color:#86d4b1;
-  box-shadow:0px 0px 4px #000;
-  border-radius:5px;
-  border:none;
-  color:#272727;
-  margin:10px;
-  font-size:1em;
-  display:block;
-  text-align:center;
-  padding-left:11px;
-  padding-right:11px;
-}
-
 /* common website elements */
 
 .dotted_line {
@@ -97,6 +80,28 @@ a.mediagoblin_logo:hover {
   margin-top:-20px;
 }
 
+.button {
+  font-family:'Carter One', arial, serif;
+  height:32px;
+  min-width:99px;
+  background-color:#86d4b1;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#86d4b1), to(#62caa2)); 
+  background-image: -webkit-linear-gradient(top, #86d4b1, #62caa2); 
+  background-image:    -moz-linear-gradient(top, #86d4b1, #62caa2); 
+  background-image:     -ms-linear-gradient(top, #86d4b1, #62caa2); 
+  background-image:      -o-linear-gradient(top, #86d4b1, #62caa2); 
+  background-image:         linear-gradient(top, #86d4b1, #62caa2);
+  box-shadow:0px 0px 4px #000;
+  border-radius:5px;
+  border:none;
+  color:#272727;
+  margin:10px 0px;
+  font-size:1em;
+  text-align:center;
+  padding-left:11px;
+  padding-right:11px;
+}
+
 /* forms */
 
 .form_box {
@@ -139,6 +144,10 @@ a.mediagoblin_logo:hover {
   margin-bottom:8px;
 }
 
+.form_submit_buttons {
+  text-align:right;
+}
+
 /* media pages */
 
 img.media_image {

From 3e965450953e643afa9252feedb60f3a4c849c9d Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Thu, 2 Jun 2011 22:57:10 +0200
Subject: [PATCH 03/26] Added lines background to forms

---
 mediagoblin/static/css/base.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 153e5ab0..e9f2c4a9 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -109,8 +109,9 @@ a.mediagoblin_logo:hover {
   margin-left:auto;
   margin-right:auto;
   background-color:#393939;
-  padding:0px 83px 30px 83px;
-  border-top:5px solid #d49086;
+  background-image:url("../images/background_lines.png");
+  background-repeat:repeat-x;
+  padding:1px 83px 30px 83px;
   font-size:18px;
 }
 

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: [PATCH 04/26] 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/static/css/base.css                  |  5 +++++
 mediagoblin/templates/mediagoblin/edit/edit.html | 11 ++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index e9f2c4a9..a69eb1fd 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -119,6 +119,11 @@ a.mediagoblin_logo:hover {
   width:600px;
 }
 
+.edit_box {
+  width:600px;
+  background-image:url("../images/background_edit.png");
+}
+
 .form_box h1 {
   font-size:28px;
 }
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 %}    

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: [PATCH 05/26] Added cancel button, capitalised button labels

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

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index a69eb1fd..1d04fc73 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -95,7 +95,7 @@ a.mediagoblin_logo:hover {
   border-radius:5px;
   border:none;
   color:#272727;
-  margin:10px 0px;
+  margin:10px 0px 10px 15px;
   font-size:1em;
   text-align:center;
   padding-left:11px;
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>

From 48693437391ddd9d3c9f732304b4990ff6967989 Mon Sep 17 00:00:00 2001
From: cfdv <caldavis@gmail.com>
Date: Fri, 17 Jun 2011 21:43:48 -0500
Subject: [PATCH 06/26] 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(+)

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>)

From 279d925e757d9756e09e14316f0d85b6e20624ea Mon Sep 17 00:00:00 2001
From: cfdv <caldavis@gmail.com>
Date: Sat, 18 Jun 2011 15:00:05 -0500
Subject: [PATCH 07/26] adds user bio and website url fields to the database

---
 mediagoblin/db/models.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index d77cf619..4b6518cc 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -46,6 +46,8 @@ class User(Document):
         'status': unicode,
         'verification_key': unicode,
         'is_admin': bool,
+        'website_url' : unicode,
+        'bio' : unicode
         }
 
     required_fields = ['username', 'created', 'pw_hash', 'email']

From 630b57a366d10495a89d392c9b02cf432e6a1599 Mon Sep 17 00:00:00 2001
From: cfdv <caldavis@gmail.com>
Date: Sat, 18 Jun 2011 16:42:22 -0500
Subject: [PATCH 08/26] 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
* ?
---
 mediagoblin/db/models.py                      |  2 +-
 mediagoblin/edit/forms.py                     |  7 ++++
 mediagoblin/edit/routing.py                   |  2 ++
 mediagoblin/edit/views.py                     | 20 +++++++++++
 .../mediagoblin/edit/edit_profile.html        | 35 +++++++++++++++++++
 mediagoblin/templates/mediagoblin/root.html   |  3 +-
 6 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 mediagoblin/templates/mediagoblin/edit/edit_profile.html

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 4b6518cc..78bec979 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -46,7 +46,7 @@ class User(Document):
         'status': unicode,
         'verification_key': unicode,
         'is_admin': bool,
-        'website_url' : unicode,
+        'url' : unicode,
         'bio' : unicode
         }
 
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index ea25141d..fb4930a2 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -25,3 +25,10 @@ class EditForm(wtforms.Form):
     slug = wtforms.TextField(
         'Slug')
     description = wtforms.TextAreaField('Description of this work')
+
+class EditProfileForm(wtforms.Form):
+    url = wtforms.TextField(
+        'website URL',
+        [wtforms.validators.URL(message='Improperly formed URL')])
+    bio = wtforms.TextAreaField('bio',
+        [wtforms.validators.Length(min=0, max=500)])
diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index bf0b2498..37595f05 100644
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -19,4 +19,6 @@ from routes.route import Route
 
 edit_routes = [
     # Media editing view handled in user_pages/routing.py
+    Route('mediagoblin.edit.profile', '/{user}/profile/',
+        controller="mediagoblin.edit.views:edit_profile")
 ]
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index c5f0f435..cb62d2fa 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -59,3 +59,23 @@ def edit_media(request, media):
         'mediagoblin/edit/edit.html',
         {'media': media,
          'form': form})
+    
+@require_active_login
+def edit_profile(request):
+
+    form = forms.EditProfileForm(request.POST,
+        url = user['url'],
+        bio = user['bio'])
+
+    if request.method == 'POST' and form.validate():
+            user['url'] = request.POST['url']
+            user['bio'] = request.POST['bio']
+            user.save()
+
+            return redirect(request, "index", user=user.username)
+
+    return render_to_response(
+        request,
+        'mediagoblin/edit/edit_profile.html',
+        {'user': user,
+         'form': form})
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 %}

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

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

diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index 37595f05..9604d214 100644
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -20,5 +20,4 @@ from routes.route import Route
 edit_routes = [
     # Media editing view handled in user_pages/routing.py
     Route('mediagoblin.edit.profile', '/{user}/profile/',
-        controller="mediagoblin.edit.views:edit_profile")
-]
+        controller="mediagoblin.edit.views:edit_profile")]
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index cb62d2fa..57c9a118 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -63,16 +63,17 @@ def edit_media(request, media):
 @require_active_login
 def edit_profile(request):
 
+    user = request.user
     form = forms.EditProfileForm(request.POST,
-        url = user['url'],
-        bio = user['bio'])
+        url = user.get('url'),
+        bio = user.get('bio'))
 
     if request.method == 'POST' and form.validate():
             user['url'] = request.POST['url']
             user['bio'] = request.POST['bio']
             user.save()
 
-            return redirect(request, "index", user=user.username)
+            return redirect(request, "index", user=user['username'])
 
     return render_to_response(
         request,
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 %}

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

---
 .../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

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 %}    

From 3efdd97c2e3e3af3b9c74e6ab217fd57088e9dfa Mon Sep 17 00:00:00 2001
From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Mon, 20 Jun 2011 00:09:40 +0200
Subject: [PATCH 11/26] Move InvalidId to db.util

Instead of import InvalidId from the low level bson module,
first import it in our db.util wrapper and second import it
from pymongo.errors.
---
 mediagoblin/db/util.py    | 1 +
 mediagoblin/decorators.py | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 30615fca..470da531 100644
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -17,4 +17,5 @@
 
 # Imports that other modules might use
 from pymongo import DESCENDING
+from pymongo.errors import InvalidId
 from mongokit import ObjectId
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index c2fe3f9f..081eda62 100644
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -15,11 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from bson.errors import InvalidId
 from webob import exc
 
 from mediagoblin.util import redirect
-from mediagoblin.db.util import ObjectId
+from mediagoblin.db.util import ObjectId, InvalidId
 
 
 def _make_safe(decorator, original):

From e36ecab0931f25d65169bfcf26d8a56d33eef02a Mon Sep 17 00:00:00 2001
From: cfdv <caldavis@gmail.com>
Date: Mon, 20 Jun 2011 13:07:15 -0500
Subject: [PATCH 12/26] adds accommmodations for migration of fields in User:
 bio and url

---
 mediagoblin/db/migrations.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index b87988fe..a3e7133c 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -49,5 +49,21 @@ class MediaEntryMigration(DocumentMigration):
                         'description_html': cleaned_markdown_conversion(
                             doc['description'])}}
         
-
-MIGRATE_CLASSES = ['MediaEntry']
+class UserMigration(DocumentMigration):
+    def allmigration01_add_bio_and_url_profile(self):
+        """
+        User can elaborate profile with home page and biography
+        """
+        self.target = {'username': {'$exists': True}, 'url': {'$exists': False},
+                          'bio': {'$exists': False}}
+        if not self.status:
+            for doc in self.collection.find(self.target):
+                self.update = {
+                    '$set': {
+                        'url': '', 
+                        'bio': ''}}
+                self.collection.update(
+                    self.target, self.update, multi=True, safe=True)
+                        
+                        
+MIGRATE_CLASSES = ['MediaEntry','User']

From 17bb7c388b1f6190a43945e8e2f3e96bb826fb72 Mon Sep 17 00:00:00 2001
From: cfdv <caldavis@gmail.com>
Date: Mon, 20 Jun 2011 19:28:02 -0500
Subject: [PATCH 13/26] removes unecessary dependence on existence of username
 for User migration01, + fix whitespace issues

---
 mediagoblin/db/migrations.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index a3e7133c..29bc112f 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -54,16 +54,15 @@ class UserMigration(DocumentMigration):
         """
         User can elaborate profile with home page and biography
         """
-        self.target = {'username': {'$exists': True}, 'url': {'$exists': False},
-                          'bio': {'$exists': False}}
+        self.target = {'url': {'$exists': False},
+                       'bio': {'$exists': False}}
         if not self.status:
             for doc in self.collection.find(self.target):
                 self.update = {
-                    '$set': {
-                        'url': '', 
-                        'bio': ''}}
+                    '$set': {'url': '', 
+                             'bio': ''}}
                 self.collection.update(
                     self.target, self.update, multi=True, safe=True)
                         
                         
-MIGRATE_CLASSES = ['MediaEntry','User']
+MIGRATE_CLASSES = ['MediaEntry', 'User']

From 0472653ee4763e2f045632d49a9eed729a491f97 Mon Sep 17 00:00:00 2001
From: cfdv <caldavis@gmail.com>
Date: Mon, 20 Jun 2011 22:47:43 -0500
Subject: [PATCH 14/26] assigns migration steps to User database objects

adds the migration_handler to the User db class, connecting the
migration steps in ../db/migrations.py to the migration code in
gmg_commands
---
 mediagoblin/db/models.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index b3de7793..600b79ff 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -58,6 +58,8 @@ class User(Document):
         'status': u'needs_email_verification',
         'verification_key': lambda: unicode(uuid.uuid4()),
         'is_admin': False}
+        
+    migration_handler = migrations.UserMigration
 
     def check_login(self, password):
         """

From 4fd18da0a8585e454cf68f16487ef5abc213d78a Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 21 Jun 2011 08:20:05 -0500
Subject: [PATCH 15/26] Also fix clean_html so that it doesn't barf on an empty
 string.

---
 mediagoblin/util.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mediagoblin/util.py b/mediagoblin/util.py
index e964324f..91fbee0a 100644
--- a/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@ -373,6 +373,10 @@ HTML_CLEANER = Cleaner(
 
 
 def clean_html(html):
+    # clean_html barfs on an empty string
+    if not html:
+        return u''
+
     return HTML_CLEANER.clean_html(html)
 
 

From f439193628d4ed41f109ca1bdce6bc7ac2287f09 Mon Sep 17 00:00:00 2001
From: Will Kahn-Greene <willg@bluesock.org>
Date: Tue, 14 Jun 2011 22:06:01 -0400
Subject: [PATCH 16/26] 333. Adds explanation of command lines; tweaks
 format-patch line

* Adds explanation of command lines and their arguments (gullydwarf's
  suggestion).
* Switched the ``git format-patch ...`` line from using -o patches to
  using --stdout.  This creates a single patch file and is (probably)
  easier to deal with.
* Fixed a typo.
* Adds toc to top of mediagoblin chapter
---
 docs/git.rst         | 32 +++++++++++++++++++++++++-------
 docs/mediagoblin.rst |  4 ++++
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/docs/git.rst b/docs/git.rst
index 2836ecd8..ea367846 100644
--- a/docs/git.rst
+++ b/docs/git.rst
@@ -82,8 +82,8 @@ How to send us your changes
 
 There are three ways to let us know how to get it:
 
-1. (preferred) **push changes to publicly available git clone and let
-   us know where to find it**
+1. *(preferred)* **push changes to publicly available git clone and
+   let us know where to find it**
 
    Push your feature/bugfix/issue branch to your publicly available
    git clone and add a comment to the issue with the url for your
@@ -93,14 +93,22 @@ There are three ways to let us know how to get it:
 
    Run::
 
-       git format-patch -o patches <remote>/master
+       git format-patch --stdout <remote>/master > issue_<number>.patch
        
-   Then tar up the newly created ``patches`` directory and attach the
-   directory to the issue.
+   ``format-patch`` creates a patch of all the commits that are in
+   your branch that aren't in ``<remote>/master``.  The ``--stdout``
+   flag causes all this output to go to stdout where it's redirected
+   to a file named ``issue_<number>.patch``.  That file should be
+   based on the issue you're working with.  For example,
+   ``issue_42.patch`` is a good filename and ``issue_42_rev2.patch``
+   is good if you did a revision of it.
+
+   Having said all that, the filename isn't wildly important.
 
 
 Example workflow
 ================
+
 Here's an example workflow.
 
 
@@ -124,20 +132,30 @@ Slartibartfast does the following:
 
        git fetch --all -p
 
+   This tells ``git fetch`` to fetch all the recent data from all of
+   the remotes (``--all``) and prune any branches that have been
+   deleted in the remotes (``-p``).
+
 2. Creates a branch from the tip of the MediaGoblin repository (the
    remote is named ``gmg``) master branch called ``bug42_meaning_of_life``::
 
        git checkout -b bug42_meaning_of_life gmg/master
 
+   This creates a new branch (``-b``) named ``bug42_meaning_of_life`` based
+   on the tip of the ``master`` branch of the remote named ``gmg`` and checks
+   it out.
+
 3. Slartibartfast works hard on his changes in the ``bug42_meaning_of_life``
    branch.  When done, he wants to notify us that he has made changes
    he wants us to see.
 
-4. Slartibartfast pushes his changes to his clone (the remote is named
-   ``origin``)::
+4. Slartibartfast pushes his changes to his clone::
 
        git push origin bug42_meaning_of_life --set-upstream
 
+   This pushes the changes in the ``bug42_meaning_of_life`` branch to the
+   remote named ``origin``.
+
 5. Slartibartfast adds a comment to issue 42 with the url for his
    repository and the name of the branch he put the code in.  He also
    explains what he did and why it addresses the issue.
diff --git a/docs/mediagoblin.rst b/docs/mediagoblin.rst
index ea9c83a7..c437ecc3 100644
--- a/docs/mediagoblin.rst
+++ b/docs/mediagoblin.rst
@@ -2,6 +2,10 @@
  GNU MediaGoblin
 =================
 
+.. contents:: Sections
+   :local:
+
+
 What is GNU MediaGoblin
 =======================
 

From cfd2cbf3dd0c454556524a649204c51f7a6f6a5b Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 21 Jun 2011 16:04:44 -0500
Subject: [PATCH 17/26] Make sure we *ONLY* ever kill the test database, EVER.

---
 mediagoblin/tests/__init__.py | 11 +++++++----
 mediagoblin/tests/tools.py    |  7 ++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mediagoblin/tests/__init__.py b/mediagoblin/tests/__init__.py
index 1f1e23e9..8aec4a96 100644
--- a/mediagoblin/tests/__init__.py
+++ b/mediagoblin/tests/__init__.py
@@ -16,12 +16,15 @@
 
 from mediagoblin import mg_globals
 
+from mediagoblin.tests.tools import MEDIAGOBLIN_TEST_DB_NAME
+
 
 def setup_package():
     pass
 
 def teardown_package():
-    if mg_globals.db_connection:
-        print "Killing db ..."
-        mg_globals.db_connection.drop_database(mg_globals.database.name)
-        print "... done"
+    if ((mg_globals.db_connection
+         and mg_globals.database.name == MEDIAGOBLIN_TEST_DB_NAME)):
+            print "Killing db ..."
+            mg_globals.db_connection.drop_database(MEDIAGOBLIN_TEST_DB_NAME)
+            print "... done"
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index 9e36fc5c..b35d54e0 100644
--- a/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@ -28,7 +28,7 @@ from mediagoblin.decorators import _make_safe
 from mediagoblin.db.open import setup_connection_and_db_from_config
 
 
-MEDIAGOBLIN_TEST_DB_NAME = '__mediagoblinunittests__'
+MEDIAGOBLIN_TEST_DB_NAME = u'__mediagoblin_tests__'
 TEST_SERVER_CONFIG = pkg_resources.resource_filename(
     'mediagoblin.tests', 'test_paste.ini')
 TEST_APP_CONFIG = pkg_resources.resource_filename(
@@ -78,6 +78,7 @@ def get_test_app(dump_old_app=True):
     # @@: For now we're dropping collections, but we could also just
     # collection.remove() ?
     connection, db = setup_connection_and_db_from_config(app_config)
+    assert db.name == MEDIAGOBLIN_TEST_DB_NAME
 
     collections_to_wipe = [
         collection
@@ -87,10 +88,6 @@ def get_test_app(dump_old_app=True):
     for collection in collections_to_wipe:
         db.drop_collection(collection)
 
-    # Don't need these anymore...
-    del(connection)
-    del(db)
-
     # TODO: Drop and recreate indexes
 
     # setup app and return

From 29f1333e722c10d3eff106bd64bb2ded0207e975 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 21 Jun 2011 17:02:49 -0500
Subject: [PATCH 18/26] Extra checks so that we don't even RUN tests unless the
 right celery environ set

---
 mediagoblin/tests/__init__.py |  6 ++++--
 mediagoblin/tests/tools.py    | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/mediagoblin/tests/__init__.py b/mediagoblin/tests/__init__.py
index 8aec4a96..adb6a1b3 100644
--- a/mediagoblin/tests/__init__.py
+++ b/mediagoblin/tests/__init__.py
@@ -16,11 +16,13 @@
 
 from mediagoblin import mg_globals
 
-from mediagoblin.tests.tools import MEDIAGOBLIN_TEST_DB_NAME
+from mediagoblin.tests.tools import (
+    MEDIAGOBLIN_TEST_DB_NAME, suicide_if_bad_celery_environ)
 
 
 def setup_package():
-    pass
+    suicide_if_bad_celery_environ()
+
 
 def teardown_package():
     if ((mg_globals.db_connection
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index b35d54e0..ebb5f1b5 100644
--- a/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@ -42,17 +42,23 @@ USER_DEV_DIRECTORIES_TO_SETUP = [
     'media/public', 'media/queue',
     'beaker/sessions/data', 'beaker/sessions/lock']
 
+BAD_CELERY_MESSAGE = """\
+Sorry, you *absolutely* must run nosetests with the
+mediagoblin.celery_setup.from_tests module.  Like so:
+$ CELERY_CONFIG_MODULE=mediagoblin.celery_setup.from_tests ./bin/nosetests"""
+
 
 class BadCeleryEnviron(Exception): pass
 
 
-def get_test_app(dump_old_app=True):
+def suicide_if_bad_celery_environ():
     if not os.environ.get('CELERY_CONFIG_MODULE') == \
             'mediagoblin.celery_setup.from_tests':
-        raise BadCeleryEnviron(
-            u"Sorry, you *absolutely* must run nosetests with the\n"
-            u"mediagoblin.celery_setup.from_tests module.  Like so:\n"
-            u"$ CELERY_CONFIG_MODULE=mediagoblin.celery_setup.from_tests ./bin/nosetests")
+        raise BadCeleryEnviron(BAD_CELERY_MESSAGE)
+    
+
+def get_test_app(dump_old_app=True):
+    suicide_if_bad_celery_environ()
 
     global MGOBLIN_APP
     global CELERY_SETUP

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: [PATCH 19/26] Indenting some sections between if / else blocks in
 root.html

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

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 ;) #}

From 46fd661e3479ad9157d45190aba7c8127d9b8f7f Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 21 Jun 2011 23:26:18 -0500
Subject: [PATCH 20/26] Adding an extra space between function definitions

---
 mediagoblin/edit/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 3de71a64..a9071495 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -69,6 +69,7 @@ def edit_media(request, media):
         {'media': media,
          'form': form})
     
+
 @require_active_login
 def edit_profile(request):
 

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: [PATCH 21/26] I don't think we need the username to be part of the
 profile editing URL

---
 mediagoblin/edit/routing.py                 | 2 +-
 mediagoblin/templates/mediagoblin/root.html | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index 9604d214..9771207a 100644
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -19,5 +19,5 @@ from routes.route import Route
 
 edit_routes = [
     # Media editing view handled in user_pages/routing.py
-    Route('mediagoblin.edit.profile', '/{user}/profile/',
+    Route('mediagoblin.edit.profile', '/profile/',
         controller="mediagoblin.edit.views:edit_profile")]
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>

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: [PATCH 22/26] Several small UI changes to edit profile page: moved
 header, changed form wording, changed css class

---
 mediagoblin/edit/forms.py                                | 8 ++++----
 mediagoblin/templates/mediagoblin/edit/edit_profile.html | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index fb4930a2..2efdb9e4 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -27,8 +27,8 @@ class EditForm(wtforms.Form):
     description = wtforms.TextAreaField('Description of this work')
 
 class EditProfileForm(wtforms.Form):
-    url = wtforms.TextField(
-        'website URL',
-        [wtforms.validators.URL(message='Improperly formed URL')])
-    bio = wtforms.TextAreaField('bio',
+    bio = wtforms.TextAreaField('Bio',
         [wtforms.validators.Length(min=0, max=500)])
+    url = wtforms.TextField(
+        'Website',
+        [wtforms.validators.URL(message='Improperly formed URL')])
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" />

From b4c0aeb686f96dedb249b0d6cdc32aec4e3249f0 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Wed, 22 Jun 2011 17:48:20 +0200
Subject: [PATCH 23/26] Add updates background images

---
 mediagoblin/static/images/background_edit.png  | Bin 0 -> 221 bytes
 mediagoblin/static/images/background_lines.png | Bin 0 -> 158 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 mediagoblin/static/images/background_edit.png
 create mode 100644 mediagoblin/static/images/background_lines.png

diff --git a/mediagoblin/static/images/background_edit.png b/mediagoblin/static/images/background_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..4071fd53ed15b786a220d37ddc75a2aa9d61260b
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj&!3HFc&5{WKQjEnx?oJHr&dIz4a@dl*-CY>|
zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfZ8mmZOL^UQGdzJpv7RoDAr_~T
z_guRFZGK~yLh02sx2##mO=ifNTc7!Ee>tH{=Bm?#u)f7z%$YAO*nr?zS$Os)<CDwu
z|F3vuVK2Arf5>T-F9k9;`Ibz7e4<FfR@QwJ^UJqjr3{aEYaKby+u#GVh{4m<&t;uc
GLK6Vjc1WxM

literal 0
HcmV?d00001

diff --git a/mediagoblin/static/images/background_lines.png b/mediagoblin/static/images/background_lines.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1b07afea7e4d2301b5e00edd6a81d2af9f7c9f0
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^j6lrA!3HEtFPV4&DVAa<&kznEsNqQI0P;BtJR*yM
z>aT$?<AnUmIY2?l64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1T~JzX3_
uIA$jAFk1N5UYHpOqz>x*{_f6f#>sFrfVID0&6yRbjKR~@&t;ucLK6Vk2Pj$q

literal 0
HcmV?d00001


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: [PATCH 24/26] adds conditional for display of media edit link

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

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 %}

From 7577b7dfbe1c69f38ed1dfba27ac273ff5b50f21 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 22 Jun 2011 12:38:08 -0500
Subject: [PATCH 25/26] Two not three ways to contribute now, reflecting that
 in docs :)

---
 docs/git.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/git.rst b/docs/git.rst
index ea367846..73e7a311 100644
--- a/docs/git.rst
+++ b/docs/git.rst
@@ -80,7 +80,7 @@ doing and why.
 How to send us your changes
 ---------------------------
 
-There are three ways to let us know how to get it:
+There are two ways to let us know how to get it:
 
 1. *(preferred)* **push changes to publicly available git clone and
    let us know where to find it**

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: [PATCH 26/26] 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(-)

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>