Sebastian Spaeth [Thu, 29 Nov 2012 07:57:12 +0000 (08:57 +0100)]
Implement generic error pages
Rather than having a 404.html, a 403.html, a 500.html,...
we have a generic error.html template that we pass in an
error code, a title and a (html'ish) error message.
Implement the common render_404 and render_403 shortcuts. More exotic
cases can be achieved by the generic render_error function.
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Elrond [Wed, 28 Nov 2012 15:45:15 +0000 (16:45 +0100)]
Merge some small bits by spaetz. Needed later.
* commit '
9437ea4742':
Add commit argument to clean_orphan_tags
Add "commit" argument to Base model delete()
Sebastian Spaeth [Wed, 28 Nov 2012 13:36:58 +0000 (14:36 +0100)]
Add commit argument to clean_orphan_tags
So we can prevent the session from being committed if we don't want it.
Elrond [Wed, 28 Nov 2012 12:50:31 +0000 (13:50 +0100)]
Add "commit" argument to Base model delete()
In case we want to bundle db actions into a single transaction, we
can now use delete(commit=False) to prevent the transaction from being
committed immediately. This is useful when e.g. deleting a User() and
thousands of his MediaEntries in a single commit.
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Jef van Schendel [Tue, 27 Nov 2012 12:56:38 +0000 (13:56 +0100)]
Merge remote-tracking branch 'spaetz/focus_on_user_creation'
Christopher Allan Webber [Mon, 26 Nov 2012 21:15:13 +0000 (15:15 -0600)]
Merge remote-tracking branch 'refs/remotes/elrond/sql/migrate_new_tables'
Sebastian Spaeth [Mon, 26 Nov 2012 20:38:29 +0000 (21:38 +0100)]
Autofocus the username field on user creation
On a page with the single purpose to enter new user data, we should
auto-focus the username field. It is very annoying to have to click in
that field before starting to type. Theoretically, there is the "autofocus"
attribute in html5, but IE does not support that.
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Elrond [Mon, 26 Nov 2012 18:52:11 +0000 (19:52 +0100)]
Merge remote-tracking branch 'spaetz/390_delim' into review
* spaetz/390_delim:
No need to strip the tag 4 times
Slightly shorten the media_tags_as_string function
Remove tag delimiter configurability (#390), fixed pep-8 compliance
Christopher Allan Webber [Mon, 26 Nov 2012 18:50:17 +0000 (12:50 -0600)]
Merge remote-tracking branch 'elrond/for-schendje'
Christopher Allan Webber [Mon, 26 Nov 2012 17:57:33 +0000 (11:57 -0600)]
geolocation now on by default
Christopher Allan Webber [Mon, 26 Nov 2012 17:53:59 +0000 (11:53 -0600)]
Merge remote-tracking branch 'remotes/spaetz/410_OSM_attrib_v2'
Elrond [Sun, 25 Nov 2012 23:29:39 +0000 (00:29 +0100)]
Some small template changes
1) Change the "dashboard":
- Add a bunch of new links: Processing panel, Add media
- Use <ul>+<li> for the *list* of possible actions
2) Add a title attribute to the "add media to collection" link
Elrond [Sat, 24 Nov 2012 21:57:46 +0000 (22:57 +0100)]
Stop unicode conversion warning during dbupdate.
Just force the passed in name to MigrationManager() to unicode.
Elrond [Sat, 24 Nov 2012 18:19:18 +0000 (19:19 +0100)]
SQL Migrations: Rewrite table creation completely.
We have migrations creating new tables. Those currently use
"raw" table definitions. This easily gives errors (we
already had this problem).
So instead rewrite those to use declarative tables and use
those to create new tables. Just copy the new table over to
the migration, strip it down to the bare minimum, rename to
_v0, base it on declarative_base() and be done!
Do this for the current migrations.
Christopher Allan Webber [Fri, 23 Nov 2012 04:27:29 +0000 (22:27 -0600)]
Marking "attachment" stuff for translation (thanks for catching AVRS)
Elrond [Fri, 23 Nov 2012 23:15:41 +0000 (00:15 +0100)]
Require werkzeug >= 0.7
We need it, really. For csrf.py's request.scheme.
Thanks to Sebastian Spaeth!
Elrond [Tue, 20 Nov 2012 13:32:29 +0000 (14:32 +0100)]
Very small typo fix in deploying docs.
Thanks to #mediagoblin.
Christopher Allan Webber [Mon, 19 Nov 2012 18:17:44 +0000 (12:17 -0600)]
Suggest checking out the wiki for additional recipes
Sebastian Spaeth [Fri, 16 Nov 2012 12:18:37 +0000 (13:18 +0100)]
No need to strip the tag 4 times
spaetz' rule: Don't do sth 4 times when once suffices.
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Sebastian Spaeth [Wed, 14 Nov 2012 19:31:03 +0000 (20:31 +0100)]
Add geolocation_visible setting to mediagoblin.ini
Place the geolocation_visible setting (defaults to false) in
mediagoblin.ini to make it more discoverable (I needed to check
the source to find out how to enable it). I'd vote for a default
of true, we should come with some batteries included IMHO..
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Sebastian Spaeth [Wed, 14 Nov 2012 09:12:58 +0000 (10:12 +0100)]
Pop up OpenStreetMap license on demand (#410)
Only a short blurb "see map license" in the small map which will
pop up the full license text via jquery when clicked.
Adapt the license text as recommended by OpenStreetMap
http://www.openstreetmap.org/copyright and link there.
The disadvantage is that this only works when Javascript is enabled,
but as the map only works when Javascript is enabled in the first place,
this should not be too much of a limitation.
TODO: Our esteemed web designer needs to have a look at the desired color
style for this. Right now, I simply placed it in the message_warning
class. This might want fine-tuning.
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Christopher Allan Webber [Thu, 15 Nov 2012 20:40:00 +0000 (14:40 -0600)]
Borrowing an image from Tango!
Sebastian Spaeth [Fri, 9 Nov 2012 09:13:04 +0000 (10:13 +0100)]
Simplify/Robustify the thumbnail URL usage in templates
So far templates required a very complex blurb to simply insert a
thumbnail URL, exposing much of the internal logic to the template
designer. In addition, we would fail with an error if for some
reason the media_files['thumb'] entry was never populated.
This adds the MediaEntry.thumb_url property that template designers
can simply use. It will do the right thing, either fetching the proper
thumbnail or hand back a generic icon specified in a media's
MEDIA_MANAGER as "default_thumb".
Add an image default fallback icon (stolen from Tangos, which are
Public Domain since version 0.8.90 as I understand) since the one
we referred to was not existing. Perhaps, a "broken image" icon
would be better, but I'll leave that to our capable designers.
All templates have been modified to make use of the new thumb_url
function.
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Sebastian Spaeth [Wed, 14 Nov 2012 07:54:48 +0000 (08:54 +0100)]
Slightly shorten the media_tags_as_string function
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
dunkyp [Tue, 6 Nov 2012 13:32:48 +0000 (13:32 +0000)]
Remove tag delimiter configurability (#390), fixed pep-8 compliance
Hardcode commas as tag delimiters per discussion in issue 390. Also
improved PEP-8'ness of the file while touching. Includes some improvements
suggested by gandaro.
Reviewed-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Christopher Allan Webber [Tue, 13 Nov 2012 14:55:14 +0000 (08:55 -0600)]
Merge remote-tracking branch 'refs/remotes/spaetz/trac_475_email_notification_checkbox'
LotusEcho [Mon, 24 Sep 2012 20:15:34 +0000 (16:15 -0400)]
Don't put checkbox text on separate line (#475)
Manually render the "notify me" checkbox line in the account settings
to not put the form label as a heading but in the same line as the
checkbox.
Edit forms.py to use the label attribute for the caption.
Original patch modified by Sebastian Spaeth to 1) not translate the
checkbox label in the template, it is translated in forms.py already.
2) Simplify the HTML, manually constructing the <label> tag is not
necessary, WTforms does it automatically.
Author: LotusEcho <Emma.C.Echo@gmail.com>
Modified-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Jef van Schendel [Thu, 1 Nov 2012 16:10:16 +0000 (17:10 +0100)]
Revert thumbnail styling and sizing; allows for 5 thumbnails per row
Jef van Schendel [Thu, 1 Nov 2012 16:03:45 +0000 (17:03 +0100)]
Change to 5 thumbnails per row
Jef van Schendel [Thu, 1 Nov 2012 15:59:27 +0000 (16:59 +0100)]
Change thumbnail width to 212px
Jef van Schendel [Tue, 23 Oct 2012 14:12:11 +0000 (16:12 +0200)]
Update Airy's base.html
Jef van Schendel [Tue, 23 Oct 2012 14:11:06 +0000 (16:11 +0200)]
Move <a> end tag
Jef van Schendel [Tue, 23 Oct 2012 14:09:40 +0000 (16:09 +0200)]
Remove obsolete dropdown styling
Jef van Schendel [Tue, 23 Oct 2012 13:47:05 +0000 (15:47 +0200)]
Don't show link to original when the file is an image
Jef van Schendel [Tue, 23 Oct 2012 13:41:46 +0000 (15:41 +0200)]
Don't show zoom in cursor if there is no larger version
Joar Wandborg [Mon, 22 Oct 2012 23:09:09 +0000 (01:09 +0200)]
Fixed attachments
Christopher Allan Webber [Mon, 22 Oct 2012 16:07:01 +0000 (11:07 -0500)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Christopher Allan Webber [Mon, 22 Oct 2012 16:06:15 +0000 (11:06 -0500)]
Set the user page to two columns wide so we don't have this weird wrapping.
This is a stopgap solution!
Jef van Schendel [Sun, 21 Oct 2012 19:49:39 +0000 (21:49 +0200)]
Replace dropdown in top right with regular links
Jef van Schendel [Sun, 21 Oct 2012 19:18:08 +0000 (21:18 +0200)]
Move "Add collection" and "Change account settings" links to root.html
Jef van Schendel [Sun, 21 Oct 2012 18:36:30 +0000 (20:36 +0200)]
Add "Add collection" link to Airy theme
Jef van Schendel [Sun, 21 Oct 2012 00:17:57 +0000 (02:17 +0200)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Jef van Schendel [Sun, 21 Oct 2012 00:17:38 +0000 (02:17 +0200)]
Styling edits to Airy theme
Joar Wandborg [Sat, 20 Oct 2012 21:56:00 +0000 (23:56 +0200)]
Added HTTP API auth plugin
Jef van Schendel [Sat, 20 Oct 2012 16:33:26 +0000 (18:33 +0200)]
Implement new RSS icon for Airy theme
Jef van Schendel [Sat, 20 Oct 2012 16:09:45 +0000 (18:09 +0200)]
Replace icon_feed.png with proper Airy version
Jef van Schendel [Sat, 20 Oct 2012 14:47:31 +0000 (16:47 +0200)]
Replace dark empty_dots.png for Airy theme
Jef van Schendel [Sat, 20 Oct 2012 13:19:11 +0000 (15:19 +0200)]
Fix thumbnail aspect ratios
Joar Wandborg [Sat, 20 Oct 2012 10:09:23 +0000 (12:09 +0200)]
Removed Routes dependency, added admin routes
Jef van Schendel [Fri, 19 Oct 2012 19:21:53 +0000 (21:21 +0200)]
Styling edits for buttons (Airy only)
Jef van Schendel [Fri, 19 Oct 2012 19:13:40 +0000 (21:13 +0200)]
Thumbnail styling edits plus edits to the object_gallery (4 columns instead of 5 by default)
Jef van Schendel [Fri, 19 Oct 2012 19:01:44 +0000 (21:01 +0200)]
Thumbnail styling edits to base theme and Airy theme
Joar Wandborg [Sun, 14 Oct 2012 22:12:58 +0000 (00:12 +0200)]
Fixed OAuth access_token duplicate route
Changed route name to "[...]list_connections"
Christopher Allan Webber [Sun, 14 Oct 2012 21:26:23 +0000 (16:26 -0500)]
Added rudimentary route "mounting" w/ werkzeug routes; fixed auth routes
auth routes fixes:
- mounted the auth routes at /auth/
- removed crufty old verification email route
Joar Wandborg [Sun, 14 Oct 2012 18:05:44 +0000 (20:05 +0200)]
Fixed 404 page under werkzeug.routing
- Removed ?lang=<langcode> feature due to incompatibility with werkzeug
routes in the current state of the architecture.
Joar Wandborg [Sun, 14 Oct 2012 11:46:31 +0000 (13:46 +0200)]
Switched most stuff over from Routes
Removed the Routes routing functionality and replaced it with
werkzeug.routes. Most views are functional.
Known issues:
- Translation integration with the request object is not yet figured
out. This breaks 404 pages.
Christopher Allan Webber [Sun, 7 Oct 2012 14:55:27 +0000 (09:55 -0500)]
Fixing the airy attribution in the header.
Not written by me, and not goblincities! :)
Joar Wandborg [Tue, 2 Oct 2012 20:29:22 +0000 (22:29 +0200)]
Fixed pylint issues, removed unused import
Joar Wandborg [Tue, 2 Oct 2012 14:56:29 +0000 (16:56 +0200)]
Added VideoThumbnailerMarkII
- Set video.processing to use VideoThumbnailerMarkII.
Joar Wandborg [Sun, 30 Sep 2012 18:34:39 +0000 (20:34 +0200)]
Changed copy.copy(get_params) to dict(get_params)
in pagination because request.GET/request.args is immutable since the
switch to werkzeug.
Joar Wandborg [Sun, 30 Sep 2012 12:49:50 +0000 (14:49 +0200)]
Removed debugging stuff from master
Joar Wandborg [Sun, 30 Sep 2012 12:42:12 +0000 (14:42 +0200)]
Use RawConfigParser instead of dict.viewitems
dict.viewitems breaks python 2.6 compatibility.
Joar Wandborg [Sun, 30 Sep 2012 10:43:36 +0000 (12:43 +0200)]
Set up celery logging from paste ini
Joar Wandborg [Sat, 29 Sep 2012 19:07:15 +0000 (21:07 +0200)]
Replaced all request.POST with request.form, ...
- Fixed error handling in OAuth plugin
- Changed request.POST file fields to request.files
Joar Wandborg [Sat, 29 Sep 2012 19:06:14 +0000 (21:06 +0200)]
Added OAuth test
Joar Wandborg [Sat, 29 Sep 2012 19:05:01 +0000 (21:05 +0200)]
Fixed pylint/pep8 warnings in test/tools.py
Joar Wandborg [Thu, 27 Sep 2012 19:41:48 +0000 (21:41 +0200)]
Switch from webob.Request to werkzeug.wrappers.Request
Joar Wandborg [Sat, 29 Sep 2012 18:39:17 +0000 (20:39 +0200)]
Grammar re: libasound2-dev
Joar Wandborg [Sat, 29 Sep 2012 18:35:49 +0000 (20:35 +0200)]
Added note about libasound2-dev to docs.
Joar Wandborg [Thu, 27 Sep 2012 09:59:17 +0000 (11:59 +0200)]
Added cascade all, delete-orphan to ProcessingMetaData
Joar Wandborg [Wed, 26 Sep 2012 22:45:25 +0000 (00:45 +0200)]
Added tests for HTTP callbacks
Joar Wandborg [Wed, 26 Sep 2012 21:33:20 +0000 (23:33 +0200)]
Added some OAuth plugin tests
Joar Wandborg [Mon, 24 Sep 2012 23:06:25 +0000 (01:06 +0200)]
HTTP callback fixes
- Added HTTPError catching around the callback request, to not mark the
entry as failed, just log the exception.
- Fixed bug where I forgot to actually fetch the entry before passing it
to json_processing_callback.
- Changed __main__ migration #6 to create the ProcessingMetaData table
as it is currently, to prevent possible breakage if a siteadmin
is lagging behind with his db migrations and more than one migration
wants to fix stuff with the ProcessingMetaData table.
Joar Wandborg [Mon, 24 Sep 2012 21:47:32 +0000 (23:47 +0200)]
Added support for http callbacks on processing
Sends an HTTP POST request back to an URL given on submission to the API
submit view.
Christopher Allan Webber [Mon, 24 Sep 2012 19:01:53 +0000 (14:01 -0500)]
Committing extracted and compiled translations
Christopher Allan Webber [Mon, 24 Sep 2012 19:01:20 +0000 (14:01 -0500)]
Committing present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Mon, 24 Sep 2012 19:00:00 +0000 (14:00 -0500)]
Too much was marked for translation this gettext message.
Thanks for catching AVRS!
LotusEcho [Mon, 24 Sep 2012 16:05:18 +0000 (12:05 -0400)]
Changed a <p/> to </p> in user.html. Removed the <p></p> wrappers in profile.html which was included in user.html.
Christopher Allan Webber [Mon, 24 Sep 2012 16:42:17 +0000 (11:42 -0500)]
Committing extracted and compiled translations
Christopher Allan Webber [Mon, 24 Sep 2012 16:41:43 +0000 (11:41 -0500)]
Committing present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Mon, 24 Sep 2012 16:38:55 +0000 (11:38 -0500)]
Correcting a couple of spelling errors. Thanks elesa, for finding them!
Joar Wandborg [Sat, 22 Sep 2012 12:19:51 +0000 (14:19 +0200)]
Removed logging entry from sniff_handler
The logging entry caused the submit page to crash if you tried to upload
an SVG with a non-ascii filename.
Joar Wandborg [Sat, 22 Sep 2012 10:03:32 +0000 (12:03 +0200)]
Fixed typos visisble, appplication
Christopher Allan Webber [Fri, 21 Sep 2012 20:38:14 +0000 (15:38 -0500)]
Committing extracted and compiled translations
Joar Wandborg [Fri, 21 Sep 2012 11:20:56 +0000 (13:20 +0200)]
Added name kwarg to Column(Enum(...)) in OAuth models
Joar Wandborg [Fri, 21 Sep 2012 11:16:24 +0000 (13:16 +0200)]
Added flask-wtf html5 fields to extlib
Joar Wandborg [Fri, 21 Sep 2012 11:02:35 +0000 (13:02 +0200)]
Added client registration caps to OAuth plugin
THE MIGRATIONS SUPPLIED WITH THIS COMMIT WILL DROP AND RE-CREATE YOUR
oauth__tokens AND oauth__codes TABLES. ALL YOUR OAUTH CODES AND TOKENS
WILL BE LOST.
- Fixed pylint issues in db/sql/migrations.
- Added __repr__ to the User model.
- Added _disable_cors option to json_response.
- Added crude error handling to the api.tools.api_auth decorator
- Updated the OAuth README.
- Added client registration, client overview, connection overview,
client authorization views and templates.
- Added error handling to the OAuthAuth Auth object.
- Added AuthorizationForm, ClientRegistrationForm in oauth/forms.
- Added migrations for OAuth, added client registration migration.
- Added OAuthClient, OAuthUserClient models.
- Added oauth/tools with require_client_auth decorator method.
Joar Wandborg [Wed, 19 Sep 2012 20:13:16 +0000 (22:13 +0200)]
Fixed typo in OAuth README
Joar Wandborg [Wed, 19 Sep 2012 20:12:13 +0000 (22:12 +0200)]
Added security warning to OAuth README
Joar Wandborg [Wed, 19 Sep 2012 19:57:59 +0000 (21:57 +0200)]
Fixed a horrible security issue in the OAuth plugin.
Also added some real triggering logic to the OAuthAuth Auth object.
Joar Wandborg [Tue, 18 Sep 2012 19:51:22 +0000 (21:51 +0200)]
Added some more helpful links to the OAuth docs
- OAuth v2.25 draft
- IRC channel
- OAuth plugin source code
Joar Wandborg [Tue, 18 Sep 2012 19:44:02 +0000 (21:44 +0200)]
Fixed typo in OAuth docs, recieve => receive
Joar Wandborg [Tue, 18 Sep 2012 19:42:10 +0000 (21:42 +0200)]
Added documentation for the OAuth plugin
Joar Wandborg [Tue, 18 Sep 2012 16:19:26 +0000 (18:19 +0200)]
Style fixes
Aaron Williamson [Tue, 18 Sep 2012 15:16:26 +0000 (11:16 -0400)]
Fixed post-collect redirect to always take user to image collected.
Aaron Williamson [Sun, 2 Sep 2012 23:19:41 +0000 (19:19 -0400)]
Fixed collection sidebar for media_home to user collection.url_for_self instead of incorrectly getting the session user
Aaron Williamson [Thu, 30 Aug 2012 21:42:04 +0000 (17:42 -0400)]
Reference collection creator through already-existing collection_item's foreign key
Aaron Williamson [Thu, 30 Aug 2012 21:15:50 +0000 (17:15 -0400)]
Removed unnecessary reference to may_edit_collection in edit views.py
Aaron Williamson [Thu, 30 Aug 2012 21:14:08 +0000 (17:14 -0400)]
Added default for 'collected' column to migration
Aaron Williamson [Thu, 30 Aug 2012 20:55:31 +0000 (16:55 -0400)]
Fixed migrations for Collection and CollectionItem tables