removed links on author names for author form and replaced with <span> NIHVIVO-646

This commit is contained in:
nac26 2010-07-14 13:28:11 +00:00
parent daef1dd686
commit 9a9784c632
3 changed files with 13 additions and 13 deletions

View file

@ -332,24 +332,24 @@ SPARQL queries for existing values. --%>
<span class="position" id="${position}"></span> <span class="position" id="${position}"></span>
<%-- span.author will be used in the next phase, when we display a message that the author has been <%-- 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. --%> removed. That text will replace the a.authorName, which will be removed. --%>
<span class="author"> <span class="author">
<%-- This span is here to assign a width to. We can't assign directly to the a.authorLink, <%-- This span is here to assign a width to. We can't assign directly to the a.authorName,
for the case when it's followed by an em tag - we want the width to apply to the whole thing. --%> for the case when it's followed by an em tag - we want the width to apply to the whole thing. --%>
<span class="authorLinkWrapper"> <span class="authorNameWrapper">
<c:choose> <c:choose>
<c:when test="${!empty author}"> <c:when test="${!empty author}">
<c:url var="authorHref" value="/individual"> <c:url var="authorHref" value="/individual">
<c:param name="uri" value="${author.URI}"/> <c:param name="uri" value="${author.URI}"/>
</c:url> </c:url>
<a href="#" id="${author.URI}" class="authorLink">${author.name}</a> <span class="authorName">${author.name}</span>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:url var="authorshipHref" value="/individual"> <c:url var="authorshipHref" value="/individual">
<c:param name="uri" value="${authorshipUri}"/> <c:param name="uri" value="${authorshipUri}"/>
</c:url> </c:url>
<a href="${authorshipHref}" id="${authorshipUri}" class="authorLink">${authorshipName}</a><em> (no linked author)</em> <a href="${authorshipHref}" id="${authorshipUri}" class="authorName">${authorshipName}</a><em> (no linked author)</em>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</span> </span>

View file

@ -15,14 +15,14 @@
background: url("../images/sortable_icon.png") no-repeat left center; background: url("../images/sortable_icon.png") no-repeat left center;
} }
#authorships .authorLinkWrapper { #authorships .authorNameWrapper {
display: inline-block; display: inline-block;
width: 15em; width: 15em;
} }
#authorships.dd .authorLinkWrapper, #authorships.dd .authorNameWrapper,
#authorships.dd li, #authorships.dd li,
#authorships.dd a.authorLink { #authorships.dd span.authorName {
cursor: move; cursor: move;
} }

View file

@ -202,7 +202,7 @@ var addAuthorForm = {
setAcFilter: function() { setAcFilter: function() {
var existingAuthors = $('#authorships .authorLink'); var existingAuthors = $('#authorships .authorName');
this.acFilter = []; this.acFilter = [];
existingAuthors.each(function() { existingAuthors.each(function() {
@ -272,7 +272,7 @@ var addAuthorForm = {
return; return;
} }
$('.authorLinkWrapper').each(function() { $('.authorNameWrapper').each(function() {
$(this).attr('title', 'Drag and drop to reorder authors'); $(this).attr('title', 'Drag and drop to reorder authors');
}); });
@ -534,7 +534,7 @@ var addAuthorForm = {
complete: function(request, status) { complete: function(request, status) {
var authorship = $(this).parents('.authorship'), var authorship = $(this).parents('.authorship'),
nextAuthorships = authorship.nextAll(), nextAuthorships = authorship.nextAll(),
author = authorship.find('.authorLink').attr('id'), author = authorship.find('.authorName').attr('id'),
rank; rank;
// author = $(this).siblings('span.author'), // author = $(this).siblings('span.author'),
// authorLink = author.children('a.authorLink'), // authorLink = author.children('a.authorLink'),
@ -591,7 +591,7 @@ var addAuthorForm = {
disableAuthorDD: function() { disableAuthorDD: function() {
var authorships = $('#authorships'), var authorships = $('#authorships'),
authorship = $('.authorship'), authorship = $('.authorship'),
authorLinkWrapper = $('.authorLinkWrapper'); authorNameWrapper = $('.authorNameWrapper');
authorships.sortable({ disable: true } ); authorships.sortable({ disable: true } );
authorships.removeClass('dd'); authorships.removeClass('dd');
@ -599,7 +599,7 @@ var addAuthorForm = {
authorship.css('background', 'none'); authorship.css('background', 'none');
authorship.css('padding-left', '0'); authorship.css('padding-left', '0');
authorLinkWrapper.attr('title', ''); authorNameWrapper.attr('title', '');
}, },
// RY To be implemented later. // RY To be implemented later.