aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Add "Browse collections" link to profile pagesJef van Schendel2013-01-171-0/+6
|
* adding back dropdown.js now that we have, well, a dropdown again :)Christopher Allan Webber2013-01-171-0/+3
|
* Merge remote-tracking branch 'refs/remotes/origin/533-new-dropdown'Christopher Allan Webber2013-01-172-36/+41
|\ | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/base.html mediagoblin/templates/mediagoblin/root.html
| * CSS edits to dropdown menu; added log out button for unverified usersJef van Schendel2013-01-171-2/+4
| |
| * Fix small user errorJef van Schendel2012-12-021-1/+1
| |
| * Give elements proper, more descriptive class namesJef van Schendel2012-12-021-3/+3
| |
| * Several edits to header dropdown:Jef van Schendel2012-12-021-8/+6
| | | | | | | | | | | | | | - Style the up/down arrow as a button - Remove the Actions header - Remove redundant original "Add media" button - Style "Add media" and "Create new collection" links as buttons
| * First commit to add header dropdownJef van Schendel2012-12-022-27/+31
| |
* | Change position of "Delete account" link, put it below the formJef van Schendel2013-01-171-6/+4
| |
* | Better "delete my account" placementSebastian Spaeth2013-01-171-1/+6
| | | | | | | | | | | | | | Improve the "delete my account" link location by not placing it outside the main content bar. It still might require more tweaks. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | Allowing to delete a user account (#302)Sebastian Spaeth2013-01-172-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | Add a "Delete user account" template and link to it from the user account settings page. Create a delete_account function and fill in most blanks. We can now successfully delete our own account. Thanks to Elrond for catching a stray csrf_exempt in a previous iteration of this patch. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | Merge remote-tracking branch 'refs/remotes/elrond/misc/use_media_id'Christopher Allan Webber2013-01-163-5/+5
|\ \
| * | Start to use the media_id in "admin" URLs.Elrond2013-01-113-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a bunch of URLs that are more for internal use. At least they're definitely not intended to be posted somewhere for long term useage. When those things affect a media, it's much better to reference the media by its id. This can't change, ever. This is better for races. Like someone posting a comment while the owner corrects a typo in the slug.
* | | collection browsing: rename view/template user_collections -> collection_listStefano Zacchiroli2013-01-152-1/+1
| | | | | | | | | | | | | | | Rationale, avoid confusion between views user_collection and user_collections (note trailing "s"). Ditto for the collection(s).html templates.
* | | collection browsing: drop atom feed from page templateStefano Zacchiroli2013-01-151-7/+0
| | | | | | | | | | | | | | | | | | rationale: it refers to something else than a "collection feed" thanks to Elrond der Elbenfuerst for pointing this out
* | | collections: add support to browse existing collectionsStefano Zacchiroli2013-01-152-3/+67
| | | | | | | | | | | | | | | | | | | | | - add a route at /u/<user>/collections/ (note trailing 's') that lists all existing collections - move there the "Create new collection" link, if the user is logged in - add a new link "Browse collections" from root.html
* | | #571: Fixed. Display collection description with Markdown formatting.Tiberiu C. Turbureanu2013-01-151-1/+3
| | |
* | | Move logo part into bits/logo.htmlElrond2013-01-132-7/+26
|/ / | | | | | | | | To make it easier for themers to replace the logo, move it out into its own logo.html.
* | Enable /u/USERNAME/edit/ pattern #588Sebastian Spaeth2013-01-092-8/+6
| | | | | | | | | | | | | | | | Transition from the inconsistent /edit/profile/?username=FOO to the nicer /u/FOO/edit/. The old pattern will still work and redirects to the new URL. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | RIP out mongoSebastian Spaeth2012-12-251-1/+1
| | | | | | | | | | | | | | | | | | Since sqlalchemy is providing our database abstraction and we have moved away from Mongo as the underlying database, it is now time to simplify things and rip out mongo. This provides the bulk of the changes, and can stand on its own. There are some followup tasks that can be done, such as removing now unneeded abstraction layers, e.g. db.sql.fake.py
* | Merge branch '512_bump_video_js'Sebastian Spaeth2012-12-251-25/+21
|\ \
| * | Bump bundled video.js to v3.2.3 (#512)Sebastian Spaeth2012-12-251-25/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is nothing inherently wrong with the currently bundled version, but the last one was uploaded in March 2012 and there have been upstream releases since. So bump to the latest available release 3.2.3. Might help with the reported issue 512 of an unresponsive video player. Do note that the Flash fallback option is removed. If we decide this should be added it is easy to add it back. We still use our own customized theme. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>