Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | user_gallery_url -> {{ user_gallery_url }} ... How embarassing. | Christopher Allan Webber | 2011-07-03 | 1 | -1/+1 |
| | |||||
* | Merge remote branch ↵ | Christopher Allan Webber | 2011-07-03 | 4 | -4/+8 |
|\ | | | | | | | 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_user_page' | ||||
| * | uses new 'username' variable in querystring to specify the user to edit | Caleb Forbes Davis V | 2011-07-03 | 1 | -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 media | Caleb Forbes Davis V | 2011-07-03 | 1 | -1/+2 |
| | | |||||
| * | moves edit profile link to user page | Caleb Forbes Davis V | 2011-07-03 | 2 | -1/+4 |
| | | |||||
* | | Make pagination on user profile point to the user gallery | Christopher Allan Webber | 2011-07-02 | 4 | -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.html | Christopher Allan Webber | 2011-07-02 | 1 | -8/+8 |
| | | |||||
* | | We should link to the user's gallery, not the logged in person's gallery. | Christopher Allan Webber | 2011-07-02 | 1 | -2/+1 |
|/ | |||||
* | Merge remote branch 'remotes/gullydwarf-cfdv/f401_prev_next_media_nav' | Christopher Allan Webber | 2011-07-02 | 2 | -0/+46 |
|\ | | | | | | | | | | | Conflicts: mediagoblin/db/models.py mediagoblin/templates/mediagoblin/user_pages/media.html | ||||
| * | adds previous and next links in the sidebar | Caleb Forbes Davis V | 2011-07-02 | 2 | -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 Webber | 2011-07-02 | 1 | -2/+8 |
|\ \ | | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html | ||||
| * | | Feature #400 - Resize images to fit on page | Joar Wandborg | 2011-07-03 | 1 | -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 show | Christopher Allan Webber | 2011-07-02 | 1 | -2/+2 |
| | | |||||
* | | Issue 406: media_details template deprecated. Removing! | Christopher Allan Webber | 2011-07-02 | 1 | -37/+0 |
| | | |||||
* | | Merge remote branch ↵ | Christopher Allan Webber | 2011-07-02 | 1 | -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 Wandborg | 2011-07-01 | 1 | -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 ;)' text | Christopher Allan Webber | 2011-07-02 | 1 | -1/+0 |
| | | | |||||
* | | | the delete text should be flush against the image since the edit text is | Christopher Allan Webber | 2011-07-02 | 1 | -2/+1 |
| | | | |||||
* | | | More spacing / newline changes to media.html | Christopher Allan Webber | 2011-07-02 | 1 | -4/+8 |
| | | | |||||
* | | | Not sure what these fields are here commented out for... removing | Christopher Allan Webber | 2011-07-02 | 1 | -4/+1 |
| | | | |||||
* | | | Cleaning up some indentation in media.html | Christopher Allan Webber | 2011-07-02 | 1 | -5/+13 |
| | | | |||||
* | | | images/iconFoo.png filenames -> icon/icon_foo.png | Christopher Allan Webber | 2011-07-02 | 1 | -2/+2 |
| | | | | | | | | | | | | I have a thing against mixedCase :) | ||||
* | | | Tiny pagination style changes | Jef van Schendel | 2011-07-01 | 1 | -1/+2 |
| | | | |||||
* | | | Fix tiny pagination error: missing end tag | Jef van Schendel | 2011-07-01 | 1 | -2/+2 |
| | | | |||||
* | | | Remove strong style from pagination | Jef van Schendel | 2011-07-01 | 1 | -1/+1 |
| | | | |||||
* | | | Reorder media.html (comments, icons, links, layout) | Jef van Schendel | 2011-07-01 | 1 | -19/+20 |
| | | | |||||
* | | | Reorganize media.html, comment part | Jef van Schendel | 2011-07-01 | 1 | -20/+16 |
| | | | |||||
* | | | Fix first part of issue 402 - small images are no longer enlarged to 640px | Jef van Schendel | 2011-07-01 | 1 | -1/+1 |
| | | | |||||
* | | | Style comments (first draft only) | Jef van Schendel | 2011-07-01 | 1 | -10/+10 |
| |/ |/| | |||||
* | | Merge remote branch 'remotes/schendje/master' | Christopher Allan Webber | 2011-06-30 | 4 | -84/+89 |
|\ \ | |/ |/| | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html | ||||
| * | Put messages.html in grid_12, above content | Jef van Schendel | 2011-06-29 | 2 | -13/+6 |
| | | |||||
| * | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-29 | 2 | -0/+34 |
| |\ | |||||
| * | | Tiny changes | Jef van Schendel | 2011-06-27 | 2 | -3/+1 |
| | | | |||||
| * | | Implement sidebar on media page | Jef van Schendel | 2011-06-27 | 2 | -28/+37 |
| | | | |||||
* | | | Merge remote branch 'remotes/jwandborg/feature_362-simple_comments' | Christopher Allan Webber | 2011-06-29 | 1 | -0/+46 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Issue #362 - Updated media.html with things necessary for the simple comment ↵ | Joar Wandborg | 2011-06-29 | 1 | -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 widths | Christopher Allan Webber | 2011-06-28 | 1 | -5/+9 |
| | | |||||
* | | adds message queue | Caleb Forbes Davis V | 2011-06-27 | 2 | -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 template | Christopher Allan Webber | 2011-06-25 | 1 | -8/+10 |
| | |||||
* | Just adjusting indentation a little bit in the base template. | Christopher Allan Webber | 2011-06-25 | 1 | -22/+24 |
| | |||||
* | Merge remote branch 'remotes/gullydwarf-cfdv/is330' | Christopher Allan Webber | 2011-06-25 | 1 | -4/+5 |
|\ | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/gallery.html | ||||
| * | fixes uneven whitespace, and conforms to a strong preference for | cfdv | 2011-06-17 | 1 | -3/+4 |
| | | | | | | | | less than 80 characters per line | ||||
* | | Put the thumbnail on the edit details part on the top and center | Christopher Allan Webber | 2011-06-25 | 1 | -2/+4 |
| | | |||||
* | | Adjust the width of the fields on the form submission | Christopher Allan Webber | 2011-06-24 | 1 | -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 macro | Christopher Allan Webber | 2011-06-24 | 1 | -14/+38 |
| | | | | | | | | | | Also adds a textarea-specific version that renders rows and cols as part of the input. | ||||
* | | Implement basic footer | Jef van Schendel | 2011-06-24 | 1 | -1/+12 |
| | | |||||
* | | Remove excess grids, change CSS to center forms | Jef van Schendel | 2011-06-23 | 5 | -10/+0 |
| | | |||||
* | | Add <br /> for correct text layout | Jef van Schendel | 2011-06-23 | 1 | -1/+1 |
| | | |||||
* | | Submit form should not have edit_box class | Jef van Schendel | 2011-06-23 | 1 | -1/+1 |
| | | |||||
* | | Make several small changes to wording and top bar links | Jef van Schendel | 2011-06-23 | 3 | -7/+9 |
| | |