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

NIHVIVO-646 Continued work on custom form for adding authors to publications

Browse source
This commit is contained in:
rjy7 2010-06-14 16:36:11 +00:00
parent 7568169fdd
commit ba418660e3
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
webapp/config/tlds/vitroForm.tld
View file

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
@ -147,7 +146,12 @@
<name>label</name> <name>label</name>
<required>false</required> <required>false</required>
<rtexprvalue>true</rtexprvalue> <rtexprvalue>true</rtexprvalue>
</attribute> </attribute>
<attribute>
<name>cancelLabel</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute> <attribute>
<name>cssClass</name> <name>cssClass</name>
<required>false</required> <required>false</required>

18
webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java
View file

@ -55,6 +55,7 @@ public class InputElementFormattingTag extends TagSupport {
private String id; private String id;
private String type; private String type;
private String label; private String label;
private String cancelLabel;
private String cssClass; private String cssClass;
private String labelClass; private String labelClass;
private String value; private String value;
@ -89,6 +90,12 @@ public class InputElementFormattingTag extends TagSupport {
this.label = labelStr; this.label = labelStr;
} }
public String getCancelLabel() {
return cancelLabel;
}
public void setCancelLabel(String cancelLabel) {
this.cancelLabel = cancelLabel;
}
public String getCssClass() { public String getCssClass() {
return cssClass; return cssClass;
} }
@ -273,7 +280,10 @@ public class InputElementFormattingTag extends TagSupport {
private String doCancel(String labelStr, EditConfiguration editConfig){ private String doCancel(String labelStr, EditConfiguration editConfig){
if (labelStr==null || labelStr.equals("")) { if (labelStr==null || labelStr.equals("")) {
labelStr="Cancel"; labelStr = getCancelLabel();
if (labelStr==null || labelStr.equals("")) {
labelStr="Cancel";
}
} }
VitroRequest vreq = new VitroRequest((HttpServletRequest)pageContext.getRequest()); VitroRequest vreq = new VitroRequest((HttpServletRequest)pageContext.getRequest());
if( "about".equals( getCancel() )){ if( "about".equals( getCancel() )){
@ -1003,7 +1013,7 @@ public class InputElementFormattingTag extends TagSupport {
log.debug("found existing literal of type Date for field " + fieldName); log.debug("found existing literal of type Date for field " + fieldName);
}else if( valueFromLiteral instanceof String){ }else if( valueFromLiteral instanceof String){
strFromLit = (String) valueFromLiteral; strFromLit = (String) valueFromLiteral;
log.debug("found exisitng literal of type String for field " + fieldName); log.debug("found existing literal of type String for field " + fieldName);
} else if ( valueFromLiteral instanceof XSDDateTime) { } else if ( valueFromLiteral instanceof XSDDateTime) {
strFromLit = date.getLexicalForm(); strFromLit = date.getLexicalForm();
log.debug("found existing literal of type XSDDateTime for field " + fieldName); log.debug("found existing literal of type XSDDateTime for field " + fieldName);
@ -1126,6 +1136,6 @@ public class InputElementFormattingTag extends TagSupport {
return sb; return sb;
} }
final String SELECTED = "selected=\"selected\""; final String SELECTED = "selected=\"selected\"";
} }