Changes to vclass, object property, and data property editing forms (JSPs) and controllers, plus one new vitro.css class

webapp/web/templates/edit/specific/dataprop_retry.jsp

@@ -4,59 +4,52 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%-- colspan set to 4 in DatapropRetryController.java --%>
 <tr class="editformcell">
-	<td valign="top" colspan="1">
-		<b>Public Name</b><br/><i>as will display on public pages</i><br/>
-		<input name="PublicName" value="<form:value name="PublicName"/>"/>
+	<td valign="top" colspan="2">
+		<b>Public label</b><br/>
+		<input name="PublicName" type="text" class="fullWidthInput" value="<form:value name="PublicName"/>"/>
         <c:set var="PublicNameError"><form:error name="PublicName"/></c:set>
         <c:if test="${!empty PublicNameError}">
             <span class="notice"><c:out value="${PublicNameError}"/></span>
         </c:if>
 	</td>
-	<td valign="top" colspan="1">
-		<b>Property Group</b><br/>
-		<i>(for display headers and dashboard)</i><br/>
+	<td valign="top" colspan="2">
+		<b>Property group</b><br/>
 		<select name="GroupURI">
 		  <form:option name="GroupURI"/>
-		</select>
+		</select><br/>
+		<i>for grouping properties on individual pages</i><br/>
 	</td>
-	<td valign="bottom" colspan="1">
-        <b>Display Level</b><br /><i>(specify least restrictive level allowed)</i><br/>
-        <select name="HiddenFromDisplayBelowRoleLevelUsingRoleUri"><form:option name="HiddenFromDisplayBelowRoleLevelUsingRoleUri"/></select>
-    </td>
-    <td valign="bottom" colspan="1">
-        <b>Update Level</b><br /><i>(specify least restrictive level allowed)</i><br />
-        <select name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri"><form:option name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri"/></select>
-    </td>
 </tr>
+<tr><td colspan="5"><hr color="Gainsboro"/></td></tr>
 <tr class="editformcell">
 	<!-- c:set var="existingLocalName" value="<form:value name='LocalName'/>"/ -->
 	<td valign="top" colspan="2">
 		<b>Ontology</b><br/>
         <c:choose>
         	<c:when test="${_action eq 'update'}">
-        		<i>Change only via the "change URI" button on the previous screen</i><br/>
 				<select name="Namespace" disabled="disabled">
 					<form:option name="Namespace"/>
-				</select>
+				</select><br/>
+        		<i>Edit via "change URI" on previous screen</i><br/>
 			</c:when>
 			<c:otherwise>
-				<i>specifies Namespace</i><br/>
 				<select name="Namespace">
 					<form:option name="Namespace"/>
-				</select>
+				</select><br/>
 			</c:otherwise>
 		</c:choose>
 	</td>
 	<td valign="top" colspan="2">
-		<b>Local Name*</b>
+		<b>Internal name*</b> (RDF local name)<br/><br/>
         <c:choose>
         	<c:when test="${_action eq 'update'}">
-        		<br/><i>Change only via the "change URI" button on the previous screen</i><br/>
-				<input name="LocalName" value="<form:value name="LocalName"/>" disabled="disabled"/>
+				<input type="text" name="LocalName" class="fullWidthInput" value="<form:value name="LocalName"/>" disabled="disabled"/><br/>
+				<i>Edit via &quot;change URI&quot;</i><br/>
 			</c:when>
 			<c:otherwise>
-				<i>(must be a valid XML name)<br/>startLowercaseAndUseCamelStyle</i><br/>
-				<input name="LocalName" value="<form:value name="LocalName"/>"/>
+				<input type="text" name="LocalName" class="fullWidthInput" value="<form:value name="LocalName"/>"/><br/>
+				<i>must be valid XML without spaces; by</i><br/>
+				<i>convention use camel case with no initial capital</i><br/>
 			</c:otherwise>
 		</c:choose>
         <c:set var="LocalNameError"><form:error name="LocalName"/></c:set>
@@ -65,39 +58,52 @@
         </c:if>
 	</td>
 </tr>
-
+<tr><td colspan="5"><hr color="Gainsboro"/></td></tr>
 <tr class="editformcell">
 	<td valign="top" colspan="2">
-		<b>Domain Class</b><br/>
+		<b>Domain class</b><br/>
 		<select name="DomainClassURI">
 			<form:option name="DomainClassURI"/>
 		</select>
 	</td>
-</tr>
-
-<tr class="editformcell">
 	<td valign="top" colspan="2">
-		<b>Range Datatype</b><br/>
+		<b>Range datatype</b><br/>
 		<select name="RangeDatatypeURI">
 			<form:option name="RangeDatatypeURI"/>
-		</select>
+		</select><br/>
+		<i>Use &quot;untyped&quot; instead of &quot;string&quot; to allow language tags</i>
 	</td>
-    <td valign="bottom" colspan="2">
-        <c:set var="functionalLabel" value="<b>Functional property</b> <i>(has at most one value for each individual)</i>" />
-        <c:choose>
-             <c:when test="${functional}">
-    	         <input name="Functional" type="checkbox" value="TRUE" checked="checked"/>${functionalLabel}
-             </c:when>
-             <c:otherwise>
-                 <input name="Functional" type="checkbox" value="TRUE"/>${functionalLabel}
-             </c:otherwise>
-        </c:choose>
-    </td>
 </tr>
