Skip to content

Commit

Permalink
Duplicates margin-top + typo fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Evgeniy Negometyanov committed Feb 5, 2016
1 parent 4659fd5 commit 0459093
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 23 deletions.
5 changes: 5 additions & 0 deletions filer/private/sass/components/_base.scss
Expand Up @@ -94,3 +94,8 @@ body {
width: 180px;
height: 180px;
}

.file-duplicates {
clear: both;
padding: 20px 0 0 0;
}
2 changes: 1 addition & 1 deletion filer/static/filer/css/admin_filer.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion filer/static/filer/css/maps/admin_filer.css.map

Large diffs are not rendered by default.

41 changes: 20 additions & 21 deletions filer/templates/admin/filer/change_form.html
@@ -1,38 +1,37 @@
{% extends "admin/change_form.html" %}
{% load i18n admin_modify staticfiles %}

{% block extrahead %}{{ block.super }}
{% endblock %}

{% block breadcrumbs %}
{% with original as instance %}
{% include "admin/filer/breadcrumbs.html" %}
{% endwith %}
{% with original as instance %}
{% include "admin/filer/breadcrumbs.html" %}
{% endwith %}
{% endblock %}

{% block extrastyle %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% static 'filer/css/admin_filer.css' %}">
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% static 'filer/css/admin_filer.css' %}">
{% endblock %}


{% block after_field_sets %}
{% if is_popup and select_folder %}
<input type="hidden" name="select_folder" value="1">
<input type="hidden" name="select_folder" value="1">
{% endif %}
{% endblock %}

{% block sidebar %}
{% block file_sidebar %}
{% with original.duplicates as duplicates %}
{% if duplicates %}
<h3>{% trans "duplicates" %}</h3>
<ul>
{% for duplicate in duplicates %}
<li><a href="{{ duplicate.get_admin_url_path }}">{{ duplicate }}</a></li>
{% endfor %}
</ul>
{% endif %}
{% endwith %}
{% endblock %}
{% block file_sidebar %}
{% with original.duplicates as duplicates %}
{% if duplicates %}
<div class="file-duplicates">
<h3>{% trans "Duplicates" %}</h3>
<ul>
{% for duplicate in duplicates %}
<li><a href="{{ duplicate.get_admin_url_path }}">{{ duplicate }}</a></li>
{% endfor %}
</ul>
</div>
{% endif %}
{% endwith %}
{% endblock %}
{% endblock %}

0 comments on commit 0459093

Please sign in to comment.