Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | 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 |
| | | |||||
* | | Switch css over to 960.gs. If I did everything right, things should look ↵ | Jef van Schendel | 2011-06-23 | 8 | -30/+42 |
| | | | | | | | | exactly the same. | ||||
* | | Check on media['uploader']'s id rather than the username | Christopher Allan Webber | 2011-06-22 | 1 | -1/+1 |
| | | | | | | | | | | | | This skips making an extra query to retrieve the uploader object and also checks on the canonical ID, which is probably good (even if indexing should ensure uniqueness there). | ||||
* | | adds conditional for display of media edit link | Caleb Forbes Davis V | 2011-06-22 | 1 | -4/+6 |
| | | |||||
* | | Several small UI changes to edit profile page: moved header, changed form ↵ | Jef van Schendel | 2011-06-22 | 1 | -2/+2 |
| | | | | | | | | wording, changed css class | ||||
* | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-22 | 5 | -13/+86 |
|\ \ | |||||
| * | | I don't think we need the username to be part of the profile editing URL | Christopher Allan Webber | 2011-06-21 | 1 | -3/+1 |
| | | | |||||
| * | | Indenting some sections between if / else blocks in root.html | Christopher Allan Webber | 2011-06-21 | 1 | -16/+14 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into is315 | cfdv | 2011-06-20 | 1 | -1/+3 |
| |\ \ | |||||
| * | | | enables primitive display of profile data on user page | cfdv | 2011-06-18 | 2 | -0/+37 |
| | | | | |||||
| * | | | enables entering user details including website url and bio | cfdv | 2011-06-18 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | fixes usage of objects. still need to display the data on user page | ||||
| * | | | baby step towards enabling profile edits | cfdv | 2011-06-18 | 2 | -1/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds * url and bio fields to database * form for editing the user profile * route to the edit profile controller * view for the profile editing page * template for the profile editing page * link to edit profile in the welcome page still needs * thorough inspection to see if it makes sense * tests * ? | ||||
| * | | | adds global link to user's home page in the base.html template | cfdv | 2011-06-17 | 1 | -0/+2 |
| | |/ | |/| | | | | | | | | | | | | | Issue #315 (add bio and website to user page) * enable profile edits * provide place in user's home page for details to appear | ||||
* | | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-20 | 1 | -1/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge remote branch 'remotes/jwandborg/issue_363' | Christopher Allan Webber | 2011-06-19 | 1 | -1/+3 |
| |\ \ | | |/ | |/| | | | | | | | Conflicts: setup.py | ||||
| | * | Added Markdown rendering for `media_entry` | Joar Wandborg | 2011-06-12 | 1 | -1/+3 |
| | | | |||||
* | | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-17 | 2 | -0/+44 |
|\| | | |||||
| * | | adds link from gallery back to user page | cfdv | 2011-06-16 | 1 | -1/+3 |
| | | | |||||
| * | | adds link to user gallery in mediagoblin_header_right of user page | cfdv | 2011-06-16 | 1 | -0/+2 |
| | | | |||||
| * | | issue #330 - creates a user gallery template | Caleb Forbes Davis V | 2011-06-16 | 1 | -0/+40 |
| |/ | |||||
* | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-08 | 1 | -4/+4 |
|\| | |||||
| * | This attribute in quotes, too. :) | Christopher Allan Webber | 2011-06-07 | 1 | -1/+1 |
| | | |||||
| * | XML attributes must be in quotes! | Christopher Allan Webber | 2011-06-07 | 1 | -3/+3 |
| | | |||||
* | | Added cancel button, capitalised button labels | Jef van Schendel | 2011-06-07 | 2 | -2/+3 |
| | | |||||
* | | Changed edit page: new background image, image is included in form, submit ↵ | Jef van Schendel | 2011-06-07 | 1 | -5/+6 |
| | | | | | | | | button text changed, title text changed, created new css class for edit forms | ||||
* | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-06 | 1 | -1/+2 |
|\| | |||||
| * | Firefox 3.X shows hidden fields for some reason, adding display: none; | Christopher Allan Webber | 2011-06-05 | 1 | -1/+2 |
| | | | | | | | | to be rid of them for sure | ||||
* | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-04 | 2 | -2/+43 |
|\| | |||||
| * | Title first and foremost... anything else looks weird to me. | Christopher Allan Webber | 2011-06-03 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'media_edit' | Christopher Allan Webber | 2011-06-03 | 2 | -0/+41 |
| |\ | |||||
| | * | Prepare for moving /edit/ under /u/.../edit/ | Elrond | 2011-06-02 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | To make moving the whole thing under /u/ easier, prepare to pass in the {user} needed for that. | ||||
| | * | Change edit form to use divs instead of table | Elrond | 2011-06-02 | 1 | -7/+6 |
| | | | |||||
| | * | Merge remote branch 'upstream/master' | Elrond | 2011-06-02 | 11 | -72/+122 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html | ||||
| | * | | Use new button style | Elrond | 2011-05-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Starting "edit" functionality. | Elrond | 2011-05-26 | 2 | -0/+41 |
| | | | | | | | | | | | | | | | | | | | | This adds a link to the "edit" form, the form, the view for displaying the form and that's about it. | ||||
* | | | | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-03 | 1 | -1/+1 |
|\| | | | |||||
| * | | | attribute values should be quoted :) | Christopher Allan Webber | 2011-06-02 | 1 | -1/+1 |
| | |/ | |/| |