108 Commits

Author SHA1 Message Date
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
Christopher Allan Webber
a237735a70 Mark description field's label for translation 2011-09-05 18:19:24 -05:00
Will Kahn-Greene
12a100e4d8 508. Updates copyright/license information 2011-09-01 20:50:19 -04: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
6788b4123e Capture and properly handle errors.
Handled in several places:

 - In the run() of the ProcessMedia itself for
   handled (BaseProcessingFail derived) errors (best to do these not
   in on_failure because the errors are highlighted in celeryd in a
   way that looks inappropriate for when the errors are well handled)
 - In ProcessMedia.on_failure() for all other errors
 - In the submit view where all exceptions are caught, media is marked
   at having failed, then the error is re-raised.  (The reason for
   this is that users running in "lazy" mode will get errors
   propagated by celery and so on_failure won't run for them.)
2011-08-13 12:21:06 -05:00
Christopher Allan Webber
4a477e246d Proper handling of processor failures, working as hoped!
BaseProcessingFail based exceptions recorded and marked appropriately
in the database.  Other exceptions also caught and marked (or rather
not marked) appropriately in the database as well.
2011-08-13 10:59:34 -05:00
Christopher Allan Webber
ba4858c5b4 Merge branch 'master' into processing
Conflicts:
	mediagoblin/db/migrations.py
2011-08-11 22:54:11 -05:00
Christopher Allan Webber
07934b442f Moving things around a bit/commenting in the submit view to make the workflow clearer 2011-08-11 11:30:26 -05:00
Caleb Forbes Davis V
f6bf68cae5 Feature #446 - Render the submission form using the render_divs macro
- Currently there are individual calls to wtforms_util.render_field_div
for each field in the media submit form, which is too verbose
- Matched the field ordering in submit/form.py to the verbose version
- hacks the correct textareafield rendering with hard-coded rows and
columns.
- TODO - figure out how to pass the textarea dimensions with **kwargs
2011-08-11 00:50:16 -05:00
Christopher Allan Webber
1b57c29082 Merge branch 'master' into processing 2011-08-10 21:04:55 -05:00
Christopher Allan Webber
f64e525090 Generate the ObjectId() manually instead of via .save() 2011-08-10 21:03:16 -05:00
Christopher Allan Webber
d990a37998 We should save the entry *after* we add the queued_task_id. 2011-08-10 20:26:22 -05:00
Christopher Allan Webber
852d5bb238 Merge branch 'master' into processing 2011-08-10 19:53:37 -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
4b1adc132c Marked relevant strings in python views/forms for translation via ugettext 2011-08-08 22:53:39 -05:00
Joar Wandborg
2c4374938f Feature #482 - Media attachments 2011-08-05 22:08:29 +02:00
Christopher Allan Webber
3539dc8fb6 TOO_LONG_TAG_WARNING isn't needed in this module 2011-07-30 21:44:36 -05:00
Christopher Allan Webber
3cdf366acf Merge branch 'remotes/gullydwarf-cfdv/f360_tagging' (early part) into mergetags
Conflicts:
	mediagoblin/config_spec.ini
	mediagoblin/edit/views.py
	mediagoblin/util.py
2011-07-30 13:09:01 -05:00
Will Kahn-Greene
fc3dc25541 Adds license header 2011-07-30 08:39:07 -04:00
Caleb Forbes Davis V
0712a06dc6 changes tags to a list of dicts in the db, adding tag slugs
- adds a function to convert the tag list of dicts to a text string
  properly delimited for loading into forms
- tag string conversion function updated to generate list of dicts
- updates all mentions of the conversion of the string to the tags db
  object
- adds a tags template utility and updates the media template accordingly
2011-07-27 14:51:57 -05:00
Caleb Forbes Davis V
97e4498c10 on submission, use inline error messaging instead of message queue
- the function that converts the user's tag string into a list of
  tags now accepts a string, but the media submit view was still
  submitting the request object, like we were going to add any
  errors to the session. Now the submit view passes the tag string
2011-07-26 00:00:50 -05:00
Christopher Allan Webber
6b9ee0ca13 Store the task id of a processing action in the database. 2011-07-24 23:12:46 -05:00
Caleb Forbes Davis V
909371cdce raises tag length error in form context instead of in message queue 2011-07-21 00:02:57 -05:00
Caleb Forbes Davis V
cc7ff3c505 enforces maximum tag length with (in)appropriate messaging 2011-07-13 00:03:49 -05:00
Caleb Forbes Davis V
6f2e4585cc uses standard functions instead of form filters and fixes taglist default
- seems simpler to use the same tag field processing procedures on media
  submit and edit, so now processing with a regular function instead of
  a form filter. Filters run on form load and post by default.
- moved tags to sidebar
- taglist defaults to [] instead of None
- adds case sensitivity toggle
2011-07-12 22:43:26 -05:00
Caleb Forbes Davis V
cdf538bd61 adds filter function to parse and clean tags field input
- for some reason the tags are showing up in the media edit form
  with u'..' and surrounded with []. I don't know why, grr
2011-07-12 20:06:17 -05:00
Rasmus Larsson
eedc5428fd Removed route, view and template file for "Submit Success" page 2011-07-09 02:47:06 +02:00
Caleb Forbes Davis V
04a9515064 F360(tagging) - adds tag fields for submission, edit and display 2011-07-08 01:59:44 -05:00
Joar Wandborg
4dc7444119 Feature #409 - Submitting an image should redirect you back to user's
page w/ a message

*   Successful submission redirects to the logged in user's page
    (your own, presumably).
*   "Woohoo! Submitted!" is launched into the tube of session messages
    to appear on next pageload. If you're not aborting in the window
    of 210ms it takes for the client to respond to the 302 and load
    the logged in user's/your page that is, YMMV.
2011-07-03 07:50:35 +02:00
Christopher Allan Webber
4bf8e8888c Adds util.cleaned_markdown_conversion() and uses it in the submission process
This simplifies the markdown processing & html cleaning of descritions
and etc by providing a wrapper function that we can use in multiple
locations.
2011-06-19 20:41:40 -05:00
Joar Wandborg
44e51d3464 Made changes according to http://bugs.foocorp.net/issues/363#note-5 2011-06-15 23:07:54 +02:00
Joar Wandborg
44e2da2fe6 Added Markdown rendering for media_entry 2011-06-12 03:24:31 +02:00
Christopher Allan Webber
eb21f9a6cb Fixing check_filetype...
We need to check the first part of the guess_type returned tuple, and
also this try: except: doesn't belong here, so killing.
2011-06-07 00:36:24 -05:00
Christopher Allan Webber
fe4ffb860f Added a comment to clarify that this shouldn't stay here. 2011-06-06 07:57:05 -05:00
Christopher Allan Webber
2190ecde8d Merge remote branch 'remotes/gandaro/324-bad-media-types' 2011-06-06 07:51:17 -05:00
Christopher Allan Webber
2262b2a9e1 Made a simple template rendering view and switched a bunch of code over to using it 2011-06-05 15:58:35 -05:00
Christopher Allan Webber
9038c9f9ac I have a strong preference for aligning all parameters in a function call. 2011-06-05 15:41:08 -05:00
Elrond
9150244afa Create redirect shortcut and use it around
This is just replacing exc.HTTPFound(location=request.urlgen(...))
by redirect(request, ...). No magic.
2011-06-05 16:16:03 +02:00
Elrond
c9c2493435 Reformat render_to_response calls
Just a simple indentation and ordering change, no
functional change.
2011-06-05 16:16:03 +02:00
Elrond
1c63ad5d35 Create render_to_reponse and use it everywhere.
Just a shortcut for Response(render_template(...))
2011-06-05 16:16:03 +02:00
Christopher Allan Webber
b5d3aec615 Moving all views over to using util.render_template()! 2011-06-04 17:36:36 -05:00
Jakob Kramer
3eeadc922a add changes in mediagoblin/submit/views.py 2011-06-02 17:47:53 +02:00
Jakob Kramer
5603d4df8f should fix #324 2011-06-02 17:47:51 +02:00
Christopher Allan Webber
16509be160 Update all the views so that they use the uploader reference instead
of uploader embedding
2011-05-22 16:06:45 -05:00
Aaron Williamson
0546833c6e Generate unique slugs for newly submitted images. 2011-05-13 12:18:52 -04:00
Christopher Allan Webber
a8e2812b05 min=0 makes more sense than min=-1 2011-05-12 23:40:47 -05:00
Aaron Williamson
bb49e56f8c On image submission, do not require title. If none entered, default to filename. 2011-05-12 23:38:02 -05:00