Merge pull request #24 from scream4ik/master

Mandatory django version >= 1.8

.gitignore

@@ -19,4 +19,5 @@ builddocs.zip
 build/
 dist/
 django_media_manager.egg-info
-example/example/local_settings.py
+example/example/local_settings.py
+.DS_Store

README.md

@@ -4,6 +4,9 @@ At the moment i'm without time to maintain this great project. To all the people
 
 # Changelog
 
+### 06-10-2016 v3.4.1
+*   Mandatory django version >= 1.8
+
 ### 25-08-2014 v3.4.0
 *   Uses Pillow now.
 *   Python 3 only now.

filebrowser/templates/filebrowser/include/toolbar.html

@@ -3,7 +3,7 @@
 <div id="toolbar">
   <form id="changelist-search" action="." method="get">
     <div><!-- DIV needed for valid HTML -->
-      <label for="searchbar"><img alt="Search" src="{{ STATIC_URL }}filebrowser/img/icon-searchbox.png"></label>
+      <label for="searchbar"><img alt="Search" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/icon-searchbox.png"></label>
       <input type="text" name="q" value="{{ query.q }}" id="searchbar" />
       {% if query.filter_type %}<input type="hidden" name="filter_type" value="{{ query.filter_type }}" />{% endif %}
       {% if query.filter_date %}<input type="hidden" name="filter_date" value="{{ query.filter_date }}" />{% endif %}

filebrowser/urls.py

@@ -1,16 +1,16 @@
-from django.conf.urls import *
+from django.conf.urls import url
 
-urlpatterns = patterns('',
-
+from filebrowser import views
+
+urlpatterns = [
     # filebrowser urls
-    url(r'^browse/$', 'filebrowser.views.browse', name="fb_browse"),
-    url(r'^mkdir/', 'filebrowser.views.mkdir', name="fb_mkdir"),
-    url(r'^upload/', 'filebrowser.views.upload', name="fb_upload"),
-    url(r'^rename/$', 'filebrowser.views.rename', name="fb_rename"),
-    url(r'^delete/$', 'filebrowser.views.delete', name="fb_delete"),
-    url(r'^versions/$', 'filebrowser.views.versions', name="fb_versions"),
-
-    url(r'^check_file/$', 'filebrowser.views._check_file', name="fb_check"),
-    url(r'^upload_file/$', 'filebrowser.views._upload_file', name="fb_do_upload"),
-
-)
+    url(r'^browse/$', views.browse, name="fb_browse"),
+    url(r'^mkdir/', views.mkdir, name="fb_mkdir"),
+    url(r'^upload/', views.upload, name="fb_upload"),
+    url(r'^rename/$', views.rename, name="fb_rename"),
+    url(r'^delete/$', views.delete, name="fb_delete"),
+    url(r'^versions/$', views.versions, name="fb_versions"),
+
+    url(r'^check_file/$', views._check_file, name="fb_check"),
+    url(r'^upload_file/$', views._upload_file, name="fb_do_upload"),
+]