Merge pull request sehmaschine#24 from djkartsa/master

Added breadcrumbs to pop-ups.
timgraham · Mar 4, 2016 · 83d3713 · 83d3713
2 parents 15b40b8 + a119c31
commit 83d3713
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/filebrowser/templates/filebrowser/createdir.html b/filebrowser/templates/filebrowser/createdir.html
@@ -19,6 +19,10 @@
 <!-- CONTENT -->
 {% block content %}
 <div id="content-main">
+    <!-- POP-UP BREADCRUMBS -->
+    {% if query.pop %}
+        {% include "filebrowser/include/breadcrumbs.html" %}
+    {% endif %}
     <form action="{% query_string '' 'p' %}" method="post">{% fb_csrf_token %}
         <div>
             {% if form.errors %}<p class="errornote">{% trans 'Please correct the following errors.' %}</p>{% endif %}

diff --git a/filebrowser/templates/filebrowser/delete_confirm.html b/filebrowser/templates/filebrowser/delete_confirm.html
@@ -8,6 +8,10 @@
 
 <!-- CONTENT -->
 {% block content %}
+    <!-- POP-UP BREADCRUMBS -->
+    {% if query.pop %}
+        {% include "filebrowser/include/breadcrumbs.html" %}
+    {% endif %}
     <p>{% blocktrans with fileobject.filename as escaped_object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}</p>
 
     <ul>

diff --git a/filebrowser/templates/filebrowser/detail.html b/filebrowser/templates/filebrowser/detail.html
@@ -36,6 +36,10 @@
 <!-- CONTENT -->
 {% block content %}
 <div id="content-main">
+    <!-- POP-UP BREADCRUMBS -->
+    {% if query.pop %}
+        {% include "filebrowser/include/breadcrumbs.html" %}
+    {% endif %}
     <form action="{% query_string "" "filter_date,filter_type,q,p" %}" method="post">{% csrf_token %}
         <div>
             {% if form.errors %}<p class="errornote">{% trans 'Please correct the following errors.' %}</p>{% endif %}

diff --git a/filebrowser/templates/filebrowser/index.html b/filebrowser/templates/filebrowser/index.html
@@ -74,6 +74,11 @@
 <!-- CONTENT -->
 {% block content %}
     <div id="content-main">
+        <!-- POP-UP BREADCRUMBS -->
+        {% if query.pop %}
+            {% include "filebrowser/include/breadcrumbs.html" %}
+        {% endif %}
+
         <!-- OBJECT-TOOLS -->
         {% block object-tools %}
             <ul class="object-tools">

diff --git a/filebrowser/templates/filebrowser/upload.html b/filebrowser/templates/filebrowser/upload.html
@@ -97,6 +97,10 @@
 <!-- CONTENT -->
 {% block content %}
 <div id="content-main">
+    <!-- POP-UP BREADCRUMBS -->
+    {% if query.pop %}
+        {% include "filebrowser/include/breadcrumbs.html" %}
+    {% endif %}
     <form>
         <div>
             <fieldset class="module aligned">