Christopher Allan Webber
29f9df7b27
Removing that 'temporarily, an "image gallery" that isn't one really ;)' text
2011-07-02 14:34:39 -05:00
Christopher Allan Webber
082a675fcd
the delete text should be flush against the image since the edit text is
2011-07-02 14:32:54 -05:00
Christopher Allan Webber
6f65e9eb90
More spacing / newline changes to media.html
2011-07-02 14:30:33 -05:00
Christopher Allan Webber
f6c49c5e62
Not sure what these fields are here commented out for... removing
2011-07-02 14:29:47 -05:00
Christopher Allan Webber
ab6fffedf8
Cleaning up some indentation in media.html
2011-07-02 14:28:57 -05:00
Christopher Allan Webber
bd9e3bbc2a
images/iconFoo.png filenames -> icon/icon_foo.png
...
I have a thing against mixedCase :)
2011-07-02 14:26:18 -05:00
Christopher Allan Webber
b28e91ce18
Merge remote branch 'remotes/schendje/master'
2011-07-02 14:13:48 -05:00
Elrond
42ef819cbb
Move get_jinja_loader to init submodule.
2011-07-02 20:50:31 +02:00
Elrond
073b61fe53
Move mediagoblin.celery_setup -> mediagoblin.init.celery
...
As the first target of the new .init. submodule move
celery_setup there. Quite straight forward, just a lot of
places to change.
2011-07-02 20:50:23 +02:00
Elrond
1b579e18d8
Start mediagoblin.init
2011-07-02 20:25:09 +02:00
Caleb Forbes Davis V
9c0fe63fad
adds previous and next links in the sidebar
...
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
2011-07-02 06:15:58 -05:00
Caleb Forbes Davis V
d9ed098e74
Bug #404 - Successful profile edit is successful!
...
user is notified of successful profile edit w/o extra navigation
2011-07-01 22:33:54 -05:00
Joar Wandborg
fe5f8a281a
Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
2011-07-01 22:02:58 +02:00
Jef van Schendel
bf332e827e
Tiny pagination style changes
2011-07-01 20:14:38 +02:00
Jef van Schendel
c26601a8a6
Remove dotted_line style from css
2011-07-01 20:09:51 +02:00
Jef van Schendel
f188463b46
Fix tiny pagination error: missing end tag
2011-07-01 20:08:12 +02:00
Jef van Schendel
eed7e0587c
Remove strong style from pagination
2011-07-01 19:57:23 +02:00
Jef van Schendel
b611476c94
Reorder media.html (comments, icons, links, layout)
2011-07-01 18:59:07 +02:00
Jef van Schendel
c13ce79abb
Reorganize media.html, comment part
2011-07-01 17:28:55 +02:00
Jef van Schendel
13b4cbf014
Put comment author/date on the left
2011-07-01 17:25:15 +02:00
Jef van Schendel
6ef36a15f2
Add delete and edit icons
2011-07-01 17:20:22 +02:00
Jef van Schendel
f1e053e074
Fix first part of issue 402 - small images are no longer enlarged to 640px
2011-07-01 15:47:37 +02:00
Jef van Schendel
68c6521e04
Add feed icon
2011-07-01 15:43:05 +02:00
Jef van Schendel
270dca58af
Style comments (first draft only)
2011-07-01 15:41:44 +02:00
Joar Wandborg
6f59a3a324
Issue #362 - Simple comments - Changes based on feedback recieved from #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.
2011-07-01 15:26:29 +02:00
Will Kahn-Greene
0e3400357d
Removes spurious file
...
Matt added this file ages ago, but it's just an empty file, so I'm removing
it.
2011-07-01 06:24:34 -04:00
Chris Moylan
5e008b93f4
Merge branch 'master' into test_submission_views_365
2011-06-30 18:33:35 -05:00
Christopher Allan Webber
90828d9d8d
Actually make use of CELERY_SETUP in from_tests.py
2011-06-30 16:57:55 -05:00
Elrond
3f9d93407b
Document the db submodule a bit
...
Document the ideas behind the db submodule.
And document what that actually means.
2011-06-30 23:27:52 +02:00
Christopher Allan Webber
a86e66b5e0
Merge remote branch 'remotes/schendje/master'
...
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media.html
2011-06-30 12:57:31 -05:00
Christopher Allan Webber
a98104eb39
Comment indexes
2011-06-30 12:51:32 -05:00
Joar Wandborg
40d18ad4c6
Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
2011-06-30 11:48:52 +02:00
Chris Moylan
75ce65cf59
mocked out submission spec
2011-06-30 00:13:47 -05:00
Chris Moylan
c86109dd91
Merge branch 'master' into test_submission_views_365
2011-06-29 23:45:05 -05:00
Christopher Allan Webber
52359e9103
Excitedly send a user a message that their comment was posted.
2011-06-29 20:51:17 -05:00
Christopher Allan Webber
95e6da024d
Use the cleaned_markdown_conversion method instead of doing that manually
2011-06-29 20:41:52 -05:00
Christopher Allan Webber
216cd9c85c
Merge remote branch 'remotes/jwandborg/feature_362-simple_comments'
2011-06-29 20:27:48 -05:00
Joar Wandborg
47f524f67d
Merge branch 'feature_362-simple_comments'
2011-06-29 16:12:33 +02:00
Jef van Schendel
741d5a375d
Put messages.html in grid_12, above content
2011-06-29 14:05:28 +02:00
Jef van Schendel
d022d9f93f
Merge remote-tracking branch 'gitorious/master'
2011-06-29 13:53:17 +02:00
Chris Moylan
4ce57ac85d
Merge branch 'master' into test_submission_views_365
2011-06-28 23:05:03 -05:00
Christopher Allan Webber
b0d835fcd0
Making the messages conform to the 960.gx widths
2011-06-28 20:56:06 -05:00
Christopher Allan Webber
604ed842b3
Styling for the messaging list items. A rainbow of messages!
2011-06-28 20:54:40 -05:00
Christopher Allan Webber
86e3e90080
Merge remote branch 'remotes/gullydwarf-cfdv/f368_msg_framework'
2011-06-28 20:09:35 -05:00
Joar Wandborg
074ac832c3
Issue #362 - Added new wtforms.Form
; MediaCommentForm()
...
* ADDED `MediaCommentForm` is a form for `MediaComment`
user entry and posting.
2011-06-29 01:35:43 +02:00
Joar Wandborg
9074ee7c1d
Issue #362 - Updated mediagoblin.user_pages.views
to handle new "Simple comments" feature
...
* ADDED `media_post_comment(request)` which creates `MediaComments`
from POST requests
* UPDATED `media_home(request, media, **kwargs)` now passes `comments`,
`pagination` and `comments_form` to `media.html`
2011-06-29 01:29:39 +02:00
Joar Wandborg
aa7d1a2fb6
Issue #362 - Updated media.html with things necessary for the simple comment 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
2011-06-29 01:21:46 +02:00
Joar Wandborg
7bd8197f32
Issue #362 - Updated the MediaComment model
...
* `MediaComment.get_comments()` now uses pagination
* `MediaComment.get_comments()` now sorts by `created` DESC
* `MediaComment.media_entry` is now **required**
* `MediaComment.media_entry()` now returns parent `MediaEntry`
2011-06-29 01:16:51 +02:00
Joar Wandborg
6a585e4c52
Issue #362 - Added a route to MediaComment POST handler
2011-06-29 01:14:52 +02:00
Jef van Schendel
a4e4d77548
Merge remote-tracking branch 'gitorious/master'
2011-06-28 13:50:05 +02:00