From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 3 Jul 2011 02:16:39 +0000 (-0500)
Subject: Merge remote branch 'remotes/gullydwarf-cfdv/f401_prev_next_media_nav'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=230e1bd7706b823bf0e57877ec22d17e4903b1a2;p=mediagoblin.git

Merge remote branch 'remotes/gullydwarf-cfdv/f401_prev_next_media_nav'

Conflicts:
	mediagoblin/db/models.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
---

230e1bd7706b823bf0e57877ec22d17e4903b1a2
diff --cc mediagoblin/db/models.py
index 1d91a14b,cfd83430..8aa35ca9
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@@ -22,7 -22,8 +22,7 @@@ from mediagoblin import uti
  from mediagoblin.auth import lib as auth_lib
  from mediagoblin import mg_globals
  from mediagoblin.db import migrations
- from mediagoblin.db.util import DESCENDING, ObjectId
+ from mediagoblin.db.util import ASCENDING, DESCENDING, ObjectId
 -from mediagoblin.util import Pagination
  
  ###################
  # Custom validators
diff --cc mediagoblin/templates/mediagoblin/user_pages/media.html
index 0c13f5c4,6159a853..21506ee4
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@@ -90,25 -93,12 +90,26 @@@
          {% include "mediagoblin/utils/pagination.html" %}
        </div>
      {% endif %}
 -
      <div class="grid_4 omega media_sidebar">
 -      <p>This is a sidebar! Yay!</p>
+       {% include "mediagoblin/utils/prev_next.html" %}
 +      <h3>Sidebar content here!</h3>
 +      <p>
 +        {% if media['uploader'] == request.user['_id'] %}
 +          <p>
 +            <a href="{{ request.urlgen('mediagoblin.edit.edit_media',
 +                                       user= media.uploader().username,
 +                                       media= media._id) }}"
 +               ><img src="{{ request.staticdirect('/images/icon_edit.png') }}"
 +                     class="media_icon" />edit</a>
 +          </p>
 +          <p>
 +            <img src="{{ request.staticdirect('/images/icon_delete.png') }}"
 +                 class="media_icon" />delete
 +          </p>
 +        {% endif %}
 +      </p>
      </div>
    {% else %}
 -  <p>Sorry, no such media found.<p/>
 +    <p>Sorry, no such media found.<p/>
    {% endif %}
  {% endblock %}