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
Download patch file Download diff file Expand all files Collapse all files

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!}'
};