Merge branch 'maint-rel-1.6' into feature/orcid

This commit is contained in:
Jim Blake 2014-04-01 16:37:26 -04:00
commit b038902ee7
74 changed files with 2375 additions and 490 deletions

View file

@ -125,13 +125,23 @@
<tr class="editformcell">
<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/>
<select name="HiddenFromDisplayBelowRoleLevelUsingRoleUri">
<form:option name="HiddenFromDisplayBelowRoleLevelUsingRoleUri"/>
</select>
</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/>
<select name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri">
<form:option name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri"/>
</select>
</td>
</tr>
<tr class="editformcell">
<td valign="top" colspan="2">
<b>Publish level</b><br/>
<select name="HiddenFromPublishBelowRoleLevelUsingRoleUri">
<form:option name="HiddenFromPublishBelowRoleLevelUsingRoleUri"/>
</select>
</td>
</tr>
<tr><td colspan="5"><hr class="formDivider"/></td></tr>

View file

@ -190,13 +190,23 @@
<tr class="editformcell">
<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>
<select name="HiddenFromDisplayBelowRoleLevelUsingRoleUri">
<form:option name="HiddenFromDisplayBelowRoleLevelUsingRoleUri"/>
</select>
</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>
<select name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri">
<form:option name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri"/>
</select>
</td>
</tr>
<tr class="editformcell">
<td valign="top" colspan="2">
<b>Publish level</b><br />
<select name="HiddenFromPublishBelowRoleLevelUsingRoleUri">
<form:option name="HiddenFromPublishBelowRoleLevelUsingRoleUri"/>
</select>
</td>
</tr>
<tr><td colspan="5"><hr class="formDivider"/></td></tr>

View file

@ -86,13 +86,23 @@
<tr class="editformcell">
<td valign="bottom" colspan="1">
<b>Display level</b><br/>
<select name="HiddenFromDisplayBelowRoleLevelUsingRoleUri"><form:option name="HiddenFromDisplayBelowRoleLevelUsingRoleUri"/></select><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/>
<select name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri"><form:option name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri"/></select><br/>
<i>specify least restrictive level allowed</i><br />
<select name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri">
<form:option name="ProhibitedFromUpdateBelowRoleLevelUsingRoleUri"/>
</select>
</td>
</tr>
<tr class="editformcell">
<td valign="bottom" colspan="1">
<b>Publish level</b><br/>
<select name="HiddenFromPublishBelowRoleLevelUsingRoleUri">
<form:option name="HiddenFromPublishBelowRoleLevelUsingRoleUri"/>
</select>
</td>
</tr>
<tr><td colspan="4"><hr class="formDivider"/></td></tr>

View file

@ -238,7 +238,8 @@ name will be used as the label. -->
(<span>${property.type?lower_case}</span> property);
order in group: <span>${verboseDisplay.displayRank};</span>
display level: <span>${verboseDisplay.displayLevel};</span>
update level: <span>${verboseDisplay.updateLevel}</span>
update level: <span>${verboseDisplay.updateLevel};</span>
publish level: <span>${verboseDisplay.publishLevel}</span>
</section>
</#if>
</#macro>