From 0e51a6fdfa5f3be4eec8d2e6d6a0bd8a4e38451b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@0d.be>
Date: Sun, 20 Nov 2011 18:25:55 +0100
Subject: [PATCH] move ajax utility urls to portal root

---
 tabellio/searchform/docsearch.pt              | 19 +++++++++++++------
 .../form_templates/view_dossier_search.pt     |  6 ++----
 .../form_templates/view_effectivesearch.pt    |  5 ++---
 .../form_templates/view_pfbdocsearch.pt       |  8 +++-----
 .../form_templates/view_question_search.pt    |  6 ++----
 5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/tabellio/searchform/docsearch.pt b/tabellio/searchform/docsearch.pt
index f31294c..0767e9b 100644
--- a/tabellio/searchform/docsearch.pt
+++ b/tabellio/searchform/docsearch.pt
@@ -47,8 +47,10 @@
        </div>
 
        <div tal:define="batch search_batch">
+       <form method="get" action="./#resultsbox">
        <div metal:use-macro="view/batch_macros/macros/navigation" />
        <div metal:use-macro="view/batch_macros/macros/feed" />
+       </form>
        </div>
 
         </div>
@@ -80,8 +82,10 @@
        </div>
 
        <div tal:define="batch search_batch">
+       <form method="get" action="./#resultsbox">
        <div metal:use-macro="view/batch_macros/macros/navigation" />
        <div metal:use-macro="view/batch_macros/macros/feed" />
+       </form>
        </div>
 
         </div>
@@ -113,8 +117,10 @@
        </div>
 
        <div tal:define="batch search_batch">
+       <form method="get" action="./#resultsbox">
        <div metal:use-macro="view/batch_macros/macros/navigation" />
        <div metal:use-macro="view/batch_macros/macros/feed" />
+       </form>
        </div>
 
         </div>
@@ -127,6 +133,7 @@
 
         <div tal:replace="structure provider:plone.belowcontentbody" />
 
+<script type="text/javascript" tal:content="string: var PORTAL_URL='${view/portal_url}';"/>
      <script type="text/javascript">
 function update_input(input) {
   var s = '';
@@ -170,9 +177,9 @@ function sync_elements(index, elem, url)
   }
 }
 
-function sync_authors(index, elem) { sync_elements(index, elem, './listAuthors'); }
-function sync_polgroups(index, elem) { sync_elements(index, elem, './listPolgroups'); }
-function sync_topics(index, elem) { sync_elements(index, elem, './listTopics'); }
+function sync_authors(index, elem) { sync_elements(index, elem, PORTAL_URL+'/listAuthors'); }
+function sync_polgroups(index, elem) { sync_elements(index, elem, PORTAL_URL+'/listPolgroups'); }
+function sync_topics(index, elem) { sync_elements(index, elem, PORTAL_URL+'/listTopics'); }
 
 if(typeof(String.prototype.trim) === "undefined") {
   String.prototype.trim = function()
@@ -183,11 +190,11 @@ if(typeof(String.prototype.trim) === "undefined") {
 
 (function($) {
   $().ready(function() {
-            $('.author-autocomplete').each(sync_authors).autocomplete('./listAuthors', {
+            $('.author-autocomplete').each(sync_authors).autocomplete(PORTAL_URL+'/listAuthors', {
             }).result(autocomplete_ready);
-            $('.polgroup-autocomplete').each(sync_polgroups).autocomplete('./listPolgroups', {
+            $('.polgroup-autocomplete').each(sync_polgroups).autocomplete(PORTAL_URL+'/listPolgroups', {
             }).result(autocomplete_ready);
-            $('.topic-autocomplete').each(sync_topics).autocomplete('./listTopics', {
+            $('.topic-autocomplete').each(sync_topics).autocomplete(PORTAL_URL+'/listTopics', {
             }).result(autocomplete_ready);
   });
 })(jQuery);
diff --git a/tabellio/searchform/form_templates/view_dossier_search.pt b/tabellio/searchform/form_templates/view_dossier_search.pt
index 2172ccd..5f3bcfd 100644
--- a/tabellio/searchform/form_templates/view_dossier_search.pt
+++ b/tabellio/searchform/form_templates/view_dossier_search.pt
@@ -1,11 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:tal="http://xml.zope.org/namespaces/tal">       
+      xmlns:tal="http://xml.zope.org/namespaces/tal">
   <body>
-    <form method="post" action="./#resultsbox">
       <metal:use use-macro="context/@@ploneform-macros/fields" />
       <metal:use use-macro="context/@@ploneform-macros/actions" />
-    </form>
-
+  </body>
 </html>
 
diff --git a/tabellio/searchform/form_templates/view_effectivesearch.pt b/tabellio/searchform/form_templates/view_effectivesearch.pt
index 7a3714b..824f8fe 100644
--- a/tabellio/searchform/form_templates/view_effectivesearch.pt
+++ b/tabellio/searchform/form_templates/view_effectivesearch.pt
@@ -1,9 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:tal="http://xml.zope.org/namespaces/tal">       
+      xmlns:tal="http://xml.zope.org/namespaces/tal">
   <body>
-    <form method="post" action="./#resultsbox">
       <metal:use use-macro="context/@@ploneform-macros/fields" />
       <metal:use use-macro="context/@@ploneform-macros/actions" />
-    </form>
+  </body>
 </html>
diff --git a/tabellio/searchform/form_templates/view_pfbdocsearch.pt b/tabellio/searchform/form_templates/view_pfbdocsearch.pt
index a94624b..a0e5e97 100644
--- a/tabellio/searchform/form_templates/view_pfbdocsearch.pt
+++ b/tabellio/searchform/form_templates/view_pfbdocsearch.pt
@@ -1,10 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:tal="http://xml.zope.org/namespaces/tal">       
+      xmlns:tal="http://xml.zope.org/namespaces/tal">
   <body>
-    <form method="post" action="./#resultsbox">
       <metal:use use-macro="context/@@ploneform-macros/fields" />
       <metal:use use-macro="context/@@ploneform-macros/actions" />
-    </form>
-
-</html>
+  </body>
+</html >
diff --git a/tabellio/searchform/form_templates/view_question_search.pt b/tabellio/searchform/form_templates/view_question_search.pt
index a94624b..824f8fe 100644
--- a/tabellio/searchform/form_templates/view_question_search.pt
+++ b/tabellio/searchform/form_templates/view_question_search.pt
@@ -1,10 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:tal="http://xml.zope.org/namespaces/tal">       
+      xmlns:tal="http://xml.zope.org/namespaces/tal">
   <body>
-    <form method="post" action="./#resultsbox">
       <metal:use use-macro="context/@@ploneform-macros/fields" />
       <metal:use use-macro="context/@@ploneform-macros/actions" />
-    </form>
-
+  </body>
 </html>
