annotations fix

diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index 5637cee..60ce9e3 100644 (file)
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@ -26,7 +26,6 @@ COMPRESS_JS = {
     'detail': {
         'source_filenames': (
                 # libraries
     'detail': {
         'source_filenames': (
                 # libraries

-                'js/lib/jquery-1.4.2.min.js',

                 'js/lib/jquery/jquery.autocomplete.js',
                 'js/lib/jquery/jquery.blockui.js',
                 'js/lib/jquery/jquery.elastic.js',
                 'js/lib/jquery/jquery.autocomplete.js',
                 'js/lib/jquery/jquery.blockui.js',
                 'js/lib/jquery/jquery.elastic.js',

diff --git a/redakcja/static/js/wiki/view_annotations.js b/redakcja/static/js/wiki/view_annotations.js
index 071e7ee..5bac593 100644 (file)
--- a/redakcja/static/js/wiki/view_annotations.js
+++ b/redakcja/static/js/wiki/view_annotations.js
@@ -101,7 +101,8 @@
 
                             if (!counter) {
                                 anno_list.sort(function(a, b){return a.sortby.localeCompare(b.sortby);});
 
                             if (!counter) {
                                 anno_list.sort(function(a, b){return a.sortby.localeCompare(b.sortby);});

-                                self.$annos.append(anno_list);
+                                for (i in anno_list)
+                                    self.$annos.append(anno_list[i]);

                                 self.$spinner.hide();
                                 self.$annos.show();
                             }
                                 self.$spinner.hide();
                                 self.$annos.show();
                             }

diff --git a/redakcja/templates/base.html b/redakcja/templates/base.html
index 971213f..3e725d4 100644 (file)
--- a/redakcja/templates/base.html
+++ b/redakcja/templates/base.html
@@ -21,7 +21,7 @@
                <!-- version: {{ APP_VERSION }} -->
         <div id="content">{% block maincontent %} {% endblock %}</div>
         </div>
                <!-- version: {{ APP_VERSION }} -->
         <div id="content">{% block maincontent %} {% endblock %}</div>
         </div>

-       <!-- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript"></script> -->
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>

     {% block extrabody %}{% endblock %}
     </body>
 </html>
     {% block extrabody %}{% endblock %}
     </body>
 </html>