aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
* Removing the "enter your password to change your email" bit.Christopher Allan Webber2013-06-211-1/+0
| | | | | | | A good idea, though it feels fairly clumsy in the form, and I think if you're logged in you can already sabotage the user pretty well. This commit sponsored by Sergey Matveev. Thanks!
* Merge remote-tracking branch 'refs/remotes/rodney757-github/mail'Christopher Allan Webber2013-06-212-0/+31
|\
| * Merge remote-tracking branch 'upstream/master' into change_emailRodney Ewing2013-05-282-10/+29
| |\ | | | | | | | | | | | | Conflicts: mediagoblin/auth/lib.py
| * | added support for user to change email addressRodney Ewing2013-05-242-0/+31
| | |
* | | Indenting some stuff in pdf.html and wrapping width and height parameters in ↵Christopher Allan Webber2013-06-201-13/+15
| | | | | | | | | | | | quotes
* | | Fixing bug where non-image types might break if ↵Christopher Allan Webber2013-05-282-13/+19
| |/ |/| | | | | | | | | | | | | | | | | app_config['original_date_visible'] is true Not all media managers have the .get_original_date attribute, so of course break. This is fixed by making a new space where individual media types can define this if they like. This commit sponsored by Matthieu Dupont de Dinechin. Thank you!
* | Extract footer into bits/base_footer.html.Elrond2013-05-262-10/+29
|/
* Cleaned up EXIF viewJoar Wandborg2013-05-231-48/+4
| | | | | | The last update made the assumption that EXIF metadata is in some way consistent between camera models, images, manufacturers. This update takes into account that nothing is certain whenever EXIF is involved.
* Move "bits" templates with dashes in them to underscoresChristopher Allan Webber2013-05-224-3/+3
| | | | | | Moved all references and also added a note to our release notes. This commit sponsored by Juan Rodriguez. Thank you!
* Moved frontpage "welcome" stuff into its own bits file.Christopher Allan Webber2013-05-222-17/+37
| | | | | | This should make it easier to override just that part of the page. This commit sponsored by David Rylander. Thank you!
* fixed translation, and changed tabs to spaces, and change it so the user can ↵Rodney Ewing2013-05-212-12/+12
| | | | view their password as they're typing.
* moved change pass to a seperate view and fixed issues 709Rodney Ewing2013-05-202-3/+58
|
* Modifies EXIF section with Camera Info, display toggle and template stylingGabriel Saldana2013-05-201-3/+80
|
* Normalizing indentation a bit in media.htmlChristopher Allan Webber2013-05-141-9/+9
| | | | This commit sponsored by Christian Frank. Thank you!
* fix for bug when comments are disabled, link attribute is never closedRodney Ewing2013-05-141-2/+2
|
* Moving the get_original_date method over to the MediaManager.Christopher Allan Webber2013-05-111-1/+1
| | | | | | | This fixes a bug so that it doesn't explode if the media_data doesn't exist. This commit sponsored by Ole-Morten Duesund. Thank you!
* Updated "created on" feature to reflect new "hover for real time" toolingChristopher Allan Webber2013-05-111-6/+10
|
* Merge remote-tracking branch 'refs/remotes/tryggvib/532-exif-creation-date'Christopher Allan Webber2013-05-111-0/+11
|\ | | | | | | | | | | Conflicts: mediagoblin/config_spec.ini mediagoblin/templates/mediagoblin/user_pages/media.html
| * Moved exif date transformation logic from template to image data model (as a ↵Tryggvi Björgvinsson2012-11-251-7/+8
| | | | | | | | function)
| * A template fix to show the EXIF DateTimeOriginal (as creation date). Added ↵Tryggvi Björgvinsson2012-11-081-0/+8
| | | | | | | | as a configurable option 'original_date_visible' (default false). Since the EXIF tag is a string with the date formatted as 'YYYY:MM:DD HH:MM:SS' the fix slices the string to give only the date and then replaces : by - to conform with the 'Added on' date.
* | Merge remote-tracking branch 'refs/remotes/dthompson/453_disable_comments'Christopher Allan Webber2013-05-101-6/+8
|\ \
| * | Do not render 'Add a comment' button if comments are disabled.David Thompson2013-04-131-6/+8
| | |
* | | Use collection.url_for_self more; Add missing /a.Elrond2013-05-053-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | Using collection.url_for_self(request.urlgen) instead of request.urlgen(lengthy) is so much nicer, so using it around the place. Also added a few missing </a> in one template.
* | | Fix-bug-667-Use-lazy_pass_to_ugettext-for-forms.Aditi Mittal2013-04-241-4/+4
| | |
* | | pdf: use pdf.js in an iframeAlon Levy2013-04-151-203/+3
| | |
* | | add pdf media typeAlon Levy2013-04-152-1/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new media type supports pdf and a subset of media recognized by libreoffice via unoconv. Every document added goes through: * conversion to pdf with unoconv if not already a pdf * creation of thumbnail and medium sized image, and pdfinfo generates some information (even for unoconv produces docs - should fix this) Poppler (pdftocairo, pdfinfo) is used. http://poppler.freedesktop.org/ A working but uglified pdf.js integration exists, which is enabled by setting pdf.pdf_js=true mediagoblin_local.ini (disabled in mediagoblin.ini) Adds one test to the test_submission test suite, and another separate test_pdf suite. The tests are only run if media_types.pdf.processing.check_prerequisites passes, so the test suite will not require any extra package. TODO: make test suite say 'skipped' in that case instead of just 'ok' Signed-off-by: Alon Levy <alon@pobox.com>
* | | Comment when/author link styling changesChristopher Allan Webber2013-04-131-2/+4
| | |
* | | Why not also display the times on when these media were createdChristopher Allan Webber2013-04-131-1/+1
| | |
* | | 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.