Changeset 25462 for main/trunk/greenstone3/web/interfaces/oran/js/map-scripts.js

Timestamp:

2012-04-24T13:09:10+12:00 (12 years ago)

Author:

sjm84

Message:

Fixes to map_scripts and also changed the on-page editing that it reloads the page with the expanded view. Later we will probably make the page reload unnecessary. Also fixed the preferences page.

File:

• main/trunk/greenstone3/web/interfaces/oran/js/map-scripts.js (modified) (7 diffs)

main/trunk/greenstone3/web/interfaces/oran/js/map-scripts.js

@@ -36 +36 @@
         else
         {
-            document.getElementById("map_canvas").style.display = "none";
+            document.getElementById("map_canvas").style.visibility = "hidden";
         }
     }
@@ -149 +149 @@
     
     var ajax = new gs.functions.ajaxRequest();
-    ajax.open("GET", _baseURL + "a=q&s=RawQuery&rt=rd&c=" + gs.cgiParams.c + "&s1.rawquery=" + query + "&excerptid=jsonNodes", true);
+    ajax.open("GET", gs.xsltParams.library_name + "?a=q&s=RawQuery&rt=rd&c=" + gs.cgiParams.c + "&s1.rawquery=" + query + "&excerptid=jsonNodes", true);
     ajax.onreadystatechange = function()
     {
@@ -323 +323 @@
     google.maps.event.addListener(marker, 'click', function()
     {
-        document.location.href = _baseURL + "a=d&ed=1&c=" + gs.cgiParams.c + "&d=" + nodeID + "&dt=hierarchy&p.a=b&p.sa=&p.s=ClassifierBrowse";
+        document.location.href = gs.xsltParams.library_name + "?a=d&ed=1&c=" + gs.cgiParams.c + "&d=" + nodeID + "&dt=hierarchy&p.a=b&p.sa=&p.s=ClassifierBrowse";
     });
 }
@@ -400 +400 @@
 {
     var ajax = new gs.functions.ajaxRequest();
-    ajax.open("GET", _baseURL + "a=b&rt=s&s=ClassifierBrowse&c=" + gs.cgiParams.c + "&cl=" + sectionID + "&excerptid=jsonNodes", true);     
+    ajax.open("GET", gs.xsltParams.library_name + "?a=b&rt=s&s=ClassifierBrowse&c=" + gs.cgiParams.c + "&cl=" + sectionID + "&excerptid=jsonNodes", true);      
     ajax.onreadystatechange = function()
     {
@@ -420 +420 @@
                 }
                 
-                document.getElementById("map_canvas").style.display = "block";
+                document.getElementById("map_canvas").style.visibility = "visible";
             }
             
@@ -482 +482 @@
     
     var ajax = new gs.functions.ajaxRequest();
-    ajax.open("GET", _baseURL + "a=q&s=RawQuery&rt=rd&c=" + gs.cgiParams.c + "&s1.rawquery=" + query + "&excerptid=nearbyDocs&ilt=" + inlineTemplate.replace(/ /, "%20"), true);        
+    ajax.open("GET", gs.xsltParams.library_name + "?a=q&s=RawQuery&rt=rd&c=" + gs.cgiParams.c + "&s1.rawquery=" + query + "&excerptid=nearbyDocs&ilt=" + inlineTemplate.replace(/ /, "%20"), true);     
     ajax.onreadystatechange = function()
     {
@@ -650 +650 @@
             sectionToggle.setAttribute("src", gs.imageURLs.loading);
 
-            var url = document.URL;
-            url = url.replace(/(&|\?)cl=[a-z\.0-9]+/gi, "$1cl=" + sectionID + "&excerptid=div" + sectionID);
+            var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/browse/" + sectionID.replace(/\./g, "/") + "?excerptid=div" + sectionID;
 
             if(gs.cgiParams.berryBasket == "on")