Skip to content

Commit 46d7851

Browse files
authored
fix: Folder select widget did not render correctly with standard Django admin styles (#1467)
* Fix #1377 * Fix: folder widget css * Revert "Fix: folder widget css" This reverts commit 4d5d5d2. * Disentangle from test changes
1 parent 48fdcb7 commit 46d7851

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

filer/private/sass/components/_drag-and-drop.scss

+7
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ form .form-row {
1111
display: none;
1212
}
1313
}
14+
.filer-widget + .related-widget-wrapper-link,
15+
.filer-widget + * + .related-widget-wrapper-link {
16+
display: none;
17+
}
18+
.related-widget-wrapper:has(.filer-widget,.filer-dropzone) {
19+
width: 100%;
20+
}
1421
.filer-dropzone {
1522
@include clearfix;
1623
position: relative;

filer/static/filer/css/admin_filer.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

filer/static/filer/css/maps/admin_filer.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

filer/templates/admin/filer/folder/directory_table_list.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
{% if filer_admin_context.pick_folder and item.file_type == 'Folder' %}
4848
<a class="insertlink insertlinkButton"
4949
href="#" onclick="opener.dismissRelatedFolderLookupPopup(window, '{{ subfolder.pk|safe }}', '{{ subfolder.pretty_logical_path }}'); return false;" >
50-
<span class="fa fa-arrow-left filer-icon cms-icon-select"></span>
50+
<span class="fa fa-arrow-left filer-icon filer-icon-select"></span>
5151
</a>
5252
{% elif action_form and item.pk and not is_popup %}
5353
<input type="checkbox" class="action-select" value="folder-{{ item.pk|safe }}" name="_selected_action">

filer/templates/admin/filer/widgets/admin_folder.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
{% spaceless %}
44
<div class="filer-dropzone filer-dropzone-folder">
55
<span class="filerFile">
6+
<a href="{{ lookup_url }}" class="related-lookup{% if object %} hidden{% endif %}" id="{{ lookup_name }}" title="{% trans 'Lookup' %}">
7+
<span class="fa fa-search cms-icon cms-icon-search"></span>&nbsp;
8+
{% trans "Choose Folder" %}
9+
</a>
610
<img src="{% static "filer/icons/folder.svg" %}" class="thumbnail_img{% if not object %} hidden{% endif %}"/>
711
<span id="{{ span_id }}" style="margin-left: 15px;">
812
<span class="description_text">
@@ -11,10 +15,6 @@
1115
{% endif %}
1216
</span>
1317
</span>
14-
<a href="{{ lookup_url }}" class="related-lookup{% if object %} hidden{% endif %}" id="{{ lookup_name }}" title="{% trans 'Lookup' %}">
15-
<span class="fa fa-search cms-icon cms-icon-search"></span>&nbsp;
16-
{% trans "Choose Folder" %}
17-
</a>
1818
<a class="filerClearer {% if not object %}hidden{% endif %}" id="{{ clear_id }}" title="{% translate 'Clear' %}" href="#">
1919
<span class="fa fa-close filer-icon filer-icon-remove-selection"></span>
2020
</a>

0 commit comments

Comments
 (0)