Merge pull request #788 from divio/bugfix/breadcrumbs-header-without-…

…adminstyles breadcrumbs and header improvements without adminstyles
django-cms · Apr 1, 2016 · a5722d0 · a5722d0
2 parents 0dcdf66 + 8636170
commit a5722d0
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 59 deletions.
diff --git a/filer/private/sass/components/_base.scss b/filer/private/sass/components/_base.scss
@@ -3,7 +3,11 @@
 
 // resets box-sizing on every element and adds it explicitly on elements in filebrowser and popup content
 .filebrowser,
-.popup {
+.popup,
+.app-filer {
+    #header {
+        box-sizing: content-box !important;
+    }
     *,
     *:before, *:after {
         box-sizing: inherit !important;
@@ -66,32 +70,35 @@ body {
 #content #content-main {
     margin-top: 0;
 }
-#container .breadcrumbs-container .breadcrumbs {
-    // required for django CMS <= 3.1 #673
-    position: absolute;
-    top: -91px;
-    right: 0;
-    left: 0;
-    // required for django CMS <= 3.1 #673
-    margin-top: 48px;
-}
-
 .filebrowser {
+    &.cms-admin-sideframe {
+        #container {
+            .breadcrumbs + #content {
+                margin-left: 0 !important;
+            }
+            .breadcrumbs {
+                padding-left: 20px !important;
+            }
+        }
+    }
     &.popup #content {
         box-shadow: none;
     }
     #container {
         min-width: auto;
+        .breadcrumbs + #content {
+            margin-left: 0 !important;
+        }
         #content {
-            margin-top: 90px !important;
             margin-left: 0 !important;
             margin-right: 0 !important;
             padding: 0;
             box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.2);
         }
     }
     .breadcrumbs {
-        margin-left: 15px;
+        left: 0 !important;
+        padding-left: 20px !important;
     }
     h1.folder_header {
         position: relative;

diff --git a/filer/static/filer/css/admin_filer.css b/filer/static/filer/css/admin_filer.css
diff --git a/filer/static/filer/css/maps/admin_filer.css.map b/filer/static/filer/css/maps/admin_filer.css.map
diff --git a/filer/templates/admin/filer/folder/directory_listing.html b/filer/templates/admin/filer/folder/directory_listing.html
@@ -36,7 +36,50 @@
     {% endif %}
 {% endblock %}
 
-{% block breadcrumbs %}{% endblock %}
+{% block breadcrumbs %}
+   {% if not is_popup %}
+        <div class="breadcrumbs">
+            <a href="{% url 'admin:index' %}" title="{% trans 'Go back to admin homepage' %}">
+                {% trans "Home" %}
+            </a>
+            &rsaquo;
+            <a href="{% url 'admin:app_list' app_label='filer' %}" title="{% trans 'Go back to Filer app' %}">
+                {% trans "Filer" %}
+            </a>
+            {% if not instance.is_root and instance.is_smart_folder %}
+                &rsaquo;
+                <a href="{% url 'admin:filer-directory_listing-root' %}" title="{% trans 'Go back to root folder' %}">{% trans "root" %}</a>
+            {% endif %}
+            {% for ancestor_folder in instance.logical_path %}
+                &rsaquo;
+                <a href="{{ ancestor_folder.get_admin_directory_listing_url_path }}"
+                    title="{% blocktrans with ancestor_folder.name as folder_name %}Go back to '{{ folder_name }}' folder{% endblocktrans %}">
+                    {% if ancestor_folder.label %}{{ ancestor_folder.label }}{% else %}{{ ancestor_folder.name }}{% endif %}
+                </a>
+            {% endfor %}
+            {% if breadcrumbs_action %}
+                &rsaquo;
+                <a href="{{ instance.get_admin_directory_listing_url_path }}"
+                    title="{% blocktrans with instance.name as folder_name %}Go back to '{{ folder_name }}' folder{% endblocktrans %}">
+                    {% if instance.label %}
+                        {{ instance.label }}
+                    {% else %}
+                        {{ instance.name }}
+                    {% endif %}
+                </a>
+                &rsaquo;
+                {{ breadcrumbs_action }}
+            {% else %}
+                &rsaquo;
+                {% if instance.label %}
+                    {{ instance.label }}
+                {% else %}
+                    {{ instance.name }}
+                {% endif %}
+            {% endif %}
+        </div>
+    {% endif %}
+{% endblock %}
 
 {% block sidebar %}{% endblock %}
 
@@ -51,49 +94,6 @@ <h2>&nbsp;</h2>
                 {{ ancestor_folder }}
             {% endfor %}
 
-            {% if not is_popup %}
-                <div class="breadcrumbs">
-                    <a href="{% url 'admin:index' %}" title="{% trans 'Go back to admin homepage' %}">
-                        {% trans "Home" %}
-                    </a>
-                    &rsaquo;
-                    <a href="{% url 'admin:app_list' app_label='filer' %}" title="{% trans 'Go back to Filer app' %}">
-                        {% trans "Filer" %}
-                    </a>
-                    {% if not instance.is_root and instance.is_smart_folder %}
-                        &rsaquo;
-                        <a href="{% url 'admin:filer-directory_listing-root' %}" title="{% trans 'Go back to root folder' %}">{% trans "root" %}</a>
-                    {% endif %}
-                    {% for ancestor_folder in instance.logical_path %}
-                        &rsaquo;
-                        <a href="{{ ancestor_folder.get_admin_directory_listing_url_path }}"
-                            title="{% blocktrans with ancestor_folder.name as folder_name %}Go back to '{{ folder_name }}' folder{% endblocktrans %}">
-                            {% if ancestor_folder.label %}{{ ancestor_folder.label }}{% else %}{{ ancestor_folder.name }}{% endif %}
-                        </a>
-                    {% endfor %}
-                    {% if breadcrumbs_action %}
-                        &rsaquo;
-                        <a href="{{ instance.get_admin_directory_listing_url_path }}"
-                            title="{% blocktrans with instance.name as folder_name %}Go back to '{{ folder_name }}' folder{% endblocktrans %}">
-                            {% if instance.label %}
-                                {{ instance.label }}
-                            {% else %}
-                                {{ instance.name }}
-                            {% endif %}
-                        </a>
-                        &rsaquo;
-                        {{ breadcrumbs_action }}
-                    {% else %}
-                        &rsaquo;
-                        {% if instance.label %}
-                            {{ instance.label }}
-                        {% else %}
-                            {{ instance.name }}
-                        {% endif %}
-                    {% endif %}
-                </div>
-            {% endif %}
-
             <div class="navigator-breadcrumbs">
                 <div class="navigator-breadcrumbs-dropdown-container">
                     <a href="#" data-toggle="dropdown" aria-expanded="false">