Moved javascript from tagged_object_list.html to catalogue.js.

diff --git a/wolnelektury/media/js/catalogue.js b/wolnelektury/media/js/catalogue.js
index 187cfde..857849d 100644 (file)
--- a/wolnelektury/media/js/catalogue.js
+++ b/wolnelektury/media/js/catalogue.js
@@ -42,8 +42,6 @@
             return false;
         });
         
-        
-        
         $('#registration-form').ajaxForm({
             dataType: 'json',
             beforeSubmit: function() {
@@ -156,5 +154,45 @@
                 });
             }
         });
+    
+        $('#books-list .book').hover(
+            function() { $(this).css({background: '#F3F3F3', cursor: 'pointer'}); },
+            function() { $(this).css({background: '#FFF'}); }
+        ).click(function() {
+            location.href = $('h2 a', this).attr('href');
+        });
+    
+        $('#toggle-description').hover(
+            function() { $(this).css({background: '#F3F3F3', cursor: 'pointer'}); },
+            function() { $(this).css({background: '#EEE'}); }
+        ).click(function() {
+            if ($('#description').hasClass('hidden')) {
+                $('#description').slideDown('fast').removeClass('hidden');
+                $('p', this).html('Zwiń opis ▲');
+            } else {
+                $('#description').slideUp('fast').addClass('hidden');
+                $('p', this).html('Rozwiń opis ▼');
+            }
+        });
+    
+        var target = $('#set-window div.target');
+    
+        $('#set-window').jqm({
+            ajax: '@href', 
+            target: target[0],
+            overlay: 60,
+            trigger: 'a.jqm-trigger', 
+            onShow: function(hash) { 
+                var offset = $(hash.t).offset();
+                target.html('<p><img src="/media/img/indicator.gif" /> Ładowanie</p>');
+                hash.w.css({position: 'absolute', left: offset.left, top: offset.top}).show() },
+            onLoad: function(hash) { 
+                $('form', hash.w).ajaxForm({
+                    target: target,
+                    success: function() { setTimeout(function() { $('#set-window').jqmHide() }, 1000) }
+                });
+            }
+        });
+
     });
 })(jQuery)
\ No newline at end of file

diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html
index 4567e74..769a5cb 100644 (file)
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -5,52 +5,6 @@
 
 {% block bodyid %}tagged-object-list{% endblock %}
 
-{% block extrahead %}
-    <script type="text/javascript">
-    // <![CDATA[
-        $(function() {
-            $('#books-list .book').hover(
-                function() { $(this).css({background: '#F3F3F3', cursor: 'pointer'}); },
-                function() { $(this).css({background: '#FFF'}); }
-            ).click(function() {
-                location.href = $('h2 a', this).attr('href');
-            });
-            
-            $('#toggle-description').hover(
-                function() { $(this).css({background: '#F3F3F3', cursor: 'pointer'}); },
-                function() { $(this).css({background: '#EEE'}); }
-            ).click(function() {
-                if ($('#description').hasClass('hidden')) {
-                    $('#description').slideDown('fast').removeClass('hidden');
-                    $('p', this).html('Zwiń opis ▲');
-                } else {
-                    $('#description').slideUp('fast').addClass('hidden');
-                    $('p', this).html('Rozwiń opis ▼');
-                }
-            });
-            
-            var target = $('#set-window div.target');
-            
-            $('#set-window').jqm({
-                ajax: '@href', 
-                target: target[0],
-                overlay: 60,
-                trigger: 'a.jqm-trigger', 
-                onShow: function(hash) { 
-                    var offset = $(hash.t).offset();
-                    target.html('<p><img src="/media/img/indicator.gif" /> Ładowanie</p>');
-                    hash.w.css({position: 'absolute', left: offset.left, top: offset.top}).show() },
-                onLoad: function(hash) { 
-                    $('form', hash.w).ajaxForm({
-                        target: target,
-                        success: function() { setTimeout(function() { $('#set-window').jqmHide() }, 1000) }
-                    });
-                }});
-        });
-    // ]]>
-    </script>
-{% endblock %}
-
 {% block body %}
     <h1>{% title_from_tags tags %}</h1>
     {% breadcrumbs tags %}