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

Updates for n3 editing and freemarker conversion. Also fixing propDelete.jsp's reference to freemarker configuration loading to include correct method call.

Browse source
This commit is contained in:
hjkhjk54 2011-10-11 15:49:19 +00:00
parent 23b55d2ae6
commit 591af24749
15 changed files with 356 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

38
webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl Normal file
View file

@ -0,0 +1,38 @@
<#assign toBeDeletedClass = "dataProp" />
<#if editConfiguration.objectProperty = true>
<#assign toBeDeletedClass = "objProp" />
</#if>
<#assign statement = editConfiguration.statementDisplay />
<form action="${editConfiguration.deleteProcessingUrl}" method="get">
<label for="submit">
<h2>Are you sure you want to delete the following entry from
<em>${editConfiguration.propertyName}</em>?
</h2>
</label>
<div class="toBeDeleted ${toBeDeletedClass}">
<#if editConfiguration.objectProperty = true>
<#if statement.object?has_content>
<#include "propStatement-default.ftl" />
</#if>
<#else>
${statement.dataValue}
</#if>
</div>
<input type="hidden" name="subjectUri" value="${editConfiguration.subjectUri}"/>
<input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}"/>
<#if editConfiguration.dataProperty = true>
<input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" />
<input type="hidden" name="vitroNsProp" value="${editConfiguration.vitroNsProperty}" />
<#else>
<input type="hidden" name="objectUri" value="${editConfiguration.objectUri}"/>
</#if>
<p class="submit">
<input type="submit" id="delete" value="Delete"/>
<span class="or"> or </span>
<a title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
</p>
</form>

12
webapp/web/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
View file

@ -1,7 +1,7 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#assign formTitle>
${editConfiguration.propertyPublicDomainTitle} entry for ${editConfiguration.subjectName}
"${editConfiguration.propertyPublicDomainTitle}" entry for ${editConfiguration.subjectName}
</#assign>
<#if editConfiguration.objectUri?has_content>
<#assign formTitle>Edit ${formTitle} </#assign>
@ -13,11 +13,15 @@
<form class="editForm" action = "${submitUrl}">
<input type="hidden" name="editKey" id="editKey" value="${editKey}" />
<input type="text" name="name" id="name" label="name (required" size="30"/>
<input type="text" name="name" id="name" label="name (required)" size="30"/>
<br/>
<div style="margin-top: 0.2em">
<input type="submit" id="submit" value="${editConfiguration.submitLabel}" cancel="true"/>
</div>
<input type="submit" id="submit" value="${editConfiguration.submitLabel}"
<span class="or"> or </span>
<a title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
</div>
</form>

6
webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
View file

@ -14,9 +14,13 @@
id="${editConfiguration.dataLiteral}" name="${editConfiguration.dataLiteral}"
value="${literalValues}"/>
<div style="margin-top: 0.2em">
<input type="submit" id="submit" value="${editConfiguration.submitLabel}" cancel="true"/>
<input type="submit" id="submit" value="${editConfiguration.submitLabel}"/>
<span class="or"> or </span>
<a title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
</div>
</form>

22
webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
View file

@ -3,29 +3,35 @@
<input type="hidden" name="subjectUri" value="${editConfiguration.subjectUri}"/>
<input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}"/>
<input type="hidden" name="cmd" value="delete"/>
<input type="hidden" name="editKey" value="${editConfiguration.editKey}"/>
<#if editConfiguration.dataProperty = true>
<input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" />
<input type="submit" id="delete" value="Delete">
<a class="cancel">Cancel</a>
<div style="margin-top: 0.2em">
<input type="submit" id="delete" value="Delete">
</div>
</#if>
<#--The original jsp included vinput tag with cancel=empty string for case where both select from existing
and offer create new option are true below
so leaving as Cancel for now but unclear as to what the result would have been-->
so leaving as Cancel for first option but not second below-->
<#if editConfiguration.objectProperty = true>
<input type="hidden" name="objectUri" value="${editConfiguration.objectUri}"/>
<#if editConfiguration.propertySelectFromExisting = false
&& editConfiguration.propertyOfferCreateNewOption = false>
<input type="submit" id="delete" value="Delete">
<a class="cancel">Cancel</a>
<div style="margin-top: 0.2em">
<input type="submit" id="delete" value="Delete">
<span class="or"> or </span>
<a title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
</div>
</#if>
<#if editConfiguration.propertySelectFromExisting = true
&& editConfiguration.propertyOfferCreateNewOption = true>
<input type="submit" id="delete" value="Delete">
<a class="cancel">Cancel</a>
<div style="margin-top: 0.2em">
<input type="submit" id="delete" value="Delete">
</div>
</#if>
</#if>

15
webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
View file

@ -4,11 +4,18 @@
<p style="margin-top: 5em">Please create a new entry.</p>
</#if>
<#if editConfiguration.objectUri?has_content>
<#assign objectUri = editConfiguration.objectUri>
<#else>
<#assign objectUri = ""/>
</#if>
<#assign typesList = editConfiguration.offerTypesCreateNew />
<form class="editForm" action="{editConfiguration.mainEditUrl}">
<form class="editForm" action="${editConfiguration.mainEditUrl}">
<input type="hidden" value="${editConfiguration.subjectUri}" name="subjectUri"/>
<input type="hidden" value="${editConfiguration.predicateUri}" name="predicateUri"/>
<input type="hidden" value="${editConfiguration.objectUri}" name="objectUri"/>
<input type="hidden" value="${objectUri}" name="objectUri"/>
<input type="hidden" value="create" name="cmd"/>
<select id="typeOfNew" name="typeOfNew">
<#assign typeKeys = typesList?keys />
@ -16,7 +23,5 @@
<option value="${typeKey}"> ${typesList[typeKey]} </option>
</#list>
</select>
<input type="submit" name="submit" id="submit" value="Add a new item of this type" />
<a class="cancel">Cancel</a>
<input type="submit" id="submit" value="Add a new item of this type"/>
</form>

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

@ -20,7 +20,9 @@
</#list>
</select>
<div style="margin-top: 0.2em">
<input type="submit" id="submit" value="${editConfiguration.submitLabel}" cancel="true"/>
<input type="submit" id="submit" value="${editConfiguration.submitLabel}"/>
<span class="or"> or </span>
<a title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
</div>
</#if>
</form>