-
+<tr><td colspan="5"><hr color="Gainsboro"/></td></tr>
 <tr class="editformcell">
     <td valign="top" colspan="4">
-        <b>Example</b><br/>
+    	<b>Make this property be:</b><br/><br/>
+        <c:set var="functionalLabel" value=" functional"/>
+        <c:choose>
+             <c:when test="${functional}">
+    	         <input name="Functional" type="checkbox" value="TRUE" checked="checked"/>${functionalLabel}<br/><br/>
+             </c:when>
+             <c:otherwise>
+                 <input name="Functional" type="checkbox" value="TRUE"/>${functionalLabel}<br/><br/>
+             </c:otherwise>
+        </c:choose>
+    	<i>A &quot;functional&quot; property has at most one value for each individual</i></br>
+    </td>
+</tr>
+<tr><td colspan="5"><hr color="Gainsboro"/></td></tr>
+<tr class="editformcell">
+	<td valign="top" colspan="4">
+		<b>Public description</b> for front-end users, as it will appear on editing forms<br/>
+		<textarea name="PublicDescription"><form:value name="PublicDescription"/></textarea>
+		<c:set var="PublicDescriptionError"><form:error name="PublicDescription"/></c:set>
+		<c:if test="${!empty PublicDescriptionError}">
+			<span class="notice"><c:out value="${PublicDescriptionError}"/></span>
+		</c:if>
+	</td>
+</tr>
+<tr class="editformcell">
+    <td valign="top" colspan="4">
+        <b>Example</b> for ontology editors<br/>
         <textarea name="Example"><form:value name="Example"/></textarea>
         <c:set var="ExampleError"><form:error name="Example"/></c:set>
         <c:if test="${!empty ExampleError}">
@@ -105,7 +111,6 @@
         </c:if>
     </td>
 </tr>
-
 <tr class="editformcell">
 	<td valign="top" colspan="4">
 		<b>Description</b> for ontology editors<br/>
@@ -116,38 +121,43 @@
         </c:if>
 	</td>
 </tr>
-
+<tr><td colspan="5"><hr color="Gainsboro"/></td></tr>
 <tr class="editformcell">
-	<td valign="top" colspan="4">
-		<b>Public Description</b> for front-end users, as it will appear on editing forms<br/>
-		<textarea name="PublicDescription"><form:value name="PublicDescription"/></textarea>
-        <c:set var="PublicDescriptionError"><form:error name="PublicDescription"/></c:set>
-        <c:if test="${!empty PublicDescriptionError}">
-            <span class="notice"><c:out value="${PublicDescriptionError}"/></span>
-        </c:if>
+	<td valign="top" colspan="2">
+		<b>Display level</b><br/>
+		<select name="HiddenFromDisplayBelowRoleLevelUsingRoleUri"><form:option name="HiddenFromDisplayBelowRoleLevelUsingRoleUri"/></select><br/>
+		<i>specify least restrictive level allowed</i><br/>
+	</td>
+	<td valign="top" colspan="2">
+		<b>Update level</b><br />
+		<select name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri"><form:option name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri"/></select><br/>
+		<i>specify least restrictive level allowed</i><br/>
 	</td>
 </tr>
-
+<tr><td colspan="5"><hr color="Gainsboro"/></td></tr>
 <tr class="editformcell">
-	<td valign="top" colspan="1">
-		<b>Display Tier</b><br/>
-		<input name="DisplayTier" value="<form:value name="DisplayTier"/>"/>
+	<td valign="top" colspan="2">
+		<b>Display tier</b> within property group<br/>
+		<input type="text" name="DisplayTier" value="<form:value name="DisplayTier"/>"/>
         <c:set var="DisplayTierError"><form:error name="DisplayTier"/></c:set>
         <c:if test="${!empty DisplayTierError}">
             <span class="notice"><c:out value="${DisplayTierError}"/></span>
         </c:if>
 	</td>
-	<td valign="top" colspan="1">
-		<b>Data Entry Limit</b><br/>
-		<input name="DisplayLimit" value="<form:value name="DisplayLimit"/>"/>
+	<td valign="top" colspan="2">
+		<b>Display limit</b> before &quot;more ...&quot; button is displayed<br/>
+		<input type="text" name="DisplayLimit" value="<form:value name="DisplayLimit"/>"/>
         <c:set var="DisplayLimitError"><form:error name="DisplayLimit"/></c:set>
         <c:if test="${!empty DisplayLimitError}">
             <span class="notice"><c:out value="${DisplayLimitError}"/></span>
         </c:if>
 	</td>
-	<td valign="top" colspan="1">
-    	<em>Optional: <b>custom entry form</b></em><br />
-    	<input name="CustomEntryForm" size="30" value="<form:value name="CustomEntryForm"/>" />
+</tr>
+<tr><td colspan="5"><hr color="Gainsboro"/></td></tr>
+<tr class="editformcell">
+	<td valign="top" colspan="2">
+    	<b>Custom entry form</b><br/>
+    	<input type="text" name="CustomEntryForm" class="fullWidthInput" value="<form:value name="CustomEntryForm"/>" />
         <c:set var="CustomEntryFormError"><form:error name="CustomEntryForm"/></c:set>
         <c:if test="${!empty CustomEntryFormError}">
             <span class="notice"><c:out value="${CustomEntryFormError}"/></span>
@@ -155,4 +165,5 @@
     	</td>
 	</td>
 </tr>
+<tr><td colspan="5"><hr color="Gainsboro"/></td></tr>