Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -r1.41.2.5 -r1.41.2.6
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	8 Sep 2014 08:10:17 -0000	1.41.2.5
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	8 Sep 2014 10:55:43 -0000	1.41.2.6
@@ -21,32 +21,6 @@
     # just a hook, might be removed later
   }
 
-  ADP_Generator instproc ajax_tag_definition {} {
-    # if we have no footer, we have no tag form
-    if {![my footer]} {return ""}
-
-    return {<script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>}
-  }
-
-
-
   ADP_Generator instproc master_part {} {
     return [subst -novariables -nobackslashes \
                 {<master>
@@ -57,11 +31,9 @@
                   <property name="&doc">property_doc</property>
                   <property name="header_stuff">
                   [my extra_header_stuff]@header_stuff;noquote@
-                  [my ajax_tag_definition]
                   </property>
                   <property name="head">
                   [my extra_header_stuff]@header_stuff;noquote@
-                  [my ajax_tag_definition]
                   </property>}]\n
   }
 
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.320.2.21 -r1.320.2.22
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	7 Sep 2014 20:07:15 -0000	1.320.2.21
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	8 Sep 2014 10:55:43 -0000	1.320.2.22
@@ -1408,7 +1408,26 @@
       # b. return_page/ adp_include
       #
       ::xo::Page requireCSS /resources/xowiki/xowiki.css
-
+      if {$footer ne ""} {
+        ::xo::Page requireJS {
+          function get_popular_tags(popular_tags_link, prefix) {
+            var http = getHttpObject();
+            http.open('GET', popular_tags_link, true);
+            http.onreadystatechange = function() {
+              if (http.readyState == 4) {
+                if (http.status != 200) {
+                  alert('Something wrong in HTTP request, status code = ' + http.status);
+                } else {
+                  var e = document.getElementById(prefix + '-popular_tags');
+                  e.innerHTML = http.responseText;
+                  e.style.display = 'block';
+                }
+              }
+            };
+            http.send(null);
+          }
+        }
+      }
       set header_stuff [::xo::Page header_stuff]
       if {![my exists description]} {my set description [my get_description $content]}
 
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v
diff -u -r1.67.2.4 -r1.67.2.5
--- openacs-4/packages/xowiki/www/oacs-view.adp	8 Sep 2014 08:10:18 -0000	1.67.2.4
+++ openacs-4/packages/xowiki/www/oacs-view.adp	8 Sep 2014 10:55:44 -0000	1.67.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 09:35:50 CEST 2014 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 12:54:17 CEST 2014 -->
 <master>
                   <property name="doc(title)">@title;noquote@</property>
                   <property name="context">@context;noquote@</property>
@@ -10,48 +10,12 @@
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
         <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
       @header_stuff;noquote@
-                  <script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>
                   </property>
                   <property name="head">
                   
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
         <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
       @header_stuff;noquote@
-                  <script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>
                   </property>
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view2.adp,v
diff -u -r1.46.2.4 -r1.46.2.5
--- openacs-4/packages/xowiki/www/oacs-view2.adp	8 Sep 2014 08:10:18 -0000	1.46.2.4
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	8 Sep 2014 10:55:44 -0000	1.46.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 09:35:50 CEST 2014 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 12:54:17 CEST 2014 -->
 <master>
                   <property name="doc(title)">@title;noquote@</property>
                   <property name="context">@context;noquote@</property>
@@ -11,49 +11,13 @@
         <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
         <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
       @header_stuff;noquote@
-                  <script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>
                   </property>
                   <property name="head">
                   
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
         <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
         <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
       @header_stuff;noquote@
-                  <script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>
                   </property>
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view3.adp,v
diff -u -r1.41.2.4 -r1.41.2.5
--- openacs-4/packages/xowiki/www/oacs-view3.adp	8 Sep 2014 08:10:18 -0000	1.41.2.4
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	8 Sep 2014 10:55:44 -0000	1.41.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 09:35:50 CEST 2014 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 12:54:17 CEST 2014 -->
 <master>
                   <property name="doc(title)">@title;noquote@</property>
                   <property name="context">@context;noquote@</property>
