From 41c84beadece7f0937f84d782cf39f84240cca2c Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Sun, 4 Apr 2010 22:56:33 +0000
Subject: [PATCH] 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.

---
 .../vitro/webapp/web/jsptags/InputElementFormattingTag.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java
index bdd517f3e..3ca53ca70 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java
@@ -282,13 +282,13 @@ public class InputElementFormattingTag extends TagSupport {
         } else if ( "admin".equals( getCancel() )){
             return " or <a class=\"cancel\" href=\"" + vreq.getContextPath()
             + 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() 
             	+ "/dashboard\" title=\"Cancel\">"+labelStr+"</a>";
         }else if (getCancel()!=null && !getCancel().equals("")) {        	
             if( editConfig != null && editConfig.getEditKey() != null ){
                 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")
                         +"\" title=\"Cancel\">"+labelStr+"</a>";
                 }catch(UnsupportedEncodingException ex){