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

Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop

Browse source
This commit is contained in:
tworrall 2013-07-17 15:51:12 -04:00
commit b1fc49bc05
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/WEB-INF/resources/startup_listeners.txt
View file

@ -5,6 +5,8 @@
# https://sourceforge.net/apps/mediawiki/vivo/index.php?title=The_StartupManager # https://sourceforge.net/apps/mediawiki/vivo/index.php?title=The_StartupManager
# #
edu.cornell.mannlib.vitro.webapp.servlet.setup.JvmSmokeTests
edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSetup edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSetup
edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSmokeTests edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSmokeTests

19
productMods/WEB-INF/web.xml
View file

@ -281,15 +281,6 @@
<url-pattern>/ajax/sparqlQuery</url-pattern> <url-pattern>/ajax/sparqlQuery</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>N3EditFormController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.N3EditFormController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>N3EditFormController</servlet-name>
<url-pattern>/N3EditForm</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>AboutController</servlet-name> <servlet-name>AboutController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.AboutController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.AboutController</servlet-class>
@ -1361,7 +1352,15 @@
<servlet-name>GetObjectClasses</servlet-name> <servlet-name>GetObjectClasses</servlet-name>
<url-pattern>/admin/getObjectClasses</url-pattern> <url-pattern>/admin/getObjectClasses</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>SearchServiceController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.SearchServiceController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>SearchServiceController</servlet-name>
<url-pattern>/searchService/*</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>SmokeTestController</servlet-name> <servlet-name>SmokeTestController</servlet-name>

2
themes/wilma/templates/footer.ftl
View file

@ -13,7 +13,7 @@
</#if> </#if>
| <a class="terms" href="${urls.termsOfUse}" title="${i18n().menu_termuse}">${i18n().menu_termuse}</a></small> | | <a class="terms" href="${urls.termsOfUse}" title="${i18n().menu_termuse}">${i18n().menu_termuse}</a></small> |
</#if> </#if>
${i18n().menu_powered} <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="${i18n().menu_powered} VIVO"><strong>VIVO}</strong></a> ${i18n().menu_powered} <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="${i18n().menu_powered} VIVO"><strong>VIVO</strong></a>
<#if user.hasRevisionInfoAccess> <#if user.hasRevisionInfoAccess>
| ${i18n().menu_version} <a href="${version.moreInfoUrl}" title="${i18n().menu_version}">${version.label}</a> | ${i18n().menu_version} <a href="${version.moreInfoUrl}" title="${i18n().menu_version}">${version.label}</a>
</#if> </#if>