Merge branch 'master' of /srv/git/projects/parabolaweb

1 files changed, 38 insertions, 6 deletions

diff --git a/media/archweb.js b/media/archweb.js
index 52e817a4..49f2a319 100644
--- a/media/archweb.js
+++ b/media/archweb.js
@@ -67,20 +67,52 @@ if (typeof $.tablesorter !== 'undefined') {
         },
         type: 'numeric'
     });
+    $.tablesorter.addParser({
+        id: 'filesize',
+        re: /^(\d+(?:\.\d+)?) (bytes?|KB|MB|GB|TB|PB)$/,
+        is: function(s) {
+            return this.re.test(s);
+        },
+        format: function(s) {
+            var matches = this.re.exec(s);
+            if (!matches) return 0;
+            var size = parseFloat(matches[1]);
+            var suffix = matches[2];
+
+            switch(suffix) {
+                case 'byte':
+                case 'bytes':
+                    return size;
+                case 'KB':
+                    return size * 1024;
+                case 'MB':
+                    return size * 1024 * 1024;
+                case 'GB':
+                    return size * 1024 * 1024 * 1024;
+                case 'TB':
+                    return size * 1024 * 1024 * 1024 * 1024;
+                case 'PB':
+                    return size * 1024 * 1024 * 1024 * 1024 * 1024;
+            }
+        },
+        type: 'numeric'
+    });
 }
 
 /* news/add.html */
 function enablePreview() {
-    $('#previewbtn').click(function(event) {
+    $('#news-preview-button').click(function(event) {
         event.preventDefault();
-        $.post('/news/preview/',
-            { data: $('#id_content').val() },
+        $.post('/news/preview/', {
+                data: $('#id_content').val(),
+                csrfmiddlewaretoken: $('#newsform input[name=csrfmiddlewaretoken]').val()
+            },
             function(data) {
-                $('#previewdata').html(data);
-                $('.news-article').show();
+                $('#news-preview-data').html(data);
+                $('#news-preview').show();
             }
         );
-        $('#previewtitle').html($('#id_title').val());
+        $('#news-preview-title').html($('#id_title').val());
     });
 }