cleanup

filer_addons/filer_gui/static/admin/filer_gui/scss/filer_gui.scss

@@ -0,0 +1,3 @@
+@import "vars";
+
+@import "widgets/filer_file";

filer_addons/filer_gui/static/admin/filer_addons/scss/widgets/_filer_image.scss → filer_addons/filer_gui/static/admin/filer_gui/scss/widgets/_filer_file.scss

@@ -1,3 +1,14 @@
+// Old clean
+form .form-row .filer-dropzone .filerFile .filerClearer {
+    display: inline-block;
+    padding: 7px !important;
+}
+
+form .form-row .filer-dropzone .filerFile .filerClearer svg {
+    fill: #ff0000;
+}
+
+
 .filer-gui-file-widget {
 
     .preview {
@@ -46,4 +57,4 @@
         height: 100px;
         margin: 0 20px 0 0;
     }
-}
+}

filer_addons/filer_gui/templates/admin/filer_gui/widgets/_filer_file.html → filer_addons/filer_gui/templates/admin/filer_gui/widgets/admin_file_original.html

@@ -31,19 +31,17 @@
                 &nbsp;<span class="description_text"></span>
             {% endif %}
 
-            <img class="filerClearer {% if not object %}hidden{% endif %}" src="{% static admin_icon_delete %}"
-                 width="10" height="10" alt="{% trans 'Clear' %}" title="{% trans 'Clear' %}"
-                 data-no-icon-file="{% static 'filer/icons/nofile_48x48.png' %}">
+            <span class="filerClearer {% if not object %}hidden{% endif %}" title="{% trans 'Clear' %}">{% include 'admin/filer_gui/svg/icon-close.svg' %}</span>
 
             <a href="{{ lookup_url }}" class="js-related-lookup related-lookup {% if object %}related-lookup-change{% endif %} lookup" id="{{ id }}_lookup"
                title="{% trans 'Lookup' %}"{% if LTE_DJANGO_1_7 %} onclick="return showRelatedObjectLookupPopup(this);"{% endif %}>
                 <span class="choose-file"><span class="fa fa-picture-o"></span>{% trans 'Choose File' %}</span>
-                <span class="edit-file"><span class="fa fa-pencil"></span></span>
+                <span class="edit-file"><span class="fa fa-search"></span></span>
             </a>
 
             <br>
 
-            {{ hidden_input }}
+            {{ rawid_input }}
             <script type="text/javascript" id="{{id}}_javascript">
                 django.jQuery(document).ready(function(){
                     var plus = django.jQuery('#add_{{ id }}');

filer_addons/filer_gui/templates/admin/filer_gui/widgets/admin_image_original.html

@@ -0,0 +1 @@
+{% extends 'admin/filer_gui/widgets/admin_file_original.html' %}

filer_addons/filer_gui/widgets.py

@@ -8,30 +8,20 @@
 from django.utils.http import urlencode
 from django.utils.safestring import mark_safe
 
-from filer import settings as filer_settings
 from filer.fields.file import AdminFileWidget
-from filer.models import File
 
 
 logger = logging.getLogger(__name__)
 
 
 class FilerGuiFileWidget(AdminFileWidget):
 
-    template_name = 'admin/filer_gui/widgets/admin_file.html'
+    template_name = 'admin/filer_gui/widgets/admin_file_original.html'
 
     class Media:
         css = {
             'all': [
-                'admin/filer_addons/css/filer_gui.css',
-            ]
-        }
-
-        """
-        css = {
-            'all': [
-                'filer/css/admin_filer.css',
-                'admin/filer_addons/css/filer_gui.css',
+                'admin/filer_gui/css/filer_gui.css',
             ]
         }
         js = (
@@ -40,7 +30,6 @@ class Media:
             'filer/js/addons/popup_handling.js',
             'filer/js/addons/widget.js',
         )
-        """
 
     def get_url_params(self):
         params = self.url_parameters()
@@ -83,4 +72,4 @@ def render(self, name, value, attrs=None):
 
 
 class FilerGuiImageWidget(FilerGuiFileWidget):
-    template_name = 'admin/filer_gui/widgets/admin_image.html'
+    template_name = 'admin/filer_gui/widgets/admin_image_original.html'

gulpfile.js

@@ -12,11 +12,11 @@ var sass_conf = {
 
 
 gulp.task('sass', function () {
-    return gulp.src('filer_addons/filer_gui/static/admin/filer_addons/scss/**/*.scss')
+    return gulp.src('filer_addons/filer_gui/static/admin/filer_gui/scss/**/*.scss')
         .pipe(sass(sass_conf).on('error', sass.logError))
-        .pipe(gulp.dest('filer_addons/filer_gui/static/admin/filer_addons/css'));
+        .pipe(gulp.dest('filer_addons/filer_gui/static/admin/filer_gui/css'));
 });
 
 gulp.task('watch', function () {
-    gulp.watch('filer_addons/filer_gui/static/admin/filer_addons/scss/**/*.scss', ['sass']);
-});
+    gulp.watch('filer_addons/filer_gui/static/admin/filer_gui/scss/**/*.scss', ['sass']);
+});