diff options
| -rw-r--r-- | mediagoblin/gmg_commands/wipealldata.py | 6 | ||||
| -rw-r--r-- | mediagoblin/static/css/base.css | 7 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 7 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/tags.html | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/mediagoblin/gmg_commands/wipealldata.py b/mediagoblin/gmg_commands/wipealldata.py index dc5d6cf7..cddbab38 100644 --- a/mediagoblin/gmg_commands/wipealldata.py +++ b/mediagoblin/gmg_commands/wipealldata.py @@ -30,6 +30,10 @@ def wipe(args): print "" print "Running this will destroy your mediagoblin database," print "remove all your media files in user_dev/, etc." + print "" + print "ALSO: This command is currently a hack and will only remove" + print " things properly on the default setup! If you've customized" + print " your mediagoblin configs, it won't work (for now)." drop_it = raw_input( 'Are you **SURE** you want to destroy your environment? ' @@ -48,4 +52,4 @@ def wipe(args): print "nixing %s...." % directory shutil.rmtree(directory) - print "removed all your stuff! okay, now re-run ./bin/buildout" + print "removed all your stuff!" diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index b32beee1..0dadacd0 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -161,7 +161,6 @@ background-image: -moz-linear-gradient(center top , rgb(134, 212, 177), rgb(109, padding-right: 11px; text-decoration: none; font-family: 'Lato', sans-serif; - font-size: 1.2em; font-weight: bold; } @@ -213,10 +212,6 @@ text-align: center; width: 100%; } -.form_field_box { - margin-bottom: 24px; -} - .form_field_label,.form_field_input { margin-bottom: 4px; } @@ -295,7 +290,7 @@ img.media_icon{ display: block; float: left; text-align: center; - background-color: #333; + background-color: #222; text-decoration: none; padding: 12px 0pt; font-size: 2em; diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 2c1b7c82..11fa72cf 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -65,7 +65,9 @@ <br /> <h3>{% trans %}Comments{% endtrans %}</h3> - <p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p> + {% if request.user %} + <p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p> + {% endif %} {% if comments %} {% for comment in comments %} @@ -99,7 +101,6 @@ {% endfor %} {% if request.user %} - <a name="comment_form"></a> <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', user= media.uploader().username, media=media._id) }}" method="POST"> @@ -123,7 +124,7 @@ {% if media['uploader'] == request.user['_id'] or request.user['is_admin'] %} - <h3>Temporary button holder</h3> + <h3>{% trans %}Actions{% endtrans %}</h3> <p> {% set edit_url = request.urlgen('mediagoblin.edit.edit_media', user= media.uploader().username, diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html index 87e6a85f..b3211bd9 100644 --- a/mediagoblin/templates/mediagoblin/utils/tags.html +++ b/mediagoblin/templates/mediagoblin/utils/tags.html @@ -23,7 +23,7 @@ <li class="tag"> <a href="{{ request.urlgen( 'mediagoblin.listings.tags_listing', - tag=tag['slug']) }}">{{ tag['name'] }}</li> + tag=tag['slug']) }}">{{ tag['name'] }}</a></li> {% endfor %} </ul> {% endblock %} |