60 Commits

Author SHA1 Message Date
Aaron Williamson
25b48323a8 First crack at basic license support. 2012-01-17 00:33:55 -05:00
Aaron Williamson
152a3bfaa3 Finished splitting util.py into separate files. 2011-10-01 18:05:44 -04: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
7b80685ac5 Added a description to the slug field on the media entry form. 2011-09-04 23:05:06 -05:00
Christopher Allan Webber
7084661d5b #i536: Removing attachments stuff from edit_media(), in its own method now 2011-09-04 18:22:22 -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
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
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
10d7496da2 use config_spec.ini to store tag parsing directives 2011-07-25 23:46:36 -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
Christopher Allan Webber
0d91af09d2 Use cleaned_markdown_conversion in both cases in edit/views.py 2011-07-14 00:40:16 -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
93e3468a2a displays the tags on edit correctly now
-before it was running the tags field through the submit filter.
 that was kind of dumb
-removes the filter function from the edit form
-adds unicode syntax in the filter function
-uses split correctly when saving the edited tags to mongodb
2011-07-12 20:43:16 -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
Aaron Williamson
4c465852d1 Markdown-enable user bio (Feature 410) 2011-07-10 22:28:48 -04:00
Christopher Allan Webber
3054e2b3cb Sorry, that OptionalField belonged there.
I am a bad person and am not allowed to commit anything else today.
2011-07-09 17:16:18 -05:00
Christopher Allan Webber
f4cd7a4ade <Elrond> Oh well... Did I really have this wtforms cruft in my setup_workbench
commit. :-(  I don't know even, how it got in there. :-|
2011-07-09 17:13:21 -05:00
Christopher Allan Webber
9980c5f4f4 Merge remote branch 'remotes/gullydwarf-cfdv/b404_v3_edit_profile_submit_fail' 2011-07-09 09:30:43 -05:00
Caleb Forbes Davis V
04a9515064 F360(tagging) - adds tag fields for submission, edit and display 2011-07-08 01:59:44 -05:00
Caleb Forbes Davis V
0e1c036c7a Bug #437 - adds required validator to slug field for media edit'
otherwise we get a 404 because we navigate to blank slug
2011-07-07 11:11:03 -05:00
Caleb Forbes Davis V
4924d6a50c bug #404 - corrects querystring variable name in redirect 2011-07-07 10:45:23 -05:00
Christopher Allan Webber
1f69672478 Merge remote branch 'remotes/gullydwarf-cfdv/b404_v2_redirect_after_profile_edit'
Conflicts:
	mediagoblin/edit/views.py
2011-07-06 22:38:19 -05:00
Caleb Forbes Davis V
02542d54e1 edit profile submit redirects to user home page 2011-07-06 17:14:07 -05:00
Caleb Forbes Davis V
20d82d6046 B #429 - form validation allows blank profile url 2011-07-05 22:11:56 -05:00
Christopher Allan Webber
b86bedf9ea Switching single-quoted strings to double-quote to avoid escaping the apostrophe.. :) 2011-07-03 09:29:09 -05:00
Christopher Allan Webber
96a2c36642 Caution an admin when they're editing someone else's media. 2011-07-03 09:26:40 -05:00
Caleb Forbes Davis V
a0cf14fe7c uses new 'username' variable in querystring to specify the user to edit
Previously, this view only allowed editing of the logged-in user. Now you
  can specify the user to edit in the querystring. If you are an admin the
  view allows you to edit any user's profile, with a warning message. The
  warning only shows up if the admin is editing another user's profile.

Make sure to pass the username to this view at every step in the process
2011-07-03 02:56:00 -05:00
Caleb Forbes Davis V
d9ed098e74 Bug #404 - Successful profile edit is successful!
user is notified of successful profile edit w/o extra navigation
2011-07-01 22:33:54 -05:00
Jef van Schendel
1db7bed64b Several small UI changes to edit profile page: moved header, changed form wording, changed css class 2011-06-22 17:02:28 +02:00
Christopher Allan Webber
d220f87c12 I don't think we need the username to be part of the profile editing URL 2011-06-21 23:26:45 -05:00
Christopher Allan Webber
46fd661e34 Adding an extra space between function definitions 2011-06-21 23:26:18 -05:00
cfdv
78c0744077 Merge remote-tracking branch 'origin/master' into is315 2011-06-20 12:50:44 -05:00
cfdv
0bf340727e enables entering user details including website url and bio
fixes usage of objects. still need to display the data on user page
2011-06-18 21:30:56 -05:00
cfdv
630b57a366 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
* ?
2011-06-18 16:42:22 -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
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