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

Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6

Browse source
This commit is contained in:
brianjlowe 2013-11-04 11:29:13 -05:00
commit 878c00027e
5 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/languages/example/i18n/all_es.properties
View file

@ -857,3 +857,5 @@ processing_icon = tratamiento
selection_in_process = Su selección se está procesando.view_labels_capitalized = Ver etiquetas selection_in_process = Su selección se está procesando.view_labels_capitalized = Ver etiquetas
view_labels_capitalized = Ver etiquetas view_labels_capitalized = Ver etiquetas
view_labels_for = Ver Etiquetas de view_labels_for = Ver Etiquetas de
select_an_existing_document = Seleccione un documento existente

3
webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSetup.java
View file

@ -267,7 +267,8 @@ public class ConfigurationPropertiesSetup implements ServletContextListener {
@Override @Override
public void contextDestroyed(ServletContextEvent sce) { public void contextDestroyed(ServletContextEvent sce) {
ConfigurationProperties.removeBean(sce.getServletContext()); // No need to remove the bean. It's only a map of strings, and if we
// restart the app, it will be replaced.
} }
/** /**

2
webapp/web/i18n/all.properties
View file

@ -869,3 +869,5 @@ processing_icon = processing
selection_in_process = Your selection is being processed. selection_in_process = Your selection is being processed.
view_labels_capitalized = View Labels view_labels_capitalized = View Labels
view_labels_for = View Labels for view_labels_for = View Labels for
select_an_existing_document = Select an existing document

8
webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
View file

@ -37,11 +37,11 @@
<#assign selectedObjectUri = ""/> <#assign selectedObjectUri = ""/>
<#assign submitButtonText = "${i18n().create_entry}" /> <#assign submitButtonText = "${i18n().create_entry}" />
</#if> </#if>
<#assign formTitle = editConfiguration.formTitle />
<#if editConfiguration.formTitle?contains("collaborator") > <#if editConfiguration.formTitle?contains("collaborator") >
<#assign formTitle = "${i18n().select_existing_collaborator(editConfiguration.subjectName)}" /> <#assign formTitle = "${i18n().select_existing_collaborator(editConfiguration.subjectName)}" />
<#else> <#elseif editConfiguration.objectPredicateProperty.rangeVClassURI?contains("IAO_0000030")>
<#assign formTitle = editConfiguration.formTitle /> <#assign formTitle = "${i18n().select_an_existing_document}" + " ${i18n().for} " + editConfiguration.subjectName/>
</#if> </#if>
<#--In order to fill out the subject--> <#--In order to fill out the subject-->
<#assign acFilterForIndividuals = "['" + editConfiguration.subjectUri + "']" /> <#assign acFilterForIndividuals = "['" + editConfiguration.subjectUri + "']" />
@ -82,7 +82,7 @@
</p> </p>
</form> </form>
<#else> <#else>
<p> ${i18n().there_are_no_entries_for_selection} </p> <p> ${i18n().there_are_no_entries_for_selection} </p>
</#if> </#if>
</#if> </#if>
<p>&nbsp;</p> <p>&nbsp;</p>

8
webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl
View file

@ -6,8 +6,11 @@
<#if (rangeOptions?keys?size > 0)> <#if (rangeOptions?keys?size > 0)>
<#assign rangeOptionsExist = true/> <#assign rangeOptionsExist = true/>
</#if> </#if>
<#assign formTitle = editConfiguration.formTitle />
<h2>${editConfiguration.formTitle}</h2> <#if editConfiguration.objectPredicateProperty.rangeVClassURI?contains("IAO_0000030")>
<#assign formTitle = "${i18n().select_an_existing_document}" + " ${i18n().for} " + editConfiguration.subjectName/>
</#if>
<h2>${formTitle}</h2>
<#if editConfiguration.propertySelectFromExisting = true> <#if editConfiguration.propertySelectFromExisting = true>
<#if rangeOptionsExist = true > <#if rangeOptionsExist = true >
@ -47,4 +50,3 @@
<#if editConfiguration.includeDeletionForm = true> <#if editConfiguration.includeDeletionForm = true>
<#include "defaultDeletePropertyForm.ftl"> <#include "defaultDeletePropertyForm.ftl">
</#if> </#if>