litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge r7497 from nihvivo-rel-1.2-maint

Browse source
This commit is contained in:
rjy7 2011-02-21 18:13:26 +00:00
parent 198c8293ce
commit fe3bd563bc
3 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -407,9 +407,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());

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

@ -63,18 +63,11 @@ ${stylesheets.add("/css/browseClassGroups.css")}
</section> <!-- #browse-classes -->
</section> <!-- #browse -->
<#----------------------------------------------------------------------------------
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)) />
<#-- For v1.3: The controller should pass in the dataservice url. -->
<script type="text/javascript">
var browseData = {
baseUrl: '${domainName + urls.base}',
dataServiceUrl: '${domainName + urls.base}/dataservice?getVClassesForVClassGroup=1&classgroupUri=',
baseUrl: '${urls.base}',
dataServiceUrl: '${urls.base}/dataservice?getVClassesForVClassGroup=1&classgroupUri=',
defaultBrowseClassGroupUri: '${firstPopulatedClassGroup.uri!}',
defaultBrowseClassGroupCount: '${firstPopulatedClassGroup.individualCount!}'
};

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

@ -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}',
dataServiceUrl: '${domainName + urls.base}/dataservice?getLuceneIndividualsByVClass=1&vclassId=',
baseUrl: '${urls.base}',
dataServiceUrl: '${urls.base}/dataservice?getLuceneIndividualsByVClass=1&vclassId=',
defaultBrowseVClassUri: '${firstNonEmptyVClass}'
};
</script>