aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
* user_gallery_url -> {{ user_gallery_url }} ... How embarassing.Christopher Allan Webber2011-07-031-1/+1
|
* Merge remote branch ↵Christopher Allan Webber2011-07-034-4/+8
|\ | | | | | | 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_user_page'
| * uses new 'username' variable in querystring to specify the user to editCaleb Forbes Davis V2011-07-031-2/+2
| | | | | | | | | | | | | | | | | | Previously, this view only allowed editing of the logged-in user. Now you can specify the user to edit in the querystring. If you are an admin the view allows you to edit any user's profile, with a warning message. The warning only shows up if the admin is editing another user's profile. Make sure to pass the username to this view at every step in the process
| * allows admins to edit user mediaCaleb Forbes Davis V2011-07-031-1/+2
| |
| * moves edit profile link to user pageCaleb Forbes Davis V2011-07-032-1/+4
| |
* | Make pagination on user profile point to the user galleryChristopher Allan Webber2011-07-024-30/+54
| | | | | | | | | | | | This required a couple of changes: - making a new render_pagination macro - switching things over to use that
* | Just some spacing changes in profile.htmlChristopher Allan Webber2011-07-021-8/+8
| |
* | We should link to the user's gallery, not the logged in person's gallery.Christopher Allan Webber2011-07-021-2/+1
|/
* Merge remote branch 'remotes/gullydwarf-cfdv/f401_prev_next_media_nav'Christopher Allan Webber2011-07-022-0/+46
|\ | | | | | | | | | | Conflicts: mediagoblin/db/models.py mediagoblin/templates/mediagoblin/user_pages/media.html
| * adds previous and next links in the sidebarCaleb Forbes Davis V2011-07-022-0/+46
| | | | | | | | | | | | | | | | Feature #401 - previous/next navigation on media pages * media.html includes a new prev_next.html template containing the links * prev_next.html calls functions added to the media model to retrieve the appropriate objects from the database, formatted with urlgen * a small change to util.py brings ASCENDING into the mix
* | Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'Christopher Allan Webber2011-07-021-2/+8
|\ \ | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html
| * | Feature #400 - Resize images to fit on pageJoar Wandborg2011-07-031-2/+7
| |/ | | | | | | | | | | | | | | | | | | * `mediagoblin.process_media.__init__` * Added `medium` size image conversion * Updated `thumbnail` conversion to use `queued_filename` instead of `queued_file` * `media.html` * If there exists a `medium` size for the `MediaEntry`, it will display instead of the original `main` image.
* | Only show pagination if we have pages to showChristopher Allan Webber2011-07-021-2/+2
| |
* | Issue 406: media_details template deprecated. Removing!Christopher Allan Webber2011-07-021-37/+0
| |
* | Merge remote branch ↵Christopher Allan Webber2011-07-021-2/+3
|\ \ | | | | | | | | | | | | | | | | | | 'remotes/jwandborg/feature_362-simple_comments-acts_on_feedback' Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html
| * | Issue #362 - Simple comments - Changes based on feedback recieved from ↵Joar Wandborg2011-07-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #mediagoblin * `db.models` - Removed `MediaEntry.get_comments()` and replaced it with a helper which just returns a cursor for the comments query * `media.html` - Added `{% set comment_author = comment.author() %}` * `user_pages.views` - media_home() now passes `MediaEntry.get_comments()` directly to `Pagination`, handles pagination for comments. * Added `MEDIA_COMMENTS_PER_PAGE` to define the number of comments per page in the `media_home()` view.
* | | Removing that 'temporarily, an "image gallery" that isn't one really ;)' textChristopher Allan Webber2011-07-021-1/+0
| | |
* | | the delete text should be flush against the image since the edit text isChristopher Allan Webber2011-07-021-2/+1
| | |
* | | More spacing / newline changes to media.htmlChristopher Allan Webber2011-07-021-4/+8
| | |
* | | Not sure what these fields are here commented out for... removingChristopher Allan Webber2011-07-021-4/+1
| | |
* | | Cleaning up some indentation in media.htmlChristopher Allan Webber2011-07-021-5/+13
| | |
* | | images/iconFoo.png filenames -> icon/icon_foo.pngChristopher Allan Webber2011-07-021-2/+2
| | | | | | | | | | | | I have a thing against mixedCase :)
* | | Tiny pagination style changesJef van Schendel2011-07-011-1/+2
| | |
* | | Fix tiny pagination error: missing end tagJef van Schendel2011-07-011-2/+2
| | |
* | | Remove strong style from paginationJef van Schendel2011-07-011-1/+1
| | |
* | | Reorder media.html (comments, icons, links, layout)Jef van Schendel2011-07-011-19/+20
| | |
* | | Reorganize media.html, comment partJef van Schendel2011-07-011-20/+16
| | |
* | | Fix first part of issue 402 - small images are no longer enlarged to 640pxJef van Schendel2011-07-011-1/+1
| | |
* | | Style comments (first draft only)Jef van Schendel2011-07-011-10/+10
| |/ |/|
* | Merge remote branch 'remotes/schendje/master'Christopher Allan Webber2011-06-304-84/+89
|\ \ | |/ |/| | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html
| * Put messages.html in grid_12, above contentJef van Schendel2011-06-292-13/+6
| |
| * Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-292-0/+34
| |\
| * | Tiny changesJef van Schendel2011-06-272-3/+1
| | |
| * | Implement sidebar on media pageJef van Schendel2011-06-272-28/+37
| | |
* | | Merge remote branch 'remotes/jwandborg/feature_362-simple_comments'Christopher Allan Webber2011-06-291-0/+46
|\ \ \ | |_|/ |/| |
| * | Issue #362 - Updated media.html with things necessary for the simple comment ↵Joar Wandborg2011-06-291-0/+46
| |/ | | | | | | | | | | | | | | | | feature * `media.html` now imports `wtforms.html` for use in comment form rendering * `media.html` now outputs a commenting form if `request.user` evals to `True` * `media.html` now outputs `MediaComments` if `comments` evals to `True` * `media.html` now includes `pagination.html` to handle comment pagination
* | Making the messages conform to the 960.gx widthsChristopher Allan Webber2011-06-281-5/+9
| |
* | adds message queueCaleb Forbes Davis V2011-06-272-0/+30
|/ | | | | | | | | Feature #368 - messaging framework * message levels are debug, info, success, warning, and error * display mechanism - base.html includes messages.html for now * fetch_messages and add_message are available to all templates using jinja2 environment.globals * messages are displayed and cleared. no persistence
* Reordering the uploaded on/by and description sections of media display templateChristopher Allan Webber2011-06-251-8/+10
|
* Just adjusting indentation a little bit in the base template.Christopher Allan Webber2011-06-251-22/+24
|
* Merge remote branch 'remotes/gullydwarf-cfdv/is330'Christopher Allan Webber2011-06-251-4/+5
|\ | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/gallery.html
| * fixes uneven whitespace, and conforms to a strong preference forcfdv2011-06-171-3/+4
| | | | | | | | less than 80 characters per line
* | Put the thumbnail on the edit details part on the top and centerChristopher Allan Webber2011-06-251-2/+4
| |
* | Adjust the width of the fields on the form submissionChristopher Allan Webber2011-06-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | Did several things, including: - Call the individual form field rendering macros instead of the auto whole-form renderer so we get better control over the TextArea - Use the textarea specific form field rendering macro - Adds textarea styling to the css - Sets the input, textarea styling to be 460 px wide (the width of the form section, not including padding)
* | Separates out the field rendering part from the whole form rendering macroChristopher Allan Webber2011-06-241-14/+38
| | | | | | | | | | Also adds a textarea-specific version that renders rows and cols as part of the input.
* | Implement basic footerJef van Schendel2011-06-241-1/+12
| |
* | Remove excess grids, change CSS to center formsJef van Schendel2011-06-235-10/+0
| |
* | Add <br /> for correct text layoutJef van Schendel2011-06-231-1/+1
| |
* | Submit form should not have edit_box classJef van Schendel2011-06-231-1/+1
| |
* | Make several small changes to wording and top bar linksJef van Schendel2011-06-233-7/+9
| |