aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Changing translations to say "amount of time ago", basicallyChristopher Allan Webber2013-04-131-8/+10
| | | | | | | | | | | | Previously they were just "amount of time"... I think this fits a bit better.
* | | Adds the fuzzy timestamp to the admin panel tooJessica T2013-04-121-1/+1
| | |
* | | Adds the timesince ability which fixes #394Jessica T2013-04-111-3/+5
|/ /
* | Merge branch 'joar-skip_transcoding'Christopher Allan Webber2013-03-043-13/+28
|\ \
| * | Per Elrond's suggestions moving DEFAULT_WEBM_TYPE to media managerChristopher Allan Webber2013-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | The reason for this is to avoid defining this twice as we were previously (once in the template, once in video/models.py) This commit sponsored by Roland McIntosh. Thank you!
| * | Extrapolate type= based on the video metadata that we have, if we can.Christopher Allan Webber2013-03-031-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | It's kind of awkward because it relies on there being a entry.media_data, but that's not guaranteed... (see http://issues.mediagoblin.org/ticket/650) so we use a dopey fallback in the template in that case (kind of annoying info duplication). This commit sponsored by Piotr Wieczorek. Thank you!
| * | Mild cosmetic cleanups to video.html and adding missing </li> elements.Christopher Allan Webber2013-03-031-8/+16
| | | | | | | | | | | | This commit sponsored by Jukka Hellen. Thanks!
| * | {% set %} the display_type and display_path and use that elsewhereChristopher Allan Webber2013-03-031-2/+3
| | | | | | | | | | | | | | | | | | This will make some stuff a bit cleaner that's coming up... This commit sponsored by J B Nicholson-Owens. Thanks!
| * | Huge amount of work to (mostly) allow .ogg (and maybe other) formats to skip ↵Christopher Allan Webber2013-03-023-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transcode - Update get_display_media in several ways: - now uses the media type's own declaration of the order of things - returns both the media_size and the media_path, as per the docstring - implicitly uses self.media_files as opposed to forcing you to pass it in - update videos to use get_display_media - update images to declare media_fetch_order in the media manager (videos also) - update stl to use media.media_files['original'] instead of weird use of get_display_media - update sidebar to only conditionally show webm_640 TODO still: identify video type information *during* processing, show that in the <video><source /></video> element. This commit sponsored by Nathan Yergler. Thanks, nyergler!
* | | Turn "License preference" into a normal field.Elrond2013-03-021-6/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | instead of rendering it by hand, use the normal field rendering tools. Old: [choose box] License preference New: License preference [choose box] This will be your default license on upload forms.
* | Removing html5shiv for not complying with its own licenses and racismChristopher Allan Webber2013-02-261-4/+0
| | | | | | | | | | | | | | | | | | | | Issues of racism seem to have been resolved and removed from upstream, but make having this as a dependency somewhat uncomfortable: https://github.com/aFarkas/html5shiv/issues/91 Regardless, at the time of writing the project doesn't comply with its own license... it states to be dual licensed under MIT and GPLv2 but distributes neither of these licenses with its source.
* | Stylistic cleanups to some urlgen calls.Christopher Allan Webber2013-02-261-4/+4
| | | | | | | | This commit sponsored by Stephane Berube. Thank you!
* | Improved dropdown styling, part deuxJef van Schendel2013-02-241-12/+17
| |
* | Improved dropdown stylingJef van Schendel2013-02-241-21/+14
| |
* | Merge remote-tracking branch 'refs/remotes/pythonsnake/629_autoplay'Christopher Allan Webber2013-02-241-1/+3
|\ \
| * | Fix bug 629pythonsnake2013-02-101-1/+3
| | |
* | | Renaming "extrahead" template hooks to "head".Christopher Allan Webber2013-02-243-4/+4
| | | | | | | | | | | | | | | | | | As Elrond points out, the "extra" is implied by it being a hook! This commit sponsored by Andrew Fustini. Thanks, Drew!
* | | extra_head template hook. This will allow plugins to add extra js/css more ↵Christopher Allan Webber2013-02-241-0/+7
| | | | | | | | | | | | | | | | | | easily. This commit sponsored by Moritz Berberich. Thank you!
* | | Add owner to list of collections.Elrond2013-02-241-11/+7
| | | | | | | | | | | | | | | | | | | | | When listing the collections, that a media is contained in, also show the owner of the collection. Also simplify the whole looping a lot.
* | | Use media.id for collecting media too.Elrond2013-02-242-7/+7
| | | | | | | | | | | | Also remove some useless whitespace while at it.
* | | Use the media id for attachmemt editing.Elrond2013-02-242-17/+20
| | | | | | | | | | | | And remove some stray white space from the output.
* | | Added some empty templatesJoar Wandborg2013-02-224-0/+54
| | | | | | | | | | | | | | | - Make it possible for site owners to hook into base.html without tainting the repository.
* | | Integrate all atom feed in templateSebastian Spaeth2013-02-221-0/+11
| | | | | | | | | | | | | | | | | | | | | Embed the atom feed link in the root template (most recent media page) for easier discovery. Delete the (listings/all.html) template as contributed in commit 195e79098b5 as it was unused and the feed is essentially showing the most recent media anyway.
* | | Create wtforms_util.render_label(_p) and use it around.Elrond2013-02-226-11/+23
| | | | | | | | | | | | | | | | | | - This makes many places more readable. - Gives us translation in two places. - Allows easier changing of labels in a central place.
* | | Use wtforms_util.render_field_div more in media_collect.htmlElrond2013-02-221-13/+3
| | | | | | | | | | | | | | | | | | If we have to render fields individually, we still can use wtforms_util.render_field_div for each field. Makes things much smaller and readable.
* | | Remove "translation legos" and linkify the tag to more generic tag listingChristopher Allan Webber2013-02-211-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By "translation legos" I mean having multiple strings to be translated appended together. This isn't a good idea because you can't assume that syntax will work together in the same way in another language, so you may be making things hard or impossible for translators. Between this and the last commit, this means that tags now link to user tagged media specifically, and if people want a more general tag listing, they can click on the tag link to get to a more general listing. I feel this is a good and intuitive route to handling this. This sponsored commit brought to you by Debarshi Ray! Thank you!
* | | Making the tags on media pages point to the user's tag listing specifically.Christopher Allan Webber2013-02-211-6/+10
| | | | | | | | | | | | This commit sponsored by Torsten Meissner. Thanks, Torsten!
* | | Merge remote-tracking branch 'refs/remotes/spaetz/WIP/user_tag_gallery'Christopher Allan Webber2013-02-211-2/+3
|\ \ \
| * | | Implement user's tag filtered gallery pageSebastian Spaeth2013-01-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tags used to be global, you could only browse media by tag for all users. This patch implements a view that allows us to browse only a user's tagged media. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | | | Fix some small bits in base.html.Elrond2013-02-191-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add a trailing slash to the mediagoblin.org URL. (The string changed anyway, so translations are not affected more than already.) 2. Order was wrong for those two at the end (old version): {% endblock mediagoblin_body %} </div> 3. Fix some little indenting issues. 4. Remove some useless space from the output.
* | | | Merge remote-tracking branch 'pythonsnake/537_version'Elrond2013-02-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * pythonsnake/537_version: Added "version" before the version Fix bug 537
| * | | | Added "version" before the versionpythonsnake2013-02-111-1/+1
| | | | |
| * | | | Fix bug 537pythonsnake2013-02-101-1/+1
| | |/ / | |/| |
* / | | Add markdown notice to collection description.Elrond2013-02-132-10/+3
|/ / / | | | | | | | | | | | | | | | Use wtforms_util.render_field_div on the collection description, so that the markdown notice in the wtform is actually rendered to html.
* | | Add type="text/javascript" for <script>.Elrond2013-02-091-1/+2
| | | | | | | | | | | | | | | Our jquery <script> tag did not have a proper type attribute.
* | | Add translation tags; remove unnecessary title attribute from linkJef van Schendel2013-02-081-3/+2
| | |
* | | Remove unused translation variableJef van Schendel2013-02-081-1/+1
| | |
* | | Fix "Add to collection" button: remove icon, add text, add to collections.htmlJef van Schendel2013-02-082-31/+29
| | |
* | | Remove the collection counter because it's not neededJef van Schendel2013-02-081-1/+1
| | |
* | | Rename {{title}} to {{media_title}}.Elrond2013-02-051-4/+9
| | | | | | | | | | | | | | | | | | | | | Rename a variable in a translated string to make it easier for translators to know what they're dealing with. And add a <title/> block.
* | | Small changes to "Add <media> to collection" stringAleksej2013-02-051-1/+1
| | | | | | | | | | | | Add quotation marks and "a" ("a" was proposed by Elrond).
* | | Move template hook over to a template_hook tag. Seems to work! :)Christopher Allan Webber2013-01-303-35/+5
| | |
* | | Geolocation stuff, including including templates seems to be working-ishChristopher Allan Webber2013-01-303-7/+33
| | | | | | | | | | | | | | | | | | | | | - I'm having trouble seeing if the geolocation stuff actually works, but plugins are included - including a list of template hooks works, however the macro to include them does not, so it's kinda verbose
* | | Very start of plugin hooks and openstreetmap pluginificationChristopher Allan Webber2013-01-303-69/+13
| | | | | | | | | | | | | | | | | | | | | | | | - Added start of template hook code to pluginapi.py - Started to break openstreetmap into plugin; moved templates - Added plugin hooks in media and image media templates ... almost certainly, none of this works yet. :)
* | | Merge remote-tracking branch 'refs/remotes/spaetz/521_license_preference' ↵Christopher Allan Webber2013-01-221-0/+4
|\ \ \ | | | | | | | | | | | | into mergetest
| * | | Add a license preference fieldMark Holmquist2013-01-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature is absolutely necessary. Now a user can simply define their default license and quickly go through a form, as opposed to stopping to click on the select and choosing the same option over and over again. Also added DB migration for the field, so that's working now, too. Rebased by Sebastian and made the default value to be unicode. Reviewed-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | | | Moved MediaComment form descriptions to apt. placeJoar Wandborg2013-01-221-3/+0
| |/ / |/| |
* | | Turn comment list into a real <ul>.Elrond2013-01-181-8/+11
| | | | | | | | | | | | | | | | | | Well, I like semantic html. And the list of comments, well, is now a list: <ul>. Using list-style:none it looks nearly the same as before.
* | | Remove useless spaces in comment stuff.Elrond2013-01-171-4/+4
| | | | | | | | | | | | | | | | | | | | | When rendering a comment, we had a lot of whitespace. And some of it made it into the rendered page: """<a href=...>abc </a>""" the trailing space gets rendered and looks ugly.
* | | Translate account deletion.Elrond2013-01-172-4/+10
|/ / | | | | | | | | Mark all the strings in the new account deletion stuff for translation.