234 Commits

Author SHA1 Message Date
Jef van Schendel
75a12d632d Lots of changes to media page; rearranged things, added new styles, added jquery bits, gave the comment section a refresh 2011-12-09 22:37:20 +01:00
Elrond
f4ee839939 Dot-Notation for MediaEntry.media_type 2011-12-05 21:08:58 +01:00
Elrond
bec591d85b Dot-Notation for Users.is_admin 2011-12-05 21:08:57 +01:00
Elrond
7a3d00ec21 Dot-Notation for Users.status 2011-12-05 21:08:57 +01:00
Elrond
5a4e3ff1e2 Dot-Notation for Users.username 2011-12-05 21:08:57 +01:00
Jef van Schendel
eae7d0585f Changed comment error message wording slightly. Btw, should we translate these things? 2011-12-03 01:19:15 +01:00
Christopher Allan Webber
99d2ac1d83 Merge remote-tracking branch 'remotes/jwandborg/master' 2011-11-24 15:24:58 -06:00
Elrond
3018832153 Rename MediaEntry.uploader() to .get_uploader()
The .uploader() method conflicts with the uploader database
field. As we're moving to .FIELD for db field access, this
is a relevant conflict.

So renaming .uploader() to .get_uploader()
2011-11-22 22:29:37 +01:00
Elrond
ea33f63635 Wrap long line.
Nothing else.
2011-11-22 21:48:56 +01:00
Pablo J. Urbano Santos
56bfd91ab4 Added a message noticing the user the image has been successfully
deleted.
2011-11-22 21:07:09 +01:00
Pablo J. Urbano Santos
d0ba62e2e7 Fixes #597. Add a visible error when user tries to delete an image
without cheking the "I'm sure" checkbox.
2011-11-22 20:29:33 +01:00
Joar Wandborg
b9e1fa280e Merge branch 'video_gstreamer-only'
Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/submit/views.py
2011-11-21 21:51:30 +01:00
Christopher Allan Webber
7c378f2cd5 Allow user to set whether comments are ascending or descending 2011-11-19 14:01:38 -06:00
Pablo J. Urbano Santos
1a3138addd media_home: order comments by ascending date. 2011-11-19 19:15:41 +01:00
Elrond
eabe6b678a Dot-Notation for "_id"
Note: Migrations can't use "Dot Notation"!

Migrations run on pymongo, not mongokit.
So they can't use the "Dot Notation".
This isn't really a big issue, as migrations are anyway
quite mongo specific.
2011-11-15 11:32:13 +01:00
Christopher Allan Webber
ee91c2b88d Merge remote-tracking branch 'remotes/nyergler/pep8-ification'
Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/db/models.py
	mediagoblin/user_pages/views.py
	mediagoblin/util.py
2011-11-13 20:23:26 -06:00
Christopher Allan Webber
98308e61b6 Removed the bloof print debugging 2011-11-02 08:55:02 -05:00
Christopher Allan Webber
95e12bf231 Make sure you can't force comments on entries that don't exist.
See: http://bugs.foocorp.net/issues/621
2011-11-02 08:53:33 -05:00
Aaron Williamson
2b3a50db43 Make Comment posted! translatable. 2011-10-04 16:32:41 -04:00
Aaron Williamson
7298ffa11b Added a check to prevent blank messages from being posted. 2011-10-03 21:03:36 -04:00
Nathan Yergler
243c3843bd Whitespace and formatting cleanup.
* Removed trailing whitespace
* Line length < 80 where possible
* Honor conventions on number of blank lines
* Honor conventions about spaces around :, =
2011-10-01 15:10:02 -07:00
Aaron Williamson
152a3bfaa3 Finished splitting util.py into separate files. 2011-10-01 18:05:44 -04:00
Aaron Williamson
ae3bc7fabf Moved common, translation, template, and url code out of util.py and into tools/[file].py 2011-10-01 09:31:42 -04:00
Joar Wandborg
93bdab9daa Multimedia support - Commiting from a not yet finished state - Details below
* DONE Initially testing with arista
** DONE Video display templates
*** TODO Multi-browser support
** TODO Video thumbnails
** TODO Link to original video
** TODO Video cropping

Also contains a lot of "debug" print's
2011-09-23 02:35:57 +02:00
Elrond
8d7b549bb6 Use media.url_for_self() instead of generating it
Some places used to generate the URL for a media entry on
their own instead of calling media.url_for_self() to do
that. The later handles missing slugs better.
2011-09-09 23:59:32 +02:00
Christopher Allan Webber
7624c641cd Updating the confirm delete form: checkboxes shouldn't be required, make translatable 2011-09-05 23:20:08 -05:00
Shawn Khan
8daef28dc7 Page Redesign to Delete confirmation page 2011-09-05 20:37:08 -05:00
Will Kahn-Greene
12a100e4d8 508. Updates copyright/license information 2011-09-01 20:50:19 -04:00
Christopher Allan Webber
7a4c0126df Caution the admins about deleting the users' media though. 2011-08-30 22:38:09 -05:00
Joar Wandborg
502073f2bf Feature #403 - Ability to delete media entries - Fixes according to feedback
*   Moved `mediagoblin.confirm` stuff to `mediagoblin.user_pages`,
    templates too.
