Minor fileuploader and static files fixes.

diff --git a/.gitignore b/.gitignore
index 0d55584..08acca5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@ dev.sqlite
 requirements.pybundle
 *~
 *.orig
 requirements.pybundle
 *~
 *.orig

+/redakcja/media
+/static
+.sass-cache

 
 # Python garbage
 *.pyc
 
 # Python garbage
 *.pyc


@@ -26,5 +29,3 @@ nbproject/*
 .project
 .pydevproject
 .settings
 .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 (file)
index 0000000..fbcce6b
Binary files /dev/null and b/apps/fileupload/static/fileupload/img/progressbar.gif differ

diff --git a/apps/fileupload/views.py b/apps/fileupload/views.py
index 9425515..8863465 100644 (file)
--- 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" % (
                 '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"
             })
                             quote(f.name.encode('utf-8'))),
                 'delete_type': "DELETE"
             })

diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index c56592d..6143729 100644 (file)
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@ -24,26 +24,26 @@ PIPELINE_CSS = {
             'css/jquery.autocomplete.css',
             'css/dialogs.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',
         ),
     },
     'catalogue': {
         'source_filenames': (
             'css/filelist.css',
         ),

-        'output_filename': 'compressed/catalogue_styles_?.css',
+        'output_filename': 'compressed/catalogue_styles.css',

      },
      'book': {
         'source_filenames': (
             'css/book.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',
         ),
     },
     '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',
         ),
                 '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': (
      },
     'catalogue': {
         'source_filenames': (


@@ -90,7 +90,7 @@ PIPELINE_JS = {
                 'js/slugify.js',
                 'email_mangler/email_mangler.js',
         ),
                 'js/slugify.js',
                 'email_mangler/email_mangler.js',
         ),

-        'output_filename': 'compressed/catalogue_scripts_?.js',
+        'output_filename': 'compressed/catalogue_scripts.js',

      },
      'book': {
         'source_filenames': (
      },
      'book': {
         'source_filenames': (


@@ -99,7 +99,7 @@ PIPELINE_JS = {
             'js/book_text/jquery.highlightfade.js',
             'js/book_text/book.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': (
          },
     'book_list': {
         'source_filenames': (


@@ -107,6 +107,6 @@ PIPELINE_JS = {
             'contextmenu/jquery.contextMenu.js',
             'js/catalogue/book_list.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 354a839..a29d1d6 100644 (file)
--- 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;
 
 #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;
 }
 
 #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;
 }
 #menu a.menu-link {
     display: block;

diff --git a/redakcja/static/css/jquery.autocomplete.css b/redakcja/static/css/jquery.autocomplete.css
index 416cde1..f349b9e 100644 (file)
--- a/redakcja/static/css/jquery.autocomplete.css
+++ b/redakcja/static/css/jquery.autocomplete.css
@@ -34,10 +34,6 @@
        overflow: hidden;
 }
 
        overflow: hidden;
 }
 

-.ac_loading {
-       background: white url('indicator.gif') right center no-repeat;
-}
-

 .ac_odd {
        background-color: #eee;
 }
 .ac_odd {
        background-color: #eee;
 }