Fix autocomplete location + move scripts from mediaitem_list.html to mediaitem_list.js

diff --git a/telemeta/static/telemeta/js/mediaitem_list.js b/telemeta/static/telemeta/js/mediaitem_list.js
new file mode 100644 (file)
index 0000000..62e1357
--- /dev/null
+++ b/telemeta/static/telemeta/js/mediaitem_list.js
@@ -0,0 +1,25 @@
+/**
+ * Created by crem on 19/05/16.
+ */
+$(function () {
+    $("#results-per-page").selectmenu({
+        icons: {button: "ui-icon-carat-2-n-s"},
+        change: function () {
+            location.search = '?page=1&results_page=' + $(this).val();
+        }
+    }).selectmenu("menuWidget").addClass("overflow");
+
+    $("#selectAll").click(function () {
+        if (this.checked) {
+            $(".check1").each(function () {
+                this.checked = true;
+            });
+        }
+        else {
+            $(".check1").each(function () {
+                this.checked = false;
+            });
+        }
+    });
+
+});
\ No newline at end of file

diff --git a/telemeta/templates/search/indexes/telemeta/location_text.txt b/telemeta/templates/search/indexes/telemeta/location_text.txt
index 28701c178f042c80184a30dfc706be7eac0ce512..038e4c544dd0b3f5033f918c93413befa0273d64 100644 (file)
--- a/telemeta/templates/search/indexes/telemeta/location_text.txt
+++ b/telemeta/templates/search/indexes/telemeta/location_text.txt
@@ -1 +1 @@
-{{ object.name }}
\ No newline at end of file
+{{ object.name|safe }}
\ No newline at end of file

diff --git a/telemeta/templates/search/indexes/telemeta/locationalias_text.txt b/telemeta/templates/search/indexes/telemeta/locationalias_text.txt
index fb2c54be877fdbb2dd4946a2ffaefb68dfe259e0..d6270a96fa7513b6b2f1cb60895038e93222164b 100644 (file)
--- a/telemeta/templates/search/indexes/telemeta/locationalias_text.txt
+++ b/telemeta/templates/search/indexes/telemeta/locationalias_text.txt
@@ -1 +1 @@
-{{ object.alias }}
\ No newline at end of file
+{{ object.alias|safe }}
\ No newline at end of file

diff --git a/telemeta/templates/telemeta/mediaitem_list.html b/telemeta/templates/telemeta/mediaitem_list.html
index 4afb0806831bf74d09a575a126e851a1bc73d19b..8490662adbb226eda27ba6b04384497aee4de78b 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_list.html
+++ b/telemeta/templates/telemeta/mediaitem_list.html
@@ -71,32 +71,6 @@
 {% block extra_javascript %}
 
     <script src="{{ STATIC_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
-
-    <script>
-        $(function () {
-            $("#results-per-page").selectmenu({
-                icons: {button: "ui-icon-carat-2-n-s"},
-                change: function () {
-                    location.search = '?page=1&results_page=' + $(this).val();
-                }
-            }).selectmenu("menuWidget").addClass("overflow");
-
-            $("#selectAll").click(function () {
-                if (this.checked) {
-                    $(".check1").each(function () {
-                        this.checked = true;
-                    });
-                }
-                else {
-                    $(".check1").each(function () {
-                        this.checked = false;
-                    });
-                }
-            });
-
-        });
-
-
-    </script>
+    <script src="{{ STATIC_URL }}telemeta/js/mediaitem_list.js" type="application/javascript"></script>
 
 {% endblock %}
\ No newline at end of file