aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Issue #431 - Prevent comment link expiry - Added functionality for comment ↵Joar Wandborg2011-07-071-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linking * `media.html` * Changed comment textarea handle from `comment` => `field_comment` * Active comment is hilighted with the CSS class name `comment_active` and also with the hyperlink anchor #comment * Changed media.html so that pagination always uses Route('mediagoblin.user_pages.media_home') as base_url * `user_pages/forms.py` * Renamed MediaComment form field `comment` => `field_comment` * `user_pages/routing.py` * Added route for `/u/joar/m/123..456/c/234..567/`, points to `media_home` * `user_pages/views.py` * `media_home` now checks if the request contains a comment id parameter then acts accordingly with pagination whether to call it with a `jump_to_id` or not. * `media_post_comment` - Updated MediaCommentForm field name `comment` => `field_comment` * `util.py` * `redirect` now supports querystring arguments. - NOT USED (should we keep it? I think so, it might be useful, sometime [don't call me a code hoarder]). * `Pagination.__init__` now accepts one further argument, the `jump_to_id`. It assist the comment linking functionality in finding and returning the proper page for a comment. This feature will work for all kinds of objects. It might not be optimal, but it is well functional :)
* | | | Merge remote branch 'remotes/schendje/master'Christopher Allan Webber2011-07-095-58/+53
|\ \ \ \
| * | | | Fix logo styling, positioningJef van Schendel2011-07-081-1/+1
| | | | |
| * | | | Moved Submit button to header, styled buttonJef van Schendel2011-07-082-33/+24
| | | | |
| * | | | Added sidebar to profile page; moved some contentJef van Schendel2011-07-082-15/+15
| | | | |
| * | | | Change pagination styling; add 2 imagesJef van Schendel2011-07-071-8/+9
| | | | |
| * | | | Additional style changes to navigation; add three navigation imagesJef van Schendel2011-07-071-5/+8
| | |_|/ | |/| |
* | | | Merge remote branch 'remotes/amusablelemur/feature374'Christopher Allan Webber2011-07-092-5/+9
|\ \ \ \
| * | | | Updated spacings in code for better readabilityRasmus Larsson2011-07-092-5/+5
| | | | |
| * | | | Updated the loginpage to not show a link to register if registrations are ↵Rasmus Larsson2011-07-091-0/+2
| | | | | | | | | | | | | | | | | | | | disabled
| * | | | Added configuration variable to toggle registrations, if disabled the ↵Rasmus Larsson2011-07-091-0/+2
| |/ / / | | | | | | | | | | | | registration page redirects to index and no link to register is shown
* / / / Removed route, view and template file for "Submit Success" pageRasmus Larsson2011-07-091-22/+0
|/ / /
* / / uses the messaging system to notify user of result of verification checkCaleb Forbes Davis V2011-07-041-28/+0
|/ / | | | | | | | | | | Feature #424 - Use messaging system for email verifification check response * uses add_message in verify_email and routes to the user page, bypassing verify_email.html
* | This extra <br /> is maybe a bit too much space...Christopher Allan Webber2011-07-041-1/+1
| |
* | Don't even show the profile box if no profile existsChristopher Allan Webber2011-07-041-12/+14
| |
* | Put some space between the gallery and the rest of the page contentChristopher Allan Webber2011-07-041-0/+2
| |
* | Move submit an item to the user page.Christopher Allan Webber2011-07-041-0/+6
| |
* | Put the profile stuff in p's instead of <ul>'sChristopher Allan Webber2011-07-041-14/+12
| |
* | Adjusting indentation of object_gallery.htmlChristopher Allan Webber2011-07-041-14/+14
| |
* | Put link to edit profile slightly after the profileChristopher Allan Webber2011-07-041-3/+4
| |
* | Removing a tab... hate mixed tabs and spaces :)Christopher Allan Webber2011-07-041-1/+1
| |
* | Just removing some trailing whitespaceChristopher Allan Webber2011-07-041-4/+4
| |
* | Check user['_id'] instead of username, which is slightly more guaranteedChristopher Allan Webber2011-07-041-2/+2
| |
* | bug#422_user_can_not_edit_own_profile_unless_adminCaleb Forbes Davis V2011-07-041-1/+1
| | | | | | | | user != username.....
* | Style navigation buttonsJef van Schendel2011-07-031-8/+6
| |
* | First push with 180px wide thumbnailsJef van Schendel2011-07-032-12/+12
| |
* | Switched over to 960_16_col. This may break a bunch of stuff. If you find ↵Jef van Schendel2011-07-037-15/+14
| | | | | | | | something that is broken, slap me.
* | Added reset.css and text.css from 960.gs. This might shake up a few styles!Jef van Schendel2011-07-031-0/+4
| |
* | Put file input form at the top of submission formJef van Schendel2011-07-031-3/+2
| |
* | class="media_image" accidentally added back during 400 merge. Fixing.Christopher Allan Webber2011-07-031-4/+4
| |
* | 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
| | |