2481 Commits

Author SHA1 Message Date
Sebastian Spaeth
2e4ad35962 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>
2012-11-15 12:01:31 +01:00
Sebastian Spaeth
2a6a3b8cce Slightly shorten the media_tags_as_string function
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2012-11-14 09:04:17 +01:00
dunkyp
36c7d93481 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>
2012-11-14 08:38:24 +01:00
Christopher Allan Webber
ee62c51d79 Merge remote-tracking branch 'refs/remotes/spaetz/trac_475_email_notification_checkbox' 2012-11-13 08:55:14 -06:00
LotusEcho
5e5b8acfec 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>
2012-11-13 15:47:34 +01:00
Jef van Schendel
52aef5b445 Revert thumbnail styling and sizing; allows for 5 thumbnails per row 2012-11-01 17:10:16 +01:00
Jef van Schendel
02e100ea1f Change to 5 thumbnails per row 2012-11-01 17:03:45 +01:00
Jef van Schendel
4232c52fab Change thumbnail width to 212px 2012-11-01 16:59:27 +01:00
Jef van Schendel
afb4631e65 Update Airy's base.html 2012-10-23 16:12:11 +02:00
Jef van Schendel
a4a2e2310e Move <a> end tag 2012-10-23 16:11:06 +02:00
Jef van Schendel
5e210d200d Remove obsolete dropdown styling 2012-10-23 16:09:40 +02:00
Jef van Schendel
a04bbd9dea Don't show link to original when the file is an image 2012-10-23 15:47:05 +02:00
Jef van Schendel
8567c0479f Don't show zoom in cursor if there is no larger version 2012-10-23 15:41:46 +02:00
Joar Wandborg
c43f8c1d92 Fixed attachments 2012-10-23 01:10:46 +02:00
Christopher Allan Webber
d7d9933735 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.
2012-10-22 11:07:01 -05:00
Christopher Allan Webber
7a0a308fe8 Set the user page to two columns wide so we don't have this weird wrapping.
This is a stopgap solution!
2012-10-22 11:06:15 -05:00
Jef van Schendel
294979824c Replace dropdown in top right with regular links 2012-10-21 21:49:39 +02:00
Jef van Schendel
9e443248aa Move "Add collection" and "Change account settings" links to root.html 2012-10-21 21:18:08 +02:00
Jef van Schendel
30a8828f9b Add "Add collection" link to Airy theme 2012-10-21 20:36:30 +02:00
Jef van Schendel
d329882503 Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin 2012-10-21 02:17:57 +02:00
Jef van Schendel
c40cb686de Styling edits to Airy theme 2012-10-21 02:17:38 +02:00
Joar Wandborg
ac4c5aef57 Added HTTP API auth plugin 2012-10-20 23:56:00 +02:00
Jef van Schendel
f93ac9f28c Implement new RSS icon for Airy theme 2012-10-20 18:33:26 +02:00
Jef van Schendel
e711d1cf72 Replace icon_feed.png with proper Airy version 2012-10-20 18:09:45 +02:00
Jef van Schendel
933b5a4963 Replace dark empty_dots.png for Airy theme 2012-10-20 16:47:31 +02:00
Jef van Schendel
e3f1fddf87 Fix thumbnail aspect ratios 2012-10-20 15:19:11 +02:00
Joar Wandborg
5b60ec41ee Removed Routes dependency, added admin routes 2012-10-20 12:35:03 +02:00
Jef van Schendel
54397b9063 Styling edits for buttons (Airy only) 2012-10-19 21:21:53 +02:00
Jef van Schendel
1c66750a4a Thumbnail styling edits plus edits to the object_gallery (4 columns instead of 5 by default) 2012-10-19 21:13:40 +02:00
Jef van Schendel
42d4763c7a Thumbnail styling edits to base theme and Airy theme 2012-10-19 21:01:44 +02:00
Joar Wandborg
d56e82635f Fixed OAuth access_token duplicate route
Changed route name to "[...]list_connections"
2012-10-15 22:59:53 +02:00
Christopher Allan Webber
0d857844b1 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
2012-10-14 16:26:23 -05:00
Joar Wandborg
1ec7ff2adb Fixed 404 page under werkzeug.routing
- Removed ?lang=<langcode> feature due to incompatibility with werkzeug
  routes in the current state of the architecture.
2012-10-14 20:05:44 +02:00
Joar Wandborg
7742dcc1fb 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.
2012-10-14 13:46:31 +02:00
Christopher Allan Webber
a817fb76b1 Fixing the airy attribution in the header.
Not written by me, and not goblincities! :)
2012-10-07 09:55:27 -05:00
Joar Wandborg
e2890c729f Fixed pylint issues, removed unused import 2012-10-02 22:29:22 +02:00
Joar Wandborg
e4a1b6d22a Added VideoThumbnailerMarkII
- Set video.processing to use VideoThumbnailerMarkII.
2012-10-02 16:56:29 +02:00
Joar Wandborg
3d7fa496ee Changed copy.copy(get_params) to dict(get_params)
in pagination because request.GET/request.args is immutable since the
switch to werkzeug.
2012-09-30 20:34:39 +02:00
Joar Wandborg
2806a857dd Removed debugging stuff from master 2012-09-30 14:49:50 +02:00
Joar Wandborg
b4ab702f10 Use RawConfigParser instead of dict.viewitems
dict.viewitems breaks python 2.6 compatibility.
2012-09-30 14:42:12 +02:00
Joar Wandborg
b1bb15d1f9 Set up celery logging from paste ini 2012-09-30 12:43:36 +02:00
Joar Wandborg
111a609df5 Replaced all request.POST with request.form, ...
- Fixed error handling in OAuth plugin
- Changed request.POST file fields to request.files
2012-09-29 21:08:20 +02:00
Joar Wandborg
a6ec38c3c1 Added OAuth test 2012-09-29 21:08:20 +02:00
Joar Wandborg
bee079f36f Fixed pylint/pep8 warnings in test/tools.py 2012-09-29 21:08:20 +02:00
Joar Wandborg
f1d06e1d6c Switch from webob.Request to werkzeug.wrappers.Request 2012-09-29 21:08:20 +02:00
Joar Wandborg
8518e95eb6 Grammar re: libasound2-dev 2012-09-29 20:39:17 +02:00
Joar Wandborg
34a853133f Added note about libasound2-dev to docs. 2012-09-29 20:35:49 +02:00
Joar Wandborg
942084fbfd Added cascade all, delete-orphan to ProcessingMetaData 2012-09-27 11:59:17 +02:00
Joar Wandborg
0df00eb68f Added tests for HTTP callbacks 2012-09-27 00:45:25 +02:00
Joar Wandborg
a11aa2d17a Added some OAuth plugin tests 2012-09-26 23:53:51 +02:00