Merge pull request #28 from scream4ik/master

fix large filename browse
miguelramos · Dec 14, 2016 · 1271117 · 1271117
2 parents 0f30d23 + 76dd07b
commit 1271117
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/filebrowser/static/filebrowser/css/filebrowser.css b/filebrowser/static/filebrowser/css/filebrowser.css
@@ -33,7 +33,10 @@
     padding-bottom: 0 !important;
 }
 
-
+.filename_dimensions {
+    max-width: 100px;
+    word-break: break-all;
+}
 
 /*  Filebrowser Buttons & Links
 ------------------------------------------------------------------------------------------------------ */
@@ -203,4 +206,4 @@ ul.pulldown-actions a {
     padding: 5px 30px 5px 10px;
     font-weight: bold;
     white-space: nowrap;
-}
+}
diff --git a/filebrowser/static/filebrowser/css/suit-filebrowser.css b/filebrowser/static/filebrowser/css/suit-filebrowser.css
@@ -14,4 +14,9 @@ body .redactor_toolbar li a.redactor_btn_browser {
     background-repeat: no-repeat;
     background-position: -408px -120px;*/
     background: url("../img/explorer.png") no-repeat;
-}
+}
+
+.filename_dimensions {
+    max-width: 100px;
+    word-break: break-all;
+}
diff --git a/filebrowser/templates/filebrowser/include/filelisting.html b/filebrowser/templates/filebrowser/include/filelisting.html
@@ -53,9 +53,9 @@
 
         <!-- FILENAME/DIMENSIONS -->
         {% if file.filetype == "Folder" %}
-            <td><a href="{% url "fb_browse" %}{% query_string "" "q,dir,p" %}&amp;dir={{ file.path_relative_directory|urlencode }}"><strong>{{ file.filename }}</strong></a></td>
+            <td class="filename_dimensions"><a href="{% url "fb_browse" %}{% query_string "" "q,dir,p" %}&amp;dir={{ file.path_relative_directory|urlencode }}"><strong>{{ file.filename }}</strong></a></td>
         {% else %}
-            <td>
+            <td class="filename_dimensions">
                 <b><a href="{{ file.url_full }}">{{ file.filename }}</a></b>
                 {% if file.dimensions %}
                     <br /><span class="tiny">{{ file.dimensions.0 }} x {{ file.dimensions.1 }} px</span><br clear="all" />

diff --git a/filebrowser/templates/suit/include/filelisting.html b/filebrowser/templates/suit/include/filelisting.html
@@ -79,9 +79,9 @@
 
         <!-- FILENAME/DIMENSIONS -->
         {% if file.filetype == "Folder" %}
-            <td><a href="{% url "fb_browse" %}{% query_string "" "q,dir,p" %}&amp;dir={{ file.path_relative_directory|urlencode }}"><strong>{{ file.filename }}</strong></a></td>
+            <td class="filename_dimensions"><a href="{% url "fb_browse" %}{% query_string "" "q,dir,p" %}&amp;dir={{ file.path_relative_directory|urlencode }}"><strong>{{ file.filename }}</strong></a></td>
         {% else %}
-            <td>
+            <td class="filename_dimensions">
                 <b><a href="{{ file.url_full }}">{{ file.filename }}</a></b>
                 {% if file.dimensions %}
                     <br /><span class="tiny">{{ file.dimensions.0 }} x {{ file.dimensions.1 }} px</span><br clear="all" />

diff --git a/filebrowser/templates/suit/index.html b/filebrowser/templates/suit/index.html
@@ -5,20 +5,11 @@
 {% block extrastyle %}
     {{ block.super }}
     <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/suit-filebrowser.css" />
-    {#  <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />#}
-    {% if cl.formset %}
-        {#    <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />#}
-    {% endif %}
     {% if cl.formset or action_form %}
         {% url 'admin:jsi18n' as jsi18nurl %}
         <script type="text/javascript" src="{{ jsi18nurl|default:'../../jsi18n/' }}"></script>
     {% endif %}
     {{ media.css }}
-    {% if not actions_on_top and not actions_on_bottom %}
-        <style>
-            {#      #changelist table thead th:first-child {width: inherit}#}
-        </style>
-    {% endif %}
 {% endblock %}
 
 {% block extrahead %}