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

NIHVIVO-193 On step 1 of position history form, don't show Continue button. Instead, bind the event listener that opens the rest of the form to a selection from the org drop-down.

Browse source
This commit is contained in:
rjy7 2010-04-04 22:56:33 +00:00
parent 4ea2ae107b
commit 41c84beade
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -282,13 +282,13 @@ public class InputElementFormattingTag extends TagSupport {
} else if ( "admin".equals( getCancel() )){ } else if ( "admin".equals( getCancel() )){
return " or <a class=\"cancel\" href=\"" + vreq.getContextPath() return " or <a class=\"cancel\" href=\"" + vreq.getContextPath()
+ Controllers.SITE_ADMIN + " title=\"Cancel\">"+labelStr+"</a>"; + Controllers.SITE_ADMIN + " title=\"Cancel\">"+labelStr+"</a>";
}else if( "dashboard".equals( getCancel() )){ //this case is Datastar specific. }else if( "dashboard".equals( getCancel() )){ //this case is Datastar-specific.
return " or <a class=\"cancel\" href=\"" + vreq.getContextPath() return " or <a class=\"cancel\" href=\"" + vreq.getContextPath()
+ "/dashboard\" title=\"Cancel\">"+labelStr+"</a>"; + "/dashboard\" title=\"Cancel\">"+labelStr+"</a>";
}else if (getCancel()!=null && !getCancel().equals("")) { }else if (getCancel()!=null && !getCancel().equals("")) {
if( editConfig != null && editConfig.getEditKey() != null ){ if( editConfig != null && editConfig.getEditKey() != null ){
try{ try{
return " or <a class=\"cancel\" href=\"" + vreq.getContextPath() return "<span class=\"or\"> or </span><a class=\"cancel\" href=\"" + vreq.getContextPath()
+ "/edit/postEditCleanUp.jsp?editKey="+ URLEncoder.encode(editConfig.getEditKey(),"UTF-8") + "/edit/postEditCleanUp.jsp?editKey="+ URLEncoder.encode(editConfig.getEditKey(),"UTF-8")
+"\" title=\"Cancel\">"+labelStr+"</a>"; +"\" title=\"Cancel\">"+labelStr+"</a>";
}catch(UnsupportedEncodingException ex){ }catch(UnsupportedEncodingException ex){