From ee99f155d35803cc802ce2a2200fb98cee015772 Mon Sep 17 00:00:00 2001
From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Mon, 11 Mar 2013 13:00:19 +0100
Subject: [PATCH] Minor fileuploader and static files fixes.

---
 .gitignore                                      |   5 +++--
 .../static/fileupload/img/progressbar.gif       | Bin 0 -> 3323 bytes
 apps/fileupload/views.py                        |   2 +-
 redakcja/settings/compress.py                   |  16 ++++++++--------
 redakcja/static/css/book.css                    |   4 ++--
 redakcja/static/css/jquery.autocomplete.css     |   4 ----
 6 files changed, 14 insertions(+), 17 deletions(-)
 create mode 100644 apps/fileupload/static/fileupload/img/progressbar.gif

diff --git a/.gitignore b/.gitignore
index 0d555842..08acca57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@ dev.sqlite
 requirements.pybundle
 *~
 *.orig
+/redakcja/media
+/static
+.sass-cache
 
 # Python garbage
 *.pyc
@@ -26,5 +29,3 @@ nbproject/*
 .project
 .pydevproject
 .settings
-platforma/static/compressed
-platforma/static/compressed/*
diff --git a/apps/fileupload/static/fileupload/img/progressbar.gif b/apps/fileupload/static/fileupload/img/progressbar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fbcce6bc9abfcc7893e65ef20b3e77ee16ec37b1
GIT binary patch
literal 3323
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
MR-;lzy8%o72mk46L;wH)

literal 0
HcmV?d00001

diff --git a/apps/fileupload/views.py b/apps/fileupload/views.py
index 9425515b..8863465c 100644
--- a/apps/fileupload/views.py
+++ b/apps/fileupload/views.py
@@ -137,7 +137,7 @@ class UploadView(FormView):
                 'url': self.get_url(f.name),
                 'thumbnail_url': thumbnail(self.get_directory() + f.name),
                         'delete_url': "%s?file=%s" % (
-                            request.get_full_path(),
+                            self.request.get_full_path(),
                             quote(f.name.encode('utf-8'))),
                 'delete_type': "DELETE"
             })
diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index c56592d0..61437292 100644
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@ -24,26 +24,26 @@ PIPELINE_CSS = {
             'css/jquery.autocomplete.css',
             'css/dialogs.css',
         ),
-        'output_filename': 'compressed/detail_styles_?.css',
+        'output_filename': 'compressed/detail_styles.css',
     },
     'catalogue': {
         'source_filenames': (
             'css/filelist.css',
         ),
-        'output_filename': 'compressed/catalogue_styles_?.css',
+        'output_filename': 'compressed/catalogue_styles.css',
      },
      'book': {
         'source_filenames': (
             'css/book.css',
         ),
-        'output_filename': 'compressed/book_?.css',         
+        'output_filename': 'compressed/book.css',
     },
     'book_list': {
         'source_filenames': (
             'contextmenu/jquery.contextMenu.css',
             'css/book_list.css',
         ),
-        'output_filename': 'compressed/book_list_?.css',
+        'output_filename': 'compressed/book_list.css',
     },
 }
 
@@ -82,7 +82,7 @@ PIPELINE_JS = {
                 'js/wiki/view_search.js',
                 'js/wiki/view_column_diff.js',
         ),
-        'output_filename': 'compressed/detail_scripts_?.js',
+        'output_filename': 'compressed/detail_scripts.js',
      },
     'catalogue': {
         'source_filenames': (
@@ -90,7 +90,7 @@ PIPELINE_JS = {
                 'js/slugify.js',
                 'email_mangler/email_mangler.js',
         ),
-        'output_filename': 'compressed/catalogue_scripts_?.js',
+        'output_filename': 'compressed/catalogue_scripts.js',
      },
      'book': {
         'source_filenames': (
@@ -99,7 +99,7 @@ PIPELINE_JS = {
             'js/book_text/jquery.highlightfade.js',
             'js/book_text/book.js',
         ),
-        'output_filename': 'compressed/book_?.js',
+        'output_filename': 'compressed/book.js',
          },
     'book_list': {
         'source_filenames': (
@@ -107,6 +107,6 @@ PIPELINE_JS = {
             'contextmenu/jquery.contextMenu.js',
             'js/catalogue/book_list.js',
         ),
-        'output_filename': 'compressed/book_list_?.js',
+        'output_filename': 'compressed/book_list.js',
     }
 }
diff --git a/redakcja/static/css/book.css b/redakcja/static/css/book.css
index 354a8396..a29d1d63 100644
--- a/redakcja/static/css/book.css
+++ b/redakcja/static/css/book.css
@@ -66,12 +66,12 @@ img {
 
 #menu li a.menu:hover, #menu li a.menu:active {
     color: #000;
-    background: #FFF url(/media/static/img/arrow-down.png) no-repeat center right;
+    background: #FFF;
 }
 
 #menu li a.menu.selected {
     color: #000;
-    background: #FFF url(/media/static/img/arrow-up.png) no-repeat center right;
+    background: #FFF;
 }
 #menu a.menu-link {
     display: block;
diff --git a/redakcja/static/css/jquery.autocomplete.css b/redakcja/static/css/jquery.autocomplete.css
index 416cde1b..f349b9e5 100644
--- a/redakcja/static/css/jquery.autocomplete.css
+++ b/redakcja/static/css/jquery.autocomplete.css
@@ -34,10 +34,6 @@
 	overflow: hidden;
 }
 
-.ac_loading {
-	background: white url('indicator.gif') right center no-repeat;
-}
-
 .ac_odd {
 	background-color: #eee;
 }
-- 
2.20.1