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

NIHVIVO-2051 Fix currentPage value sent to template: make home page value consistent regardless of the requested url, and change from servletPath to requestURI so we get full path value below the context path. Also add urls.currentPage to replace ${urls.base}/${currentPage} in templates. This value is similarly normalized for the home page.

Browse source
This commit is contained in:
rjy7 2011-02-08 16:50:19 +00:00
parent f07999fc14
commit a05a001704
4 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/freemarker/body/menuN3Edit.ftl
View file

@ -15,7 +15,7 @@
</#if>
<#if menuN3??>
<form class="" action="${urls.base}/${currentPage}" method="post">
<form class="" action="${urls.currentPage}" method="post">
<label for="navigatioN3">Setup the primary navigation menu for your website</label>
<textarea name="navigationN3" id="navigationN3" cols="45" rows="40" class="maxWidth">
${menuN3}<#t><#-- The trim directive here is to trim leading and trailing white-space -->

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

@ -15,10 +15,6 @@ ${stylesheets.add("/css/browseClassGroups.css")}
<#if !firstPopulatedClassGroup??>
<#assign firstPopulatedClassGroup = group />
</#if>
<#-- Remove "index.jsp" from URL (should verify with RY if this can be taken care of in the controller) -->
<#if currentPage == "index.jsp">
<#assign currentPage = "" />
</#if>
<#-- Determine the active (selected) group -->
<#assign activeGroup = "" />
<#if !classGroup??>
@ -28,7 +24,7 @@ ${stylesheets.add("/css/browseClassGroups.css")}
<#elseif classGroup.uri == group.uri>
<#assign activeGroup = selected />
</#if>
<li role="listitem"><a ${activeGroup}href="${urls.base}/${currentPage}?classgroupUri=${group.uri?url}#browse" title="Browse ${group.publicName?capitalize}" data-uri="${group.uri}" data-count="${group.individualCount}">${group.publicName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
<li role="listitem"><a ${activeGroup}href="${urls.currentPage}?classgroupUri=${group.uri?url}#browse" title="Browse ${group.publicName?capitalize}" data-uri="${group.uri}" data-count="${group.individualCount}">${group.publicName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
</#if>
</#list>
</#assign>

4
webapp/web/templates/freemarker/widgets/widget-browse.ftl
View file

@ -17,7 +17,7 @@
<ul id="browse-classgroups" role="list">
<#list vclassGroupList as group>
<#if (group.individualCount > 0)>
<li role="listitem"><a href="${urls.base}/${currentPage}?classgroupUri=${group.uri?url}">${group.publicName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
<li role="listitem"><a href="${urls.currentPage}?classgroupUri=${group.uri?url}">${group.publicName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
</#if>
</#list>
</ul>
@ -35,7 +35,7 @@
<ul id="classes-in-classgroup" role="list">
<#list classes as class>
<#if (class.individualCount > 0)>
<li role="listitem"><a href="${urls.base}/${currentPage}?classgroupUri=${classGroup.uri?url}&vclassUri=${class.uri?url}">${class.name} <span class="count-individuals"> (${class.individualCount})</span></a></li>
<li role="listitem"><a href="${urls.currentPage}?classgroupUri=${classGroup.uri?url}&vclassUri=${class.uri?url}">${class.name} <span class="count-individuals"> (${class.individualCount})</span></a></li>
</#if>
</#list>
</ul>