heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix comment input field width/padding; change some text; remove weird #form_comment duplicate rules; move Edit/Delete buttons next to title

Browse Source
This commit is contained in:
Jef van Schendel 2012-02-12 20:47:25 +01:00
parent 4944e3c374
commit b0ed64aa12
2 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mediagoblin/static/css/base.css
View File

@ -255,15 +255,6 @@ text-align: center;
float: right; float: right;
} }
textarea#comment_content {
resize: vertical;
width: 634px;
height: 90px;
border: none;
background-color: #f1f1f1;
padding: 3px;
}
.clear { .clear {
clear: both; clear: both;
display: block; display: block;
@ -364,13 +355,18 @@ textarea#description, textarea#bio {
} }
textarea#comment_content { textarea#comment_content {
width: 634px; resize: vertical;
width: 100%;
height: 90px; height: 90px;
border: none; border: none;
background-color: #f1f1f1; background-color: #f1f1f1;
padding: 3px; padding: 3px;
} }
#form_comment .form_field_input {
padding-right: 6px;
}
/* media galleries */ /* media galleries */
.media_thumbnail { .media_thumbnail {
@ -393,6 +389,7 @@ textarea#comment_content {
h2.media_title { h2.media_title {
margin-bottom: 0px; margin-bottom: 0px;
display: inline-block;
} }
p.context { p.context {

35
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -72,6 +72,18 @@
<h2 class="media_title"> <h2 class="media_title">
{{ media.title }} {{ media.title }}
</h2> </h2>
{% if request.user and
(media.uploader == request.user._id or
request.user.is_admin) %}
{% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
user= media.get_uploader.username,
media= media._id) %}
<a class="button_action" href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
{% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
user= media.get_uploader.username,
media= media._id) %}
<a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
{% endif %}
{% autoescape False %} {% autoescape False %}
<p>{{ media.description_html }}</p> <p>{{ media.description_html }}</p>
{% endautoescape %} {% endautoescape %}
@ -97,36 +109,15 @@
media=media._id) }}">Add attachment</a> media=media._id) }}">Add attachment</a>
</p> </p>
{% endif %} {% endif %}
<p class="media_specs">
{% if request.user and
(media.uploader == request.user._id or
request.user.is_admin) %}
{% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
user= media.get_uploader.username,
media= media._id) %}
<a class="button_action" href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
{% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
user= media.get_uploader.username,
media= media._id) %}
<a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
{% endif %}
</p>
{% if comments %} {% if comments %}
<h3> <h3>
{% if comments.count()==1 %}
{% trans comment_count=comments.count() -%}{{ comment_count }} comment{%- endtrans %}
{% elif comments.count()>1 %}
{% trans comment_count=comments.count() -%}{{ comment_count }} comments{%- endtrans %}
{% else %}
{% trans %}No comments yet.{% endtrans %}
{% endif %}
<div class="right_align"> <div class="right_align">
<a <a
{% if not request.user %} {% if not request.user %}
href="{{ request.urlgen('mediagoblin.auth.login') }}" href="{{ request.urlgen('mediagoblin.auth.login') }}"
{% endif %} {% endif %}
class="button_action" id="button_addcomment" title="Add a comment"> class="button_action" id="button_addcomment" title="Add a comment">
{% trans %}Add one{% endtrans %} {% trans %}Add a comment{% endtrans %}
</a> </a>
</div> </div>
</h3> </h3>