aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
...
| * Pop up OpenStreetMap license on demand (#410)Sebastian Spaeth2012-11-161-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Marking "attachment" stuff for translation (thanks for catching AVRS)Christopher Allan Webber2012-11-241-2/+2
|/
* Simplify/Robustify the thumbnail URL usage in templatesSebastian Spaeth2012-11-157-24/+17
| | | | | | | | | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch ↵Christopher Allan Webber2012-11-131-4/+8
|\ | | | | | | 'refs/remotes/spaetz/trac_475_email_notification_checkbox'
| * Don't put checkbox text on separate line (#475)LotusEcho2012-11-131-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Change to 5 thumbnails per rowJef van Schendel2012-11-011-2/+2
| |
* | Move <a> end tagJef van Schendel2012-10-231-1/+2
| |
* | Don't show link to original when the file is an imageJef van Schendel2012-10-231-11/+0
| |
* | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinChristopher Allan Webber2012-10-223-20/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | # 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.
| * | Replace dropdown in top right with regular linksJef van Schendel2012-10-211-13/+7
| | |
| * | Move "Add collection" and "Change account settings" links to root.htmlJef van Schendel2012-10-213-7/+9
| | |
* | | Set the user page to two columns wide so we don't have this weird wrapping.Christopher Allan Webber2012-10-221-1/+1
|/ / | | | | | | This is a stopgap solution!
* | Thumbnail styling edits plus edits to the object_gallery (4 columns instead ↵Jef van Schendel2012-10-191-4/+3
| | | | | | | | of 5 by default)
* | Changed a <p/> to </p> in user.html. Removed the <p></p> wrappers in ↵LotusEcho2012-09-242-2/+2
|/ | | | profile.html which was included in user.html.
* Fixed collection sidebar for media_home to user collection.url_for_self ↵Aaron Williamson2012-09-181-9/+3
| | | | instead of incorrectly getting the session user
* Added new files for collectionsAaron Williamson2012-09-189-0/+522
|
* Added basic collection functionalityAaron Williamson2012-09-182-0/+14
|
* Merge remote-tracking branch 'refs/remotes/merge-requests/42'Christopher Allan Webber2012-08-192-0/+6
|\
| * add titles to two pages and fix a typo in docsAleksej2012-08-182-0/+6
| |
* | Merge remote-tracking branch 'refs/remotes/merge-requests/40'Christopher Allan Webber2012-08-192-6/+6
|\ \
| * | use YYYY-MM-DD HH:MM 24-hour format on panelsAleksej2012-08-132-6/+6
| |/
* / added title tags to various pages and marked a string translatableAleksej2012-08-1310-1/+54
|/
* Removing text on frontpage that suggests we have favorites (we don't)Christopher Allan Webber2012-08-041-1/+1
|
* Moving extrahead.html -> extra_head.html because it's easier to readChristopher Allan Webber2012-07-142-1/+1
|
* Allow for an "extrahead" template where themers can include extra css, js, etcChristopher Allan Webber2012-07-142-0/+22
|
* Processing panel improvementsJoar Wandborg2012-07-112-2/+113
| | | | | - Added admin processing panel - Minor fixes on the user processing panel template
* Panel improvementsJoar Wandborg2012-07-111-4/+30
| | | | | | | | | | - Added progress meter for video and audio media types. - Changed the __repr__ method of a MediaEntry to display a bit more useful explanation. - Added a new MediaEntry.state, 'processing', which means that the task is running the processor on the item currently. - Fixed some PEP8 issues in user_pages/views.py - Fixed the ATOM TAG URI to show the correct year.
* Minor improvements to the processing panelJoar Wandborg2012-07-101-1/+12
| | | | | | - It is now possible to actually see what's processing, due to a bug fix where __getitem__ was called on the db model. - Removed DEPRECATED message from the docstring, it wasn't true.
* made the download links consistentJakob Kramer2012-07-074-11/+31
|
* put attachments into sidebarJakob Kramer2012-07-071-22/+26
| | | | also added {% trans %} tags
* Pull instance name from config in the notification email.Joar Wandborg2012-06-111-3/+3
|
* Merge remote-tracking branch ↵Joar Wandborg2012-06-101-0/+26
|\ | | | | | | | | | | | | 'is_derek/bug405_email_notifications_for_comments' into notifications-merge Conflicts: mediagoblin/db/mongo/migrations.py
| * Merge branch 'master' into derek-moore-bug405_email_notifications_for_commentsChristopher Allan Webber2012-03-187-18/+31
| |\ | | | | | | | | | | | | Conflicts: mediagoblin/db/mongo/migrations.py
| * | These are changes for issue #405, add email comment notification.Derek Moore2012-03-151-0/+26
| | |
* | | added support for original audio download; renameJakob Kramer2012-05-202-11/+16
| | | | | | | | | | | | Renamed `ogg' to `webm_audio' in core__file_keynames
* | | Translate form validation error messages.Elrond2012-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Okay, this is a long story. There are two ways to translate validation error messages: 1) Let wtforms do it. You give wtforms a translation thingy and it calls it for the message to be translated. Good idea maybe. Except: The translation function is only called for the builtin messages of wtforms. It's not called for any handcrafted messages in the constructor. And we can't translate the message there! Because the message needs to be translated when the form is rendered, for each user's locale. This does not work for us. 2) Translate the message while it gets rendered. Luckily we render the message completely by hand. So we can just translate it there also! Simple, easy, works! This all does not cover translating the builtin messages of wtforms. They're currently not extracted in any way, so our translators can't translate them. But that's another issue!
* | | '+ Add media' and 'View your profile' translatableJakob Kramer2012-04-191-2/+2
| | |
* | | Make image-for-media_title alt tag translatableChristopher Allan Webber2012-04-181-2/+4
| | |
* | | Added html5slider to support range inputs in FirefoxJoar Wandborg2012-04-181-0/+2
| | |
* | | Updated the audio display <source> elementJoar Wandborg2012-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | as per <http://www.w3.org/TR/html5/the-source-element.html#attr-source-type>. This closes bug <http://issues.mediagoblin.org/ticket/435>.
* | | Fixed video skinJoar Wandborg2012-04-091-2/+1
| | | | | | | | | | | | | | | Removed the default video.js skin entirely, now running on vjs-mg-skin only!
* | | Add MediaGoblin video player skin by chron0Jef van Schendel2012-04-081-1/+2
| | |
* | | HTML/CSS: comment style changesJef van Schendel2012-04-011-5/+7
| | |
* | | HTML: remove elements for comment button style changeJef van Schendel2012-04-011-4/+0
| | |
* | | Add dropdown to headerJef van Schendel2012-04-011-10/+13
| | |
* | | Revert changes from last commit; I am an idiotJef van Schendel2012-03-311-13/+0
| | |
* | | Switch over content to new layout/text; slight css editsJef van Schendel2012-03-311-0/+13
| | |
* | | Merge remote-tracking branch 'joar/audio+sniffing'Joar Wandborg2012-03-271-0/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/media_types/image/processing.py mediagoblin/media_types/video/__init__.py mediagoblin/media_types/video/processing.py mediagoblin/tests/test_submission.py
| * | | Faster sniffingJoar Wandborg2012-03-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Sniffing now goes through the old extension-based filter before doing it the bitsniffing way. - Refractored get_media_type_and_manager(filename). - Removed ogg extension from video accepted extensions, audio will take care of that. - Added custom audio player, still WIP,but working. - Added test for sniffing. This only tests for the mediagoblin.media_types.image type, as that is the only one enabled from start.
| * | | Removed diaper patterns from audio/video sniffers, video preload set to ↵Joar Wandborg2012-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'metadata' * mediagoblin.processing THUMB_/MEDIUM_ constants are now based on the ini settings * Removed diaper patterns from audio and video sniffing * Changed HTML5 video preload to 'metadata'
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-06 12:01:03 +0000