*   Removed route extension for `mediagoblin.confirm`
*   Created `delete_media_files` which deletes all media files
    on the public_store when the entry is deleted
*   Created a new decorator to check if a user has the permission
     to delete an entry.
2011-08-30 23:16:46 +02:00
Christopher Allan Webber
39b45e2035 I think confirm_delete deserves a url like /confirm-delete/ rather than /confirm/
Adjusting appropriately.
2011-08-29 08:05:35 -05:00
Christopher Allan Webber
7dc3a66f92 Merge remote branch 'remotes/jwandborg/f403_ability_to_delete'
Conflicts:
	mediagoblin/edit/views.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
	mediagoblin/user_pages/routing.py
2011-08-28 22:05:54 -05:00
Christopher Allan Webber
894fa564e7 Merge branch 'master' into jwandborg-f482_media_attachments
Conflicts:
	mediagoblin/config_spec.ini
	mediagoblin/edit/forms.py
	mediagoblin/edit/views.py
	mediagoblin/submit/views.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
2011-08-22 21:48:45 -05:00
Joar Wandborg
3a8c3a3855 Feature #482 - Media attachments -
*   Moved attachment uploading to separate view
*   Support for multiple attachments!
2011-08-22 18:06:28 +02:00
Mark Holmquist
08750772ea + 'confirm' section for confirmation dialogues
+ implemented delete functionality
* fixed several instances of 'must be an instance of unicode, not str'
2011-08-22 02:57:40 -07:00
Christopher Allan Webber
de12b4e773 Use render_404 EVERYWHERE! 2011-08-20 15:57:24 -05:00
Christopher Allan Webber
01c75c7eba Processing panel view
Now you can view your failed and in-process media items!
2011-08-14 07:56:10 -05:00
Christopher Allan Webber
9bc564ff53 Minor change to indentation 2011-08-10 12:44:58 -05:00
Christopher Allan Webber
369fd2f972 Ooops! We should do a fake ugettext passthrough here also. 2011-08-10 12:28:42 -05:00
Christopher Allan Webber
ad4aef3a67 Removing a tab. This is a tab-free zone! 2011-08-10 12:08:14 -05:00
Christopher Allan Webber
7960ac985f Converting all forms to use the "fake/null" gettext conversion function
Gettext doesn't actually get run right in the form but we do need to
wrap the strings in _() so stuff extracts :)
2011-08-10 12:07:59 -05:00
Christopher Allan Webber
a5303e4791 For no good reason, I feel like 15 is a good number of default feed items. 2011-07-31 21:05:35 -05:00
Will Kahn-Greene
50854db05d Tweaks import lines switching \ for ( ). 2011-07-30 08:40:06 -04:00
Will Kahn-Greene
fc3dc25541 Adds license header 2011-07-30 08:39:07 -04:00
Christopher Allan Webber
990d3b6985 Give useful verification information on users that need to verify their email 2011-07-28 22:12:24 -05:00
Joar Wandborg
f646f5d36d Updated MediaCommentForm.field_comment => MediaCommentForm.comment_content
*   Also changed file encoding of `user_pages/forms.py` from dos to unix.
2011-07-07 22:45:51 +02:00
Joar Wandborg
af2fcba5c4 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 :)
2011-07-07 18:04:19 +02:00
Christopher Allan Webber
5949be9ad6 Make pagination on user profile point to the user gallery
This required a couple of changes:
 - making a new render_pagination macro
 - switching things over to use that
2011-07-02 22:09:46 -05:00
Joar Wandborg
6f59a3a324 Issue #362 - Simple comments - Changes based on feedback recieved from #mediagoblin
*   `db.models` - Removed `MediaEntry.get_comments()` and replaced it with a helper
    which just returns a cursor for the comments query
*   `media.html` - Added `{% set comment_author = comment.author() %}`
*   `user_pages.views` - media_home() now passes `MediaEntry.get_comments()`
    directly to `Pagination`, handles pagination for comments.
    *   Added `MEDIA_COMMENTS_PER_PAGE` to define the number of comments per page
        in the `media_home()` view.
2011-07-01 15:26:29 +02:00
Christopher Allan Webber
52359e9103 Excitedly send a user a message that their comment was posted. 2011-06-29 20:51:17 -05:00