diff options
| -rw-r--r-- | mediagoblin/celery_setup/from_tests.py | 9 | ||||
| -rw-r--r-- | mediagoblin/db/indexes.py | 10 | ||||
| -rw-r--r-- | mediagoblin/static/css/base.css | 43 | ||||
| -rw-r--r-- | mediagoblin/static/images/icon_delete.png | bin | 0 -> 472 bytes | |||
| -rw-r--r-- | mediagoblin/static/images/icon_edit.png | bin | 0 -> 297 bytes | |||
| -rw-r--r-- | mediagoblin/static/images/icon_feed.png | bin | 0 -> 522 bytes | |||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 5 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/media_details.html | 15 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 147 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/messages.html | 14 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/pagination.html | 9 | ||||
| -rw-r--r-- | test | 0 |
12 files changed, 146 insertions, 106 deletions
diff --git a/mediagoblin/celery_setup/from_tests.py b/mediagoblin/celery_setup/from_tests.py index 0f305df2..779ecd65 100644 --- a/mediagoblin/celery_setup/from_tests.py +++ b/mediagoblin/celery_setup/from_tests.py @@ -25,6 +25,9 @@ CELERY_SETUP = False if os.environ.get('CELERY_CONFIG_MODULE') == OUR_MODULENAME: - setup_self(check_environ_for_conf=False, module_name=OUR_MODULENAME, - default_conf_file=TEST_APP_CONFIG) - CELERY_SETUP = True + if CELERY_SETUP: + pass + else: + setup_self(check_environ_for_conf=False, module_name=OUR_MODULENAME, + default_conf_file=TEST_APP_CONFIG) + CELERY_SETUP = True diff --git a/mediagoblin/db/indexes.py b/mediagoblin/db/indexes.py index bbcceb6d..d379a52b 100644 --- a/mediagoblin/db/indexes.py +++ b/mediagoblin/db/indexes.py @@ -111,6 +111,16 @@ USER_INDEXES = { ACTIVE_INDEXES['users'] = USER_INDEXES +# MediaComment indexes + +MEDIA_COMMENT_INDEXES = { + 'mediaentry_created': { + 'index': [('media_entry', ASCENDING), + ('created', DESCENDING)]}} + +ACTIVE_INDEXES['media_comments'] = MEDIA_COMMENT_INDEXES + + #################### # Deprecated indexes #################### diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 55410bca..3b2a9a50 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -133,15 +133,6 @@ a.mediagoblin_logo:hover { /* common website elements */ -.dotted_line { - width:100%; - height:0px; - border-bottom: dotted 1px #5f5f5f; - position:absolute; - left:0px; - margin-top:-20px; -} - .button { font-family:'Carter One', arial, serif; height:32px; @@ -164,6 +155,10 @@ a.mediagoblin_logo:hover { padding-right:11px; } +.pagination{ +text-align:center; +} + /* forms */ .form_box { @@ -215,12 +210,27 @@ a.mediagoblin_logo:hover { /* media pages */ -img.media_image { - display:block; - margin-left:auto; - margin-right:auto; +.media_image{ + width:640px; +} + +.media_sidebar{ + width:280px; } +/* comments */ + +.comment_author { + margin-bottom:40px; + padding-top:4px; +} + +.comment_content p { + margin-bottom:4px; +} + +/* media galleries */ + ul.media_thumbnail { padding:0px; } @@ -236,3 +246,10 @@ li.media_thumbnail { zoom:1; . *display:inline; } + +/* icons */ + +img.media_icon{ + margin:0 4px; + vertical-align:sub; +} diff --git a/mediagoblin/static/images/icon_delete.png b/mediagoblin/static/images/icon_delete.png Binary files differnew file mode 100644 index 00000000..9d76a5db --- /dev/null +++ b/mediagoblin/static/images/icon_delete.png diff --git a/mediagoblin/static/images/icon_edit.png b/mediagoblin/static/images/icon_edit.png Binary files differnew file mode 100644 index 00000000..480c73ad --- /dev/null +++ b/mediagoblin/static/images/icon_edit.png diff --git a/mediagoblin/static/images/icon_feed.png b/mediagoblin/static/images/icon_feed.png Binary files differnew file mode 100644 index 00000000..11e5b1e7 --- /dev/null +++ b/mediagoblin/static/images/icon_feed.png diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 58de7325..fbb52803 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -51,16 +51,13 @@ </div> </div> {% endblock %} - - {% include "mediagoblin/utils/messages.html" %} - <div class="container_12 mediagoblin_content"> <div class="grid_12"> + {% include "mediagoblin/utils/messages.html" %} {% block mediagoblin_content %} {% endblock mediagoblin_content %} </div> </div> - {% block mediagoblin_footer %} <div class="mediagoblin_footer"> <div class="container_12"> diff --git a/mediagoblin/templates/mediagoblin/media_details.html b/mediagoblin/templates/mediagoblin/media_details.html index 8cb23e81..0e907616 100644 --- a/mediagoblin/templates/mediagoblin/media_details.html +++ b/mediagoblin/templates/mediagoblin/media_details.html @@ -19,14 +19,17 @@ {% block mediagoblin_content %} {# temporarily, an "image gallery" that isn't one really ;) #} {% if media %} - - <h1>Media details for {{media.title}}</h1> - <div> + <div class="grid_8 alpha media_image"> <img src="{{ request.app.public_store.file_url( media.media_files.main) }}" /> - - <br/>Uploaded: {{ media.created}} - <br/>Description: {{media.description}} + <h1>Media details for {{media.title}}</h1> + <p> + <br/>Uploaded: {{ media.created}} + <br/>Description: {{media.description}} + </p> + </div> + <div class="grid_4 omega sidebar"> + <p>Uploaded: {{ media.created}}</p> </div> {% else %} <p>Sorry, no such media found.<p/> diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 4ed1bd02..e84c9872 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -20,76 +20,89 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_content %} - - {# temporarily, an "image gallery" that isn't one really ;) #} {% if media %} - <h1> - {{media.title}} - </h1> - <img class="media_image" src="{{ request.app.public_store.file_url( - media.media_files.main) }}" /> - <p> - Uploaded on - {{ "%4d-%02d-%02d"|format(media.created.year, - media.created.month, media.created.day) }} - by - <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', - user= media.uploader().username) }}"> - {{- media.uploader().username }}</a> - </p> - {% autoescape False %} - <p>{{ media.description_html }}</p> - {% endautoescape %} - {% if media['uploader'] == request.user['_id'] %} - <p><a href="{{ request.urlgen('mediagoblin.edit.edit_media', - user= media.uploader().username, - media= media._id) }}">Edit</a></p> - {% endif %} - {% if request.user %} - <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', - user= media.uploader().username, - media=media._id) }}" method="POST"> - <h3>Post a comment!</h3> - {{ wtforms_util.render_field_div(comment_form.comment) }} - <div class="form_submit_buttons"> - <input type="submit" value="Submit" class="button" /> - </div> - </form> - {% endif %} - {# - {{ wtforms_util.render_textarea_div(submit_form.description) }} - {{ wtforms_util.render_field_div(submit_form.file) }} - #} - {% if comments %} + <div class="grid_8 alpha media_image"> + <img src="{{ request.app.public_store.file_url( + media.media_files.main) }}" /> + <h2> + {{media.title}} + </h2> + + {% autoescape False %} + <p>{{ media.description_html }}</p> + {% endautoescape %} + + <p> + — uploaded on + {{ "%4d-%02d-%02d"|format(media.created.year, + media.created.month, media.created.day) }} + by + <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', + user= media.uploader().username) }}"> + {{- media.uploader().username }}</a> + </p> + <br /><br /> + <h3>Comments</h3> - {% for comment in comments %} - {% set comment_author = comment.author() %} - <div class="comment_wrapper" id="comment-{{ comment['_id'] }}"> - <div class="comment_author">By: - <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', - user = comment_author['username']) }}"> - {{ comment_author['username'] }} - </a> - </div> - <div class="comment_datetime"> - <a href="#comment-{{ comment['_id'] }}"> - {{ "%4d-%02d-%02d %02d:%02d"|format(comment.created.year, - comment.created.month, - comment.created.day, - comment.created.hour, - comment.created.minute) }} - </a> - </div> - <div class="comment_content"> - {% autoescape False %} - {{ comment.content_html }} - {% endautoescape %} - </div> - </div> - {% endfor %} - {% include "mediagoblin/utils/pagination.html" %} + {% if request.user %} + <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', + user= media.uploader().username, + media=media._id) }}" method="POST"> + {{ wtforms_util.render_field_div(comment_form.comment) }} + <div class="form_submit_buttons"> + <input type="submit" value="Post comment!" class="button" /> + </div> + </form> + {% endif %} + + {% if comments %} + {% for comment in comments %} + {% set comment_author = comment.author() %} + <div class="comment_wrapper" id="comment-{{ comment['_id'] }}"> + <div class="comment_content"> + {% autoescape False %} + {{ comment.content_html }} + {% endautoescape %} + </div> + <div class="comment_author">— + <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', + user = comment_author['username']) }}"> + {{ comment_author['username'] }}</a> at + <!--</div> + <div class="comment_datetime">--> + <a href="#comment-{{ comment['_id'] }}"> + {{ "%4d-%02d-%02d %02d:%02d"|format(comment.created.year, + comment.created.month, + comment.created.day, + comment.created.hour, + comment.created.minute) }} + </a> + </div> + </div> + {% endfor %} + + {% include "mediagoblin/utils/pagination.html" %} + </div> {% endif %} + <div class="grid_4 omega media_sidebar"> + <h3>Sidebar content here!</h3> + <p> + {% if media['uploader'] == request.user['_id'] %} + <p> + <a href="{{ request.urlgen('mediagoblin.edit.edit_media', + user= media.uploader().username, + media= media._id) }}" + ><img src="{{ request.staticdirect('/images/icon_edit.png') }}" + class="media_icon" />edit</a> + </p> + <p> + <img src="{{ request.staticdirect('/images/icon_delete.png') }}" + class="media_icon" />delete + </p> + {% endif %} + </p> + </div> {% else %} - <p>Sorry, no such media found.<p/> + <p>Sorry, no such media found.<p/> {% endif %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/utils/messages.html b/mediagoblin/templates/mediagoblin/utils/messages.html index 52d03daa..a8d9c37e 100644 --- a/mediagoblin/templates/mediagoblin/utils/messages.html +++ b/mediagoblin/templates/mediagoblin/utils/messages.html @@ -19,14 +19,10 @@ {# Display any queued messages #} {% set messages = fetch_messages(request) %} {% if messages %} -<div class="container_12 mediagoblin_messages"> - <div class="grid_12"> - <ul class="mediagoblin_messages"> - {% for msg in messages %} - <li class="message_{{ msg.level }}">{{ msg.text }}</li> - {% endfor %} - </ul> - </div> -</div> + <ul class="mediagoblin_messages"> + {% for msg in messages %} + <li class="message_{{ msg.level }}">{{ msg.text }}</li> + {% endfor %} + </ul> {% endif %} diff --git a/mediagoblin/templates/mediagoblin/utils/pagination.html b/mediagoblin/templates/mediagoblin/utils/pagination.html index 2be0b92e..2423d08d 100644 --- a/mediagoblin/templates/mediagoblin/utils/pagination.html +++ b/mediagoblin/templates/mediagoblin/utils/pagination.html @@ -19,17 +19,17 @@ {% if pagination %} <div class="pagination"> - + <p> {% if pagination.has_prev %} - <a href="{{ pagination.get_page_url(request, pagination.page-1) }}">« Prev</> + <a href="{{ pagination.get_page_url(request, pagination.page-1) }}">« Prev</a> {% endif %} {%- for page in pagination.iter_pages() %} {% if page %} {% if page != pagination.page %} - <a href="{{ pagination.get_page_url(request, page) }}">{{ page }}</a> + <a href="{{ pagination.get_page_url(request, page) }}">{{ page }}</a> {% else %} - <strong>{{ page }}</strong> + {{ page }} {% endif %} {% else %} <span class="ellipsis">…</span> @@ -39,6 +39,7 @@ {% if pagination.has_next %} <a href="{{ pagination.get_page_url(request, pagination.page + 1) }}">Next »</a> {% endif %} + </p> </div> {% endif %} |
