From 2a88ff83080b5410cf7c58f97c1f90940d04fc1e Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 5 Jul 2010 21:29:16 +0000
Subject: [PATCH] NIHVIVO-646 Handle authorships with no linked author in add
 authors to publication form.

---
 .../forms/addAuthorsToInformationResource.jsp | 35 ++++++++++---------
 .../css/addAuthorsToInformationResource.css   |  2 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/productMods/edit/forms/addAuthorsToInformationResource.jsp b/productMods/edit/forms/addAuthorsToInformationResource.jsp
index f5585c3e..5f5e76e4 100644
--- a/productMods/edit/forms/addAuthorsToInformationResource.jsp
+++ b/productMods/edit/forms/addAuthorsToInformationResource.jsp
@@ -344,22 +344,25 @@ SPARQL queries for existing values. --%>
             <%-- span.author will be used in the next phase, when we display a message that the author has been
             removed. That text will replace the a.authorLink, which will be removed. --%>    
             <span class="author">
-                <c:choose>
-                    <c:when test="${!empty author}">
-                        <c:url var="authorHref" value="/individual">
-                            <c:param name="uri" value="${author.URI}"/>
-                        </c:url> 
-                        <a href="${authorHref}" id="${author.URI}" class="authorLink">${author.name}</a>                   
-                    </c:when>
-
-                    <c:otherwise>
-	                   <c:url var="authorshipHref" value="/individual">
-	                       <c:param name="uri" value="${authorshipUri}"/>
-	                   </c:url>                
-	                   <a href="${authorshipHref}" id="${authorshipUri}" class="authorLink">${authorshipName}<em> (no linked author)</em></a>
-                    </c:otherwise>
-                </c:choose>
-                
+                <%-- This span is here to assign a width to. We can't assign directly to the a.authorLink,
+                for the case when it's followed by an em tag - we want the width to apply to the whole thing. --%>
+                <span class="authorLinkWrapper">
+	                <c:choose>
+	                    <c:when test="${!empty author}">
+	                        <c:url var="authorHref" value="/individual">
+	                            <c:param name="uri" value="${author.URI}"/>
+	                        </c:url> 
+	                        <a href="${authorHref}" id="${author.URI}" class="authorLink">${author.name}</a>                   
+	                    </c:when>
+	
+	                    <c:otherwise>
+		                   <c:url var="authorshipHref" value="/individual">
+		                       <c:param name="uri" value="${authorshipUri}"/>
+		                   </c:url>                
+		                   <a href="${authorshipHref}" id="${authorshipUri}" class="authorLink">${authorshipName}</a><em> (no linked author)</em>
+	                    </c:otherwise>
+	                </c:choose>
+                </span>
                 <c:url var="deleteAuthorshipHref" value="/edit/primitiveDelete" />
                 <a href="${deleteAuthorshipHref}" class="remove">Remove</a>
                 <%-- <a href="${undoHref}" class="undo">Undo</a>  --%>
diff --git a/productMods/edit/forms/css/addAuthorsToInformationResource.css b/productMods/edit/forms/css/addAuthorsToInformationResource.css
index 8e4326c8..ac386b6a 100644
--- a/productMods/edit/forms/css/addAuthorsToInformationResource.css
+++ b/productMods/edit/forms/css/addAuthorsToInformationResource.css
@@ -15,7 +15,7 @@
     background: url("../images/sortable_icon.png") no-repeat left center;    
 }
 
-#authorships a.authorLink {
+#authorships .authorLinkWrapper {
     display: inline-block;
     width: 15em;
 }