-
-
- {% for field in action_form %}
- {% if field.label %}
-
{{ field.label }}
- {% endif %}
- {{ field }}
- {% endfor %}
-
{% trans "Go" %}
- {% if actions_selection_counter %}
-
-
-
{{ selection_note }}
- {% if paginator.count != paginated_items.object_list|length %}
-
{{ selection_note_all }}
-
{% trans "Clear selection" %}
- {% endif %}
-
- {% endif %}
-
-
+
diff --git a/filer/templates/admin/filer/base_site.html b/filer/templates/admin/filer/base_site.html
index 0217933b8..2a66e751d 100644
--- a/filer/templates/admin/filer/base_site.html
+++ b/filer/templates/admin/filer/base_site.html
@@ -1,10 +1,17 @@
{% extends "admin/base_site.html" %}
-{% load i18n filermedia %}
+{% load i18n static filer_admin_tags %}
+
{% block extrastyle %}
-
-
-
-
-
+ {{ block.super }}
+
+ {% icon_css_library %}
{% endblock %}
+{% block extrahead %}
+ {{ block.super }}
+
+ {# upload stuff #}
+ {{ media.js }}
+
+
+{% endblock %}
diff --git a/filer/templates/admin/filer/breadcrumbs.html b/filer/templates/admin/filer/breadcrumbs.html
index a74b6e4bf..a8dceac9d 100644
--- a/filer/templates/admin/filer/breadcrumbs.html
+++ b/filer/templates/admin/filer/breadcrumbs.html
@@ -1,41 +1,24 @@
-{% load i18n %}
+{% load i18n filer_admin_tags %}
+
-
+ › {{ breadcrumbs_action }}
+ {% else %}
+ › {% if instance.label %}{{ instance.label }}{% else %}{{ instance.name }}{% endif %}
+ {% endif %}
diff --git a/filer/templates/admin/filer/change_form.html b/filer/templates/admin/filer/change_form.html
index db9d83ded..34aeb85b7 100644
--- a/filer/templates/admin/filer/change_form.html
+++ b/filer/templates/admin/filer/change_form.html
@@ -1,78 +1,36 @@
{% extends "admin/change_form.html" %}
-{% load i18n admin_modify filermedia filer_admin_tags %}
-
-{% block extrahead %}{{ block.super }}
-
-{% endblock %}
-
-{% block pretitle %}
-{% if is_popup %}
-
-{% endif %}
-{% endblock %}
+{% load i18n admin_modify static filer_admin_tags %}
{% 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 }}
+
+ {% icon_css_library %}
{% endblock %}
-{% block coltype %}colMS row{% endblock %}
{% block after_field_sets %}
- {% if is_popup and select_folder %}
{% endif %}
-{% endblock %}
-
-{% block field_sets %}
- {% for fieldset in adminform %}
- {% include "admin/filer/fieldset.html" %}
- {% endfor %}
-{% endblock %}
-
-
-{% block content %}
-
- {{block.super}}
-
-{% endblock %}
-
-{% block object-tools %}
-{% if change %}{% if not is_popup %}
-
-{% endif %}{% endif %}
+ {% filer_admin_context_hidden_formfields %}
{% endblock %}
{% block sidebar %}
- {% with original.duplicates as duplicates %}
- {% if duplicates %}
-
-
{% trans 'duplicates' %}
-
-
- {% endif %}
- {% endwith %}
-{% endblock %}
-
-{% block submit_buttons_bottom %}
- {% if not original|is_restricted_for_user:user %}
- {% submit_row %}
- {% endif %}
+ {% block file_sidebar %}
+ {% with original.duplicates as duplicates %}
+ {% if duplicates %}
+
+
{% translate "Duplicates" %}
+
+
+ {% endif %}
+ {% endwith %}
+ {% endblock %}
{% endblock %}
diff --git a/filer/templates/admin/filer/delete_confirmation.html b/filer/templates/admin/filer/delete_confirmation.html
index 77e28c488..635fbfb05 100644
--- a/filer/templates/admin/filer/delete_confirmation.html
+++ b/filer/templates/admin/filer/delete_confirmation.html
@@ -1,37 +1,10 @@
-{% extends "admin/filer/base_site.html" %}
-{% load i18n %}
-{% load admin_urls %}
+{% extends "admin/delete_confirmation.html" %}
+{% load i18n static %}
-{% block breadcrumbs %}
-{% include "admin/filer/breadcrumbs.html" with instance=object breadcrumbs_action="Delete" %}
+{% block extrastyle %}{{ block.super }}
+
{% endblock %}
-{% block content %}
-{% if perms_lacking or protected %}
- {% if perms_lacking %}
-
{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}
-
- {% for obj in perms_lacking %}
- {{ obj }}
- {% endfor %}
-
- {% endif %}
- {% if protected %}
-
{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would require deleting the following protected related objects:{% endblocktrans %}
-
- {% for obj in protected %}
- {{ obj }}
- {% endfor %}
-
- {% endif %}
-{% else %}
-
{% blocktrans with escaped_object=object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}" ? All of the following related items will be deleted:{% endblocktrans %}
-
{{ deleted_objects|unordered_list }}
-
-{% endif %}
+{% block breadcrumbs %}
+ {% include "admin/filer/breadcrumbs.html" with instance=object breadcrumbs_action="Delete" %}
{% endblock %}
diff --git a/filer/templates/admin/filer/delete_selected_files_confirmation.html b/filer/templates/admin/filer/delete_selected_files_confirmation.html
index b7d96df2f..5c9da677e 100644
--- a/filer/templates/admin/filer/delete_selected_files_confirmation.html
+++ b/filer/templates/admin/filer/delete_selected_files_confirmation.html
@@ -1,4 +1,4 @@
-{% extends "admin/filer/base_site.html" %}
+{% extends "admin/delete_confirmation.html" %}
{% load i18n %}
{% block breadcrumbs %}
@@ -6,44 +6,46 @@
{% endblock %}
{% block content %}
-{% if perms_lacking or protected %}
- {% if perms_lacking %}
-
{% blocktrans %}Deleting the selected files and/or folders would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}
-
- {% for obj in perms_lacking %}
- {{ obj }}
+ {% if perms_lacking or protected %}
+ {% if perms_lacking %}
+ {% blocktrans %}Deleting the selected files and/or folders would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}
+
+ {% for obj in perms_lacking %}
+ {{ obj }}
+ {% endfor %}
+
+ {% endif %}
+ {% if protected %}
+ {% blocktrans %}Deleting the selected files and/or folders would require deleting the following protected related objects:{% endblocktrans %}
+
+ {% for obj in protected %}
+ {{ obj }}
+ {% endfor %}
+
+ {% endif %}
+ {% else %}
+ {% blocktrans %}Are you sure you want to delete the selected files and/or folders? All of the following objects and their related items will be deleted:{% endblocktrans %}
+ {% for deletable_object in deletable_objects %}
+ {{ deletable_object|unordered_list }}
{% endfor %}
-
+
{% endif %}
- {% if protected %}
-
{% blocktrans %}Deleting the selected files and/or folders would require deleting the following protected related objects:{% endblocktrans %}
-
- {% for obj in protected %}
- {{ obj }}
- {% endfor %}
-
- {% endif %}
-{% else %}
-
{% blocktrans %}Are you sure you want to delete the selected files and/or folders? All of the following objects and their related items will be deleted:{% endblocktrans %}
- {% for deletable_object in deletable_objects %}
-
{{ deletable_object|unordered_list }}
- {% endfor %}
-
-{% endif %}
{% endblock %}
diff --git a/filer/templates/admin/filer/dismiss_popup.html b/filer/templates/admin/filer/dismiss_popup.html
new file mode 100644
index 000000000..af648bc66
--- /dev/null
+++ b/filer/templates/admin/filer/dismiss_popup.html
@@ -0,0 +1,8 @@
+{% extends "admin/filer/base_site.html" %}
+
+{% block extrahead %}
+ {{ block.super }}
+
+{% endblock %}
diff --git a/filer/templates/admin/filer/file/change_form.html b/filer/templates/admin/filer/file/change_form.html
new file mode 100644
index 000000000..601ed99c3
--- /dev/null
+++ b/filer/templates/admin/filer/file/change_form.html
@@ -0,0 +1,30 @@
+{% extends "admin/filer/change_form.html" %}
+{% load i18n admin_modify static %}
+
+{% block extrahead %}
+ {{ block.super }}
+
+ {# upload stuff #}
+
+
+{% endblock %}
+
+
+{% block object-tools %}
+ {% if change and not is_popup %}
+
+ {% endif %}
+ {% include "admin/filer/tools/detail_info.html" %}
+{% endblock %}
+
+{% block submit_buttons_bottom %}
+ {% if not is_readonly_file %}
+ {% submit_row %}
+ {% endif %}
+{% endblock %}
+
diff --git a/filer/templates/admin/filer/file/popup_response.html b/filer/templates/admin/filer/file/popup_response.html
new file mode 100644
index 000000000..625659f3d
--- /dev/null
+++ b/filer/templates/admin/filer/file/popup_response.html
@@ -0,0 +1,10 @@
+{% extends "admin/filer/base_site.html" %}
+{% load static %}
+
+{% block extrahead %}
+ {{ block.super }}
+
+{% endblock %}
diff --git a/filer/templates/admin/filer/folder/change_form.html b/filer/templates/admin/filer/folder/change_form.html
index 1550af60a..7d850eb47 100644
--- a/filer/templates/admin/filer/folder/change_form.html
+++ b/filer/templates/admin/filer/folder/change_form.html
@@ -1,36 +1,41 @@
-{% extends "admin/filer/change_form.html" %}
-{% load i18n admin_modify filermedia filer_admin_tags %}
+{% extends "admin/change_form.html" %}
+{% load i18n admin_modify static filer_admin_tags %}
-{% block extrahead %}
- {{ block.super }}
-
+{% block breadcrumbs %}
+
{% endblock %}
{% block coltype %}{% if is_popup %}colM{% else %}colMS{% endif %}{% endblock %}
{% block object-tools %}
-{% if change %}{% if not is_popup %}
-
-{% endif %}{% endif %}
+ {% if change and not is_popup %}
+
+ {% endif %}
{% endblock %}
{% block after_field_sets %}
-{% if is_popup and select_folder %}
{% endif %}
+ {% filer_admin_context_hidden_formfields %}
{% endblock %}
-{% block sidebar %}{% endblock %}
-
-{% block submit_buttons_bottom %}
- {% if not original or not original|is_restricted_for_user:user %}
- {% submit_row %}
+{% block sidebar %}
+ {% if not is_popup %}
+
+
+
+
+
{% endif %}
{% endblock %}
diff --git a/filer/templates/admin/filer/folder/choose_copy_destination.html b/filer/templates/admin/filer/folder/choose_copy_destination.html
index 17e11b592..38437b9de 100644
--- a/filer/templates/admin/filer/folder/choose_copy_destination.html
+++ b/filer/templates/admin/filer/folder/choose_copy_destination.html
@@ -1,30 +1,58 @@
{% extends "admin/filer/base_site.html" %}
-{% load i18n filer_admin_tags %}
+{% load i18n static filer_admin_tags %}
{% block breadcrumbs %}
-{% include "admin/filer/breadcrumbs.html" %}
+ {% include "admin/filer/breadcrumbs.html" %}
+{% endblock %}
+
+{% block extrastyle %}
+ {{ block.super }}
+
+
{% endblock %}
{% block extrahead %}
{{ block.super }}
+
{% endblock %}
+
{% block content %}
-{% if not to_copy %}
-
{% blocktrans %}There are no files and/or folders available to copy.{% endblocktrans %}
-{% else %}
-
{% blocktrans %}The following files and/or folders will be copied to a destination folder (retaining their tree structure):{% endblocktrans %}
-
{{ to_copy|unordered_list }}
-