aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * Style changes for media_uploader (now media_specs); removed margins from ↵Jef van Schendel2011-12-101-11/+5
| | | | | | | | button_action buttons
| * Remove pagination images and replace them with unicode charactersJef van Schendel2011-12-101-4/+2
| |
| * Change wording in tags.htmlJef van Schendel2011-12-091-2/+2
| |
| * Open Markdown link in new windows; I know _blank is sometimes frowned upon ↵Jef van Schendel2011-12-091-1/+1
| | | | | | | | but it may be useful here
| * Lots of changes to media page; rearranged things, added new styles, added ↵Jef van Schendel2011-12-091-33/+46
| | | | | | | | jquery bits, gave the comment section a refresh
| * Move author text, "By X", to the sidebarJef van Schendel2011-12-071-6/+9
| |
| * Add show-password checkbox and make it workJef van Schendel2011-12-022-1/+22
| |
* | Merge branch 'sql/dot-notation'Elrond2011-12-127-20/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sql/dot-notation: Dot-Notation for MediaEntry.media_data Dot-Notation for MediaEntry.media_type Dot-Notation for MediaEntry.description(_html) Dot-Notation for MediaEntry.slug Dot-Notation for MediaEntry.title Dot-Notation for MediaEntry.uploader Dot-Notation for MediaEntry.created Dot-Notation: tests/test_edit.py Dot-Notation for Users.fp_token_expire Dot-Notation for Users.fp_verification_key Dot-Notation for Users.bio and .bio_html Dot-Notation for Users.url Dot-Notation for Users.is_admin Dot-Notation for Users.verification_key Dot-Notation for Users.status Dot-Notation for Users.email_verified Dot-Notation for Users.pw_hash Dot-Notation for Users.email Dot-Notation for Users.username
| * | Dot-Notation for MediaEntry.titleElrond2011-12-053-5/+5
| | |
| * | Dot-Notation for MediaEntry.uploaderElrond2011-12-051-2/+2
| | |
| * | Dot-Notation for MediaEntry.createdElrond2011-12-051-1/+1
| | |
| * | Dot-Notation for Users.urlElrond2011-12-051-1/+1
| | |
| * | Dot-Notation for Users.is_adminElrond2011-12-052-3/+3
| | |
| * | Dot-Notation for Users.statusElrond2011-12-051-1/+1
| | |
| * | Dot-Notation for Users.usernameElrond2011-12-053-7/+7
| | |
* | | Removed extraneous whitespace from video.htmlChristopher Allan Webber2011-12-121-1/+1
| | |
* | | Mark "newer/older" buttons for translationChristopher Allan Webber2011-12-121-4/+4
|/ /
* | Update comment URLs to use the media slug.Christopher Allan Webber2011-12-051-1/+1
| |
* | Update the delete item to use the _id after all... it's the safest way.Christopher Allan Webber2011-12-052-2/+2
| | | | | | | | See http://bugs.foocorp.net/issues/695
* | Merge remote-tracking branch ↵Christopher Allan Webber2011-12-042-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'remotes/lorochka85/bug852_use_media_slug_instead_of_id' Conflicts: mediagoblin/decorators.py mediagoblin/templates/mediagoblin/user_pages/media.html mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
| * \ Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblinlora2011-11-1912-109/+101
| |\ \
| * | | issue 582: use media.slug instead of media.idlora2011-11-192-3/+3
| | | |
* | | | Removing the conditional that checks if there's a media in media.htmlChristopher Allan Webber2011-12-041-125/+121
| | | | | | | | | | | | | | | | | | | | If there isn't a media, we shouldn't hit that template! The view should ensure that.
* | | | Change "Your finest source of goblin related media" to something elseChristopher Allan Webber2011-12-041-1/+1
| |_|/ |/| | | | | | | | We don't want to insist everyone hold a goblin-related gallery :)
* | | Mark two strings for translationElrond2011-11-282-2/+2
| | | | | | | | | | | | | | | 1. "Go to page:" in pagination 2. "Submit" in the forget password form
* | | Removing these video javascript files, which are currently unusedChristopher Allan Webber2011-11-251-5/+0
| | |
* | | Merge remote-tracking branch 'remotes/jwandborg/master'Christopher Allan Webber2011-11-244-14/+49
|\ \ \