diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-07-07 18:04:19 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-07-07 18:04:19 +0200 |
| commit | af2fcba5c4ce16bde1a2267b95803bc2afc9e572 (patch) | |
| tree | 6323a6a4f6a10f7660a92c918bea2d2f0321f125 /mediagoblin/templates | |
| parent | 5ed4722de8106a512a4faacfedaae7b8eda7260b (diff) | |
| download | mediagoblin-af2fcba5c4ce16bde1a2267b95803bc2afc9e572.tar.lz mediagoblin-af2fcba5c4ce16bde1a2267b95803bc2afc9e572.tar.xz mediagoblin-af2fcba5c4ce16bde1a2267b95803bc2afc9e572.zip | |
Issue #431 - Prevent comment link expiry - Added functionality for comment linking
* `media.html`
* Changed comment textarea handle from `comment` => `field_comment`
* Active comment is hilighted with the CSS class name `comment_active`
and also with the hyperlink anchor #comment
* Changed media.html so that pagination always uses
Route('mediagoblin.user_pages.media_home') as base_url
* `user_pages/forms.py`
* Renamed MediaComment form field `comment` => `field_comment`
* `user_pages/routing.py`
* Added route for `/u/joar/m/123..456/c/234..567/`, points to `media_home`
* `user_pages/views.py`
* `media_home` now checks if the request contains a comment id parameter
then acts accordingly with pagination whether to call it with a
`jump_to_id` or not.
* `media_post_comment` - Updated MediaCommentForm field name
`comment` => `field_comment`
* `util.py`
* `redirect` now supports querystring arguments. - NOT USED (should we
keep it? I think so, it might be useful, sometime [don't call me a
code hoarder]).
* `Pagination.__init__` now accepts one further argument, the `jump_to_id`.
It assist the comment linking functionality in finding and returning the
proper page for a comment.
This feature will work for all kinds of objects. It might not be
optimal, but it is well functional :)
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 1484cc73..477eae61 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -55,7 +55,7 @@ <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', user= media.uploader().username, media=media._id) }}" method="POST"> - {{ wtforms_util.render_field_div(comment_form.comment) }} + {{ wtforms_util.render_field_div(comment_form.field_comment) }} <div class="form_submit_buttons"> <input type="submit" value="Post comment!" class="button" /> </div> @@ -65,7 +65,12 @@ {% if comments %} {% for comment in comments %} {% set comment_author = comment.author() %} - <div class="comment_wrapper" id="comment-{{ comment['_id'] }}"> + {% if pagination.active_id == comment._id %} + <div class="comment_wrapper comment_active" id="comment-{{ comment['_id'] }}"> + <a name="comment" id="comment"></a> + {% else %} + <div class="comment_wrapper" id="comment-{{ comment['_id'] }}"> + {% endif %} <div class="comment_content"> {% autoescape False %} {{ comment.content_html }} @@ -77,7 +82,10 @@ {{ comment_author['username'] }}</a> at <!--</div> <div class="comment_datetime">--> - <a href="#comment-{{ comment['_id'] }}"> + <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment', + comment = comment['_id'], + user = media.uploader().username, + media = media._id) }}#comment"> {{ "%4d-%02d-%02d %02d:%02d"|format(comment.created.year, comment.created.month, comment.created.day, @@ -88,7 +96,10 @@ </div> {% endfor %} - {{ render_pagination(request, pagination) }} + {{ render_pagination(request, pagination, + request.urlgen('mediagoblin.user_pages.media_home', + user = media.uploader().username, + media = media._id)) }} </div> {% endif %} <div class="grid_5 omega"> |