@@ -16,24 +16,6 @@
         <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
         <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
       @header_stuff;noquote@
-                  <script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>
                   </property>
                   <property name="head">
                   
@@ -46,24 +28,6 @@
         <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
         <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
       @header_stuff;noquote@
-                  <script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>
                   </property>
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
Index: openacs-4/packages/xowiki/www/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-book-no-ajax.adp,v
diff -u -r1.24.2.4 -r1.24.2.5
--- openacs-4/packages/xowiki/www/view-book-no-ajax.adp	8 Sep 2014 08:10:18 -0000	1.24.2.4
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	8 Sep 2014 10:55:44 -0000	1.24.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 09:35:50 CEST 2014 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 12:54:17 CEST 2014 -->
 <master>
                   <property name="doc(title)">@title;noquote@</property>
                   <property name="context">@context;noquote@</property>
@@ -8,46 +8,10 @@
                   <property name="header_stuff">
                   
       @header_stuff;noquote@
-                  <script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>
                   </property>
                   <property name="head">
                   
       @header_stuff;noquote@
-                  <script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>
                   </property>
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
Index: openacs-4/packages/xowiki/www/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-book.adp,v
diff -u -r1.35.2.4 -r1.35.2.5
--- openacs-4/packages/xowiki/www/view-book.adp	8 Sep 2014 08:10:18 -0000	1.35.2.4
+++ openacs-4/packages/xowiki/www/view-book.adp	8 Sep 2014 10:55:44 -0000	1.35.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 09:35:50 CEST 2014 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 12:54:17 CEST 2014 -->
 <master>
                   <property name="doc(title)">@title;noquote@</property>
                   <property name="context">@context;noquote@</property>
@@ -8,46 +8,10 @@
                   <property name="header_stuff">
                   
       @header_stuff;noquote@
-                  <script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>
                   </property>
                   <property name="head">
                   
       @header_stuff;noquote@
-                  <script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>
                   </property>
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-default.adp,v
diff -u -r1.64.2.4 -r1.64.2.5
--- openacs-4/packages/xowiki/www/view-default.adp	8 Sep 2014 08:10:18 -0000	1.64.2.4
+++ openacs-4/packages/xowiki/www/view-default.adp	8 Sep 2014 10:55:44 -0000	1.64.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 09:35:50 CEST 2014 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 12:54:17 CEST 2014 -->
 <master>
                   <property name="doc(title)">@title;noquote@</property>
                   <property name="context">@context;noquote@</property>
@@ -7,45 +7,9 @@
                   <property name="&doc">property_doc</property>
                   <property name="header_stuff">
                   @header_stuff;noquote@
-                  <script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>
                   </property>
                   <property name="head">
                   @header_stuff;noquote@
-                  <script type="text/javascript">
-      function get_popular_tags(popular_tags_link, prefix) {
-        var http = getHttpObject();
-        http.open('GET', popular_tags_link, true);
-        http.onreadystatechange = function() {
-          if (http.readyState == 4) {
-            if (http.status != 200) {
-              alert('Something wrong in HTTP request, status code = ' + http.status);
-            } else {
-              var e = document.getElementById(prefix + '-popular_tags');
-              e.innerHTML = http.responseText;
-              e.style.display = 'block';
-            }
-          }
-        };
-        http.send(null);
-      }
-      </script>
                   </property>
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-links.adp,v
diff -u -r1.54.2.3 -r1.54.2.4
--- openacs-4/packages/xowiki/www/view-links.adp	8 Sep 2014 08:10:18 -0000	1.54.2.3
+++ openacs-4/packages/xowiki/www/view-links.adp	8 Sep 2014 10:55:44 -0000	1.54.2.4
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 09:35:50 CEST 2014 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 12:54:17 CEST 2014 -->
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-plain.adp,v
diff -u -r1.50.2.3 -r1.50.2.4
--- openacs-4/packages/xowiki/www/view-plain.adp	8 Sep 2014 08:10:18 -0000	1.50.2.3
+++ openacs-4/packages/xowiki/www/view-plain.adp	8 Sep 2014 10:55:44 -0000	1.50.2.4
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 09:35:50 CEST 2014 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 12:54:17 CEST 2014 -->
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>