832 Commits

Author SHA1 Message Date
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
Caleb Forbes Davis V
9f094beaaf adds message queue unit testing 2011-06-28 02:35:44 -05:00
Caleb Forbes Davis V
a8923a7da3 removes messages.add_message from the global template context
templates don't add messages. views are responsible for that.
2011-06-27 23:49:57 -05:00
Christopher Allan Webber
2527754202 Documenging index utils and adjusting how remove_deprecated_indexes gets arguments
More specifically, we now just take a dictionary of lists, like:
   {'collection': ['index_identifier1', 'index_identifier2']}

Previously we took something with more info like in add_new_indexes,
but that extra info isn't really necessary.
2011-06-27 20:48:35 -05:00
Christopher Allan Webber
1f7749995d Documentation updates to indexes.py's docstring
Includes information on how to deprecate indexes.
2011-06-27 20:40:31 -05:00
Christopher Allan Webber
8db03585a2 Updating migrate.py to actually run the indexing commands 2011-06-27 20:05:01 -05:00
Christopher Allan Webber
b1db6f20dd Adding our current indexes and removing the index that was in models.py 2011-06-27 16:56:41 -05:00
Christopher Allan Webber
0f3167c9f0 Tools to add / remove indexes from collections 2011-06-27 16:56:12 -05:00
Joar Wandborg
c11f21ab3c Issue 362 - Add simple comments
*   Added MediaComment database model
    Holds `media_entry` (`ObjectId`), `author` (`ObjectId`), `created`, `content` and `content_html`.
2011-06-27 23:39:40 +02:00
Jef van Schendel
664682aaf6 Tiny changes 2011-06-27 22:41:58 +02:00
Jef van Schendel
a54e5be78e Implement sidebar on media page 2011-06-27 22:39:05 +02:00
Caleb Forbes Davis V
2264670357 adds message queue
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
2011-06-27 13:25:55 -05:00
Christopher Allan Webber
ca5d2c51b6 Store the collection information in the ACTIVE_INDEXES keys 2011-06-26 21:51:38 -05:00
Christopher Allan Webber
3cd6ea5b17 A base set of indexes for us to use with our new indexing tool. 2011-06-26 21:10:16 -05:00
Christopher Allan Webber
da0683b48c Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin 2011-06-26 15:22:01 -05:00
Christopher Allan Webber
9ea5c28b7a Celery wasn't really being properly connected during tests.
Lots of fixes to do this.

 - setup_celery_from_config no longer responsible for checking
   'celery_setup_elsewhere'; that's the app's job.  (This was a problem
   because more than the app was relying on using this function)
 - Allow us to specifically set the config file we're setting up
   celery from with setup_self
 - Set up celery_always_eager.  This is something we strongly want
   while doing tests.
 - Instead of setting up the app in the get_test_app method, let's set
   that up simply by importing from_tests, which should itself up via
   from_celery being the environment variable being set.
2011-06-26 14:45:19 -05:00
Christopher Allan Webber
e1d9e1d139 Reordering the uploaded on/by and description sections of media display template 2011-06-25 14:32:31 -05:00
Christopher Allan Webber
d4a7a03ce7 Align images in a gallery to the center 2011-06-25 13:15:15 -05:00
Christopher Allan Webber
fcb3166270 Just adjusting indentation a little bit in the base template. 2011-06-25 13:10:46 -05:00
Christopher Allan Webber
4765a52b1f Merge remote branch 'remotes/gullydwarf-cfdv/is330'
Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/gallery.html
2011-06-25 13:08:04 -05:00