Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove sidedata class from html pages | Jef van Schendel | 2012-03-17 | 5 | -5/+5 |
| | |||||
* | More/better translation. | Elrond | 2012-03-17 | 2 | -2/+5 |
| | | | | | | - Try to preserve some translations (somehow). - Mark "Tagged with" again for translation. - Do not translate the empty string | ||||
* | Small formatting changes to footer text. | Jef van Schendel | 2012-03-16 | 1 | -5/+1 |
| | |||||
* | Fix media display for no media_data row in sql. | Elrond | 2012-03-15 | 1 | -2/+2 |
| | | | | | | | | | | | If there is no media_data row for the current media (for whatever reason, there might be good ones), let MediaEntry.media_data not raise an exception but just return None. The exif display part now handles this by checking whether .media_data.exif is defined (None has no attribute exif, so it's undefined, all fine). | ||||
* | Use .gps_* in the template and add translations. | Elrond | 2012-03-14 | 1 | -11/+14 |
| | | | | | | | Instead of .gps.x use .gps_x and add some "is defined" and stuff. Also mark some strings for translation in here. | ||||
* | Preserve existing translation | Christopher Allan Webber | 2012-03-14 | 1 | -1/+4 |
| | |||||
* | Provide a source link so we can comply with the AGPL | Christopher Allan Webber | 2012-03-14 | 1 | -2/+3 |
| | |||||
* | Merge remote-tracking branch ↵ | Christopher Allan Webber | 2012-03-13 | 1 | -0/+7 |
|\ | | | | | | | | | | | | | 'refs/remotes/chemhacker/bug402_nicer_skin_for_video' Conflicts: mediagoblin/templates/mediagoblin/media_displays/video.html | ||||
| * | adding the video.js wrapper | Sacha De'Angeli | 2012-03-12 | 1 | -2/+8 |
| | | |||||
* | | adds video preload bug 375 | Sacha De'Angeli | 2012-03-12 | 1 | -1/+1 |
|/ | |||||
* | Translate less html. | Elrond | 2012-03-06 | 1 | -4/+6 |
| | | | | | | Instead of translating <p ...>TEXT</p> just mark TEXT for translation. That way formatting changes can be done without affecting the translations. | ||||
* | Revert thumbnail gallery change: switch back to tables | Jef van Schendel | 2012-03-06 | 1 | -15/+21 |
| | |||||
* | Fix merge conflict in prev_next.html | Jef van Schendel | 2012-03-06 | 10 | -110/+100 |
|\ | |||||
| * | Edit css rule to allow users to zoom | Jef van Schendel | 2012-03-05 | 1 | -1/+1 |
| | | |||||
| * | Add sidebar again | Jef van Schendel | 2012-03-04 | 1 | -19/+19 |
| | | |||||
| * | Merge branch 'newlayout' into newlayout-stage | Jef van Schendel | 2012-03-04 | 9 | -127/+117 |
| |\ | |||||
| | * | Forgot to add these layout changes. Everything should work now. | Jef van Schendel | 2012-02-21 | 7 | -124/+113 |
| | | | |||||
| | * | Resolve merge conflicts | Jef van Schendel | 2012-02-21 | 7 | -114/+124 |
| | |\ | |||||
| | * | | Change button style in edit.html | Jef van Schendel | 2012-02-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Removed cancel_link class; slight changes to button_form style | Jef van Schendel | 2012-02-15 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add clear div to correct floating divs | Jef van Schendel | 2012-02-14 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'keyboard_nav' | Jef van Schendel | 2012-03-05 | 2 | -2/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Add left and right arrow keys navigation (add new JS file, link it from ↵ | Jef van Schendel | 2012-02-14 | 2 | -2/+4 |
| | |/ | |/| | | | | | | | media.html; add new navigation_right class to right button) | ||||
* / | | Video media_data: Change layout in the mongo world | Elrond | 2012-03-01 | 1 | -2/+2 |
|/ / | | | | | | | | | | | | | | | | | Change the media_data for video from entry.media_data["video"] to use entry.media_data directly. Also start a bare MediaEntry.media_data_init(**kwargs) method for setting up the media_data and possibly initialising it with kwargs. | ||||
* / | Revert "Layout overhaul time!" | Christopher Allan Webber | 2012-02-13 | 7 | -114/+124 |
|/ | | | | | | | | This reverts a whole bunch of commits, fb1dc4f5 thru 92e8ca79, where an experimental new layout was played with. Unfortunately, this layout broke the look and feel of master, even though it was going in the right direction for mobile stuff. Jef said he'll do things in a branch! | ||||
* | Fix comment input field width/padding; change some text; remove weird ↵ | Jef van Schendel | 2012-02-12 | 1 | -22/+13 |
| | | | | #form_comment duplicate rules; move Edit/Delete buttons next to title | ||||
* | Make media thumbnail gallery a list instead of a table | Jef van Schendel | 2012-02-12 | 1 | -21/+15 |
| | |||||
* | Move "Added on" date to sidebar | Jef van Schendel | 2012-02-12 | 1 | -3/+5 |
| | |||||
* | Move Attachments from sidebar to default pane | Jef van Schendel | 2012-02-12 | 1 | -23/+23 |
| | |||||
* | Consistencify sidebar bits (same headers and such) | Jef van Schendel | 2012-02-12 | 4 | -7/+8 |
| | |||||
* | Restore sidebar | Jef van Schendel | 2012-02-12 | 1 | -26/+28 |
| | |||||
* | Layout overhaul time! | Jef van Schendel | 2012-02-11 | 2 | -31/+31 |
| | |||||
* | It's 2012 all up in here | Christopher Allan Webber | 2012-02-02 | 34 | -34/+34 |
| | |||||
* | Merge remote-tracking branch 'joar/exif-rebase' | Joar Wandborg | 2012-01-28 | 4 | -6/+99 |
|\ | |||||
| * | Scripts and styleshets for geolocation map - Conditional | Joar Wandborg | 2012-01-27 | 1 | -6/+10 |
| | | | | | | | | | | Scripts and stylesheets for the geolocation map are now switched on/off with the geolocation map itself. | ||||
| * | Refractored media.html template and related includes | Joar Wandborg | 2012-01-25 | 4 | -45/+86 |
| | | | | | | | | | | | | | | - Added <p> around license part to separate it properly from other sidebar content - Moved exif part to mediagoblin/utils/exif.html - Moved geolocation map to mediagoblin/utils/geolocation_map.html | ||||
| * | Moved EXIF to sidebar, added conditions for visibility configuration settings | Joar Wandborg | 2012-01-25 | 1 | -17/+20 |
| | | |||||
| * | EXIF fixes | Joar Wandborg | 2012-01-25 | 1 | -7/+9 |
| | | | | | | | | | | | | | | - Moved exif functions from mediagoblin.media_types.image.processing to mediagoblin.tools.exif - Moved EXIF.py link from mediagoblin.media_types to mediagoblin.tools.extlib - Refractored and updated EXIF exctraction and presentation | ||||
| * | EXIF extraction, geolocation map, image rotation | Joar Wandborg | 2012-01-25 | 1 | -0/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Images are now rotated based on EXIF image orientation (in case the image isn't flipped on X or Y axis or correctly oriented, then we do nothing) - *Always* create a medium.jpg in image.processing, for the sake of rotation of display image - Extract EXIF and GPS tags from images and insert them into media_data - Geolocation map display added to media.html - EXIF display added, then removed. It is not in this revision, although some of it is (the "EXIF" h4 header). Need to make it presentable, filtering out purely robotical tags, perhaps. | ||||
* | | Let some code support "media without slug" | Elrond | 2012-01-28 | 1 | -1/+1 |
|/ | | | | | | | | | | | | | | The upcoming SQL database will allow having media without a slug again. This might especially be useful for API support, where the uploaded image (media) does not have *any* information to generate a slug from. This code change mostly allows the sql backend to have no slug in its model and improves some parts to properly handle that. It specifically does not have any web frontend support to edit/create MediaEntries with no slug. | ||||
* | Moved get_license_data to mixin.py, added license to sql media model, added ↵ | Aaron Williamson | 2012-01-18 | 1 | -4/+4 |
| | | | | translation tags to license template. | ||||
* | Changed license.html to fit new layout better | Aaron Williamson | 2012-01-17 | 1 | -1/+1 |
| | |||||
* | Added new files | Aaron Williamson | 2012-01-17 | 1 | -0/+26 |
| | |||||
* | Merged changes with upstream | Aaron Williamson | 2012-01-17 | 29 | -382/+530 |
|\ | |||||
| * | Fix request.user==None error | Elrond | 2012-01-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | If one isn't logged in and views the profile of a user without media, one gets a problem, because request.user is None and has no _id attribute. Fix this. | ||||
| * | Remove unnecessary piece of text in media.html. Fix "Markdown text" ↵ | Jef van Schendel | 2012-01-13 | 1 | -1/+1 |
| | | | | | | | | indentation so they are the same. | ||||
| * | Added check for request.user to media.html attachment-related conditional | Joar Wandborg | 2012-01-10 | 1 | -0/+1 |
| | | |||||
| * | Fix reset.css reference and drop link to video-js.css | Elrond | 2012-01-09 | 1 | -3/+1 |
| | | | | | | | | | | | | | | 1. reset.css was moved to /css/extlib/ some time ago. So update the staticdirect link to it. 2. We don't have video-js.css (any more?). Drop link to it. | ||||
| * | Fix div breaking in user.html; add media query bits | Jef van Schendel | 2012-01-06 | 1 | -3/+3 |
| | | |||||
| * | * Rename mediagoblin_header, mediagoblin_body, mediagoblin_footer, ↵ | Jef van Schendel | 2012-01-05 | 1 | -11/+13 |
| | | | | | | | | | | | | | | mediagoblin_header_right, mediagoblin_logo * Add html5shiv for older browsers * Small size fix (940px instead of 960pgx) |