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

Merge r8779-8780 from maint-rel-vivo-1.3

Browse source
This commit is contained in:
ryounes 2011-07-21 16:16:32 +00:00
parent b73939fc80
commit 0877635c3f
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
webapp/config/example.deploy.properties
View file

@ -11,12 +11,16 @@
# #
# This namespace will be used when generating URIs for objects created in the # This namespace will be used when generating URIs for objects created in the
# editor. Change it to reflect your own domain. For example, Cornell's # editor. In order to serve linked data, the default namespace must be composed
# namespace is http://vivo.cornell.edu/individual/ # as follows (optional elements in parentheses):
# #
# Note: it is essential that this namespace end with a trailing slash. # scheme + server_name (+ port) (+ servlet_context) + "/individual/"
# #
Vitro.defaultNamespace = http://vitro.mydomain.edu/individual/ # For example, Cornell's default namespace is:
#
# http://vivo.cornell.edu/individual/
#
Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/
# #
# The base install directory for your Tomcat server. The Vitro application # The base install directory for your Tomcat server. The Vitro application

2
webapp/web/templates/freemarker/body/individual/individual-menu.ftl
View file

@ -10,7 +10,7 @@
<h3>Menu management</h3> <h3>Menu management</h3>
<#assign hasElement = propertyGroups.pullProperty("${namespaces.display}hasElement")> <#assign hasElement = propertyGroups.pullProperty("${namespaces.display}hasElement")!>
<#-- List the menu items --> <#-- List the menu items -->
<ul class="menuItems"> <ul class="menuItems">