aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
...
* | Let some code support "media without slug"Elrond2012-01-281-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 Williamson2012-01-181-4/+4
| | | | translation tags to license template.
* Changed license.html to fit new layout betterAaron Williamson2012-01-171-1/+1
|
* Added new filesAaron Williamson2012-01-171-0/+26
|
* Merged changes with upstreamAaron Williamson2012-01-1729-382/+530
|\
| * Fix request.user==None errorElrond2012-01-131-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 Schendel2012-01-131-1/+1
| | | | | | | | indentation so they are the same.
| * Added check for request.user to media.html attachment-related conditionalJoar Wandborg2012-01-101-0/+1
| |
| * Fix reset.css reference and drop link to video-js.cssElrond2012-01-091-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 bitsJef van Schendel2012-01-061-3/+3
| |
| * * Rename mediagoblin_header, mediagoblin_body, mediagoblin_footer, ↵Jef van Schendel2012-01-051-11/+13
| | | | | | | | | | | | | | mediagoblin_header_right, mediagoblin_logo * Add html5shiv for older browsers * Small size fix (940px instead of 960pgx)
| * Remove last 960.gs leftover; fix classes for edit formsJef van Schendel2012-01-053-4/+4
| |
| * Fix merge conflictsJef van Schendel2012-01-0517-108/+75
| |\
| | * Several changes for mobile layoutJef van Schendel2012-01-052-1/+2
| | |
| | * Lots of little fixes and removal of all 960.gs classes:Jef van Schendel2011-12-3015-92/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removed <p> margin-top * Vertically align logo so Add-media button does not fall off * Remove last 960.gs traces (grid_X/container_X) and add custom classes/sizes to css * Add clear class * Update form_box and add form_box_xl for bigger forms * Switch all pages that use forms to new classes * Remove padding from notification messages so they take full width * Other tiny fixes I forgot about
| | * Add styles to make media.html not fall apart entirelyJef van Schendel2011-12-181-2/+2
| | |
| | * Remove first 960.gs classesJef van Schendel2011-12-181-9/+3
| | |
| | * Remove 960.gs stylesheets, add Eric Meyer's reset.cssJef van Schendel2011-12-181-5/+1
| | |
| * | Always show 'Change account settings' linkJef van Schendel2012-01-051-7/+6
| | |
| * | Make show-password-js work for change password tooElrond2012-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The show password js depends on the password field to have an id of "password". So give it a proper id. Also fixed the label generation for the case of field.name and field.id being different.
| * | Fix more StrictUndefined issuesElrond2012-01-051-2/+2
| | |
| * | Add change-account-settings link to user.htmlJef van Schendel2012-01-051-0/+5
| | |
| * | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinJef van Schendel2012-01-052-3/+5
| |\ \
| | * | f691: Use StrictUndefined for templates and fix some issuesElrond2012-01-042-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | References to undefined variables in templates were silently ignored/converted to None/empty strings. This makes coding lazy stuff easy, but it makes catching typos harder. (It would have catched one of the SQL things earlier!) But on the other hand it might make the current templates error out everywhere. In fact, early testing has shown two instances, that errored out. Those are fixed with this commit too. If this turns out to make things more complex and useless than actually solving any problems, it can easily be dropped again.
| * | | Create edit_account.htmlJef van Schendel2012-01-051-0/+45
| |/ /
| * | Add Markdown for submit page, edit page, profile edit page; thus fixing ↵Jef van Schendel2012-01-042-2/+2
| | | | | | | | | | | | ticket #690
| * | Dot-Notation for MediaEntry.media_filesElrond2012-01-047-10/+10
| | |
| * | Seperate jQuery bit that was still in media.htmlJef van Schendel2012-01-011-11/+2
| | |
| * | Remove fp_changed_success.html, use log in page + notification message insteadJef van Schendel2012-01-011-27/+0
| | |
| * | Remove fp_email_sent.html and refs to itJef van Schendel2012-01-011-28/+0
| | |
| * | ASCII media type support & fix a bug in file submission error handlingJoar Wandborg2011-12-313-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added ASCII media processing * Added ASCII media display * Added ASCII media type Rebased from Joar Wandborg's ascii art branch (squashed to remove the commits borrowing code of dubious license) Fixed a bug in file submission error handling: - Moved file-extension condition out of loop (what did it do there?) - Updated file submission tests - Changed error handling in file submission, should now report more than absolutely necessary.
| * | Fix #712: Comment counter always uses pluralJef van Schendel2011-12-301-40/+46
| | |
| * | Isolate JavaScript; add new show_password.js to forgot-password-page as wellJef van Schendel2011-12-292-21/+7
| | |
| * | Finished #485 and worked out bugs: password fields always update, added ↵Jef van Schendel2011-12-291-1/+5
| | | | | | | | | | | | margins, fixed Chrome width bug, wrapped checkbox in label element
| * | Turn media.get_uploader into a propertyElrond2011-12-274-10/+10
| | | | | | | | | | | | | | | | | | | | | sqlalchemy gives autoloading (hopefully caching) link to other objects as properties. So turn get_uploader on the current mongo based stuff into a property to ease transition.
| * | Use media.url_for_self instead of calling urlgen directlyElrond2011-12-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace urlgen('ID', user=media.get_uploader().username, media=media.*) by media.url_for_self(urlgen) in a few places. It's just a lot nicer!
| * | Translate one stringElrond2011-12-251-1/+5
| | | | | | | | | | | | | | | | | | "There doesn't seem to be any media here yet..." is now translated also here (it's already in the list from another place).
| * | Turn MediaComment's author() into get_author propertyElrond2011-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1) MediaComment's author method conflicts with the author field. So rename it to get_author. 2) Turn it from a normal function into a python property. That means you call it by ".get_author" not by ".get_author()". This is exactly what sqlalchemy gives us free of charge.
| * | added translation tags to html5 wwarningKaren Rustad2011-12-231-2/+6
| | |
| * | Added a 'you don't have HTML5 so this video will not work' warning using ↵Karen Rustad2011-12-231-0/+5
| | | | | | | | | | | | just the inherent properties of the <video> tag (and some css for style)
| * | Merge remote branch 'remotes/joar/webfinger'Elrond2011-12-202-0/+54
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * remotes/joar/webfinger: Added references to docstring in mediagoblin.webfinger Removed mediagoblin.tools.feed which was accidentally included Polishing the webfinger implementation webfinger fully compliant with webfinger.org! Still *preliminary* solution. Changed some thngs to be compatible with webfinger.org, still *very preliminary* Added *very preliminary* support for webfinger
| | * Polishing the webfinger implementationJoar Wandborg2011-12-202-17/+15
| | | | | | | | | | | | | | | | | | | | | - Changed quotes in the templates from " to ' - Changed all link generation to use request.urlgen - Moved xrd links data generation from template to view - Added parsing of the account URI using urlparse
| | * webfinger fully compliant with webfinger.org! Still *preliminary* solution.Joar Wandborg2011-12-151-1/+1
| | |
| | * Changed some thngs to be compatible with webfinger.org, still *very preliminary*Joar Wandborg2011-12-151-0/+3
| | |
| | * Added *very preliminary* support for webfingerJoar Wandborg2011-12-152-0/+53
| | |
| * | Show actual comment number. Only shows plural for now (ticket #712)Jef van Schendel2011-12-181-1/+1
| |/
| * Change "Submit" to "Add" for ticket #466Jef van Schendel2011-12-142-3/+3
| |
| * Remove "X license" placeholder from media pageJef van Schendel2011-12-141-1/+1
| |
| * Change wording for change_fp; improved the button textJef van Schendel2011-12-141-2/+2
| |
| * Merge jQuery branch, resolve conflictsJef van Schendel2011-12-135-75/+110
| |\