Merge r7497 from nihvivo-rel-1.2-maint

webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java

@@ -408,9 +408,6 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
         // Let the page template know which page it's processing.
         map.put("currentServlet", normalizeServletName(vreq.getServletPath().replaceFirst("/", "")));
 
-        // Allow template to send domain name to JavaScript (needed for AJAX calls)
-        map.put("requestedPage", vreq.getRequestURL().toString());
-
         // In template: ${now?date}, ${now?datetime}, ${now?time}
         map.put("now", new Date());
         

webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl

@@ -63,18 +63,11 @@ ${stylesheets.add("/css/browseClassGroups.css")}
             </section> <!-- #browse-classes -->
         </section> <!-- #browse -->
         
-        <#----------------------------------------------------------------------------------
+        <#-- For v1.3: The controller should pass in the dataservice url. -->
-        requestedPage is currently provided by FreemarkerHttpServlet. Should this be moved
-        to PageController? Maybe we should have Java provide the domain name directly
-        instead of the full URL of the requested page? Chintan was also asking for a
-        template variable with the domain name for an AJAX request with visualizations.
-        ------------------------------------------------------------------------------------>
-        <#assign domainName = requestedPage?substring(0, requestedPage?index_of("/", 7)) />
-
         <script type="text/javascript">
             var browseData = {
-                baseUrl: '${domainName + urls.base}',
+                baseUrl: '${urls.base}',
-                dataServiceUrl: '${domainName + urls.base}/dataservice?getVClassesForVClassGroup=1&classgroupUri=',
+                dataServiceUrl: '${urls.base}/dataservice?getVClassesForVClassGroup=1&classgroupUri=',
                 defaultBrowseClassGroupUri: '${firstPopulatedClassGroup.uri!}',
                 defaultBrowseClassGroupCount: '${firstPopulatedClassGroup.individualCount!}'
             };

webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl

@@ -2,13 +2,7 @@
 
 <#-- Template to setup and call scripts for menupages -->
 
-<#----------------------------------------------------------------------------------
+
-requestedPage is currently provided by FreemarkerHttpServlet. Should this be moved
-to PageController? Maybe we should have Java provide the domain name directly
-instead of the full URL of the requested page? Chintan was also asking for a
-template variable with the domain name for an AJAX request with visualizations.
------------------------------------------------------------------------------------->
-<#assign domainName = requestedPage?substring(0, requestedPage?index_of("/", 7)) />
 
 <#list vClassGroup as vClass>
     <#if (vClass.entityCount > 0)>
@@ -21,10 +15,11 @@ template variable with the domain name for an AJAX request with visualizations.
     </#if>
 </#list>
 
+<#-- For v1.3: The controller should pass in the dataservice url. -->
 <script type="text/javascript">
     var menupageData = {
-        baseUrl: '${domainName + urls.base}',
+        baseUrl: '${urls.base}',
-        dataServiceUrl: '${domainName + urls.base}/dataservice?getLuceneIndividualsByVClass=1&vclassId=',
+        dataServiceUrl: '${urls.base}/dataservice?getLuceneIndividualsByVClass=1&vclassId=',
         defaultBrowseVClassUri: '${firstNonEmptyVClass}'
     };
 </script>