Updates for RDFS Label and N-3 Editing

webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl

@@ -10,15 +10,19 @@
 	   <label for="${editConfiguration.dataLiteral}"><p class="propEntryHelpText">${editConfiguration.dataPredicatePublicDescription}</p></label>
 	</#if>   
 
+	
 	<input rows="2" type="textarea" 
 	id="${editConfiguration.dataLiteral}" name="${editConfiguration.dataLiteral}"
 	value="${literalValues}"/>
 
 
 	<div style="margin-top: 0.2em">
+		<#--The submit label should be set within the template itself, right now
+		the default label for default data/object property editing is returned from Edit Configuration Template Model,
+		but that method may not return the correct result for other custom forms-->
 		<input type="submit" id="submit" value="${editConfiguration.submitLabel}"/>
 		<span class="or"> or </span>
-		<a title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
+		<a title="Cancel" href="${cancelUrl}">Cancel</a>
 	</div>
 	
 </form>

webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl

@@ -0,0 +1,29 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#assign actionText = "Add new" />
+<#if editConfiguration.dataPropertyStatement?has_content>
+	<#assign actionText = "Edit"/>
+</#if>
+<#assign submitLabel>${actionText} label</#assign>
+
+<h2>${actionText} <em>label</em> for ${editConfiguration.subjectName}</h2>
+
+<#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" />
+
+<form class="editForm" action = "${submitUrl}" method="post">
+	<input type="text" name="label" id="label" size="30" value="${literalValues}"}/>
+	<input type="hidden" name="editKey" id="editKey" value="${editKey}" />
+	<input type="hidden" name="vitroNsProp" value="true"/>
+	<p class="submit">
+		<input type="submit" id="submit" value="${submitLabel}"/>
+		or <a href="${cancelUrl} class="cancel">Cancel</a>
+	</p>
+	
+</form>
+
+<#--The original jsp included a delete form for deleting rdfs label.  
+If required, deletion can be supported but it does not appear that is required currently. 
+ -->
+
+
+