Skip to content

Commit c57e27e

Browse files
committed
.
1 parent e24d8fd commit c57e27e

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

views/search/solrTemplate.html.erb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
<%response['docs'].each do |item|%>
220220
<div class="app-search-result">
221221
<%if hasSpecialCharacter(item['iati_identifier'])%>
222-
<h3 class="govuk-heading-s app-search-result-title"><a href="#" class="govuk-link--no-visited-state"><%=item['title_narrative_first']%></a></h3>
222+
<h3 class="govuk-heading-s app-search-result-title"><span href="#" class="govuk-link--no-visited-state"><%=item['title_narrative_first']%></span></h3>
223223
<div class="govuk-inset-text" style="font-size: 1em; margin-bottom: 5px; margin-top: 5px">
224224
This activity page is not viewable due to a malformed IATI Identifier.
225225
</div>
@@ -687,15 +687,20 @@
687687
}
688688
var activityPageURL = '/projects/'+encodeURIComponent(result.iati_identifier).toString()+'/summary'
689689
var hasSpecialCharText = ''
690+
var activityLinkURL = ''
690691
if (hasSpecialCharacter(result.iati_identifier.toString())){
691692
activityPageURL = '#'
692693
hasSpecialCharText = '<div class="govuk-inset-text" style="font-size: 1em; margin-bottom: 5px; margin-top: 5px">This activity page is not viewable due to a malformed IATI Identifier.</div>'
694+
activityLinkURL = '<span href="'+activityPageURL+'" class="govuk-link--no-visited-state">' + result.title_narrative_first + '</span>'
695+
}
696+
else {
697+
activityLinkURL = '<a href="'+activityPageURL+'" class="govuk-link--no-visited-state">' + result.title_narrative_first + '</a>'
693698
}
694699
if(typeof result.description_narrative === 'undefined'){
695-
prepareContainer = prepareContainer + '<div class="app-search-result"><h3 class="govuk-heading-s app-search-result-title"><a href="'+activityPageURL+'" class="govuk-link--no-visited-state">' + result.title_narrative_first + '</a></h3>'+hasSpecialCharText+'<p class="govuk-body-s app-search-result-department">' + reporting_org + '</p><span class="text-highlighting" style="color: grey"><p>Found a match in field: '+highlightedKey+' - <span>'+highlightedVal+'</span></p></span><p class="govuk-body-s description">' + 'No description available' + '</p><div class="app-search-result-info"><div><span class="govuk-body-s app-search-result-info__title">Programme Id</span><span class="govuk-body-s app-search-result-info__value">' + result.iati_identifier + '</span></div><div><span class="govuk-body-s app-search-result-info__title">Start date</span><span class="govuk-body-s app-search-result-info__value"> ' + startDate.getFullYear() + '-' + (startDate.getMonth()+1) + '-' + startDate.getDate() + '</span></div><div><span class="govuk-body-s app-search-result-info__title">Activity status</span><span class="govuk-body-s app-search-result-info__value">' + activityStatus[parseInt(result.activity_status_code) - 1].name + '</span></div><div><span class="govuk-body-s app-search-result-info__title">Total budget</span><span class="govuk-body-s app-search-result-info__value">'+result.totalBudgetWithCurrency+'</span></div></div></div>';
700+
prepareContainer = prepareContainer + '<div class="app-search-result"><h3 class="govuk-heading-s app-search-result-title">'+activityLinkURL+'</h3>'+hasSpecialCharText+'<p class="govuk-body-s app-search-result-department">' + reporting_org + '</p><span class="text-highlighting" style="color: grey"><p>Found a match in field: '+highlightedKey+' - <span>'+highlightedVal+'</span></p></span><p class="govuk-body-s description">' + 'No description available' + '</p><div class="app-search-result-info"><div><span class="govuk-body-s app-search-result-info__title">Programme Id</span><span class="govuk-body-s app-search-result-info__value">' + result.iati_identifier + '</span></div><div><span class="govuk-body-s app-search-result-info__title">Start date</span><span class="govuk-body-s app-search-result-info__value"> ' + startDate.getFullYear() + '-' + (startDate.getMonth()+1) + '-' + startDate.getDate() + '</span></div><div><span class="govuk-body-s app-search-result-info__title">Activity status</span><span class="govuk-body-s app-search-result-info__value">' + activityStatus[parseInt(result.activity_status_code) - 1].name + '</span></div><div><span class="govuk-body-s app-search-result-info__title">Total budget</span><span class="govuk-body-s app-search-result-info__value">'+result.totalBudgetWithCurrency+'</span></div></div></div>';
696701
}
697702
else{
698-
prepareContainer = prepareContainer + '<div class="app-search-result"><h3 class="govuk-heading-s app-search-result-title"><a href="'+activityPageURL+'" class="govuk-link--no-visited-state">' + result.title_narrative_first + '</a></h3>'+hasSpecialCharText+'<p class="govuk-body-s app-search-result-department">' + reporting_org + '</p><span class="text-highlighting" style="color: grey"><p>Found a match in field: '+highlightedKey+' - <span>'+highlightedVal+'</span></p></span><p class="govuk-body-s description">' + result.description_narrative[0] + '</p><div class="app-search-result-info"><div><span class="govuk-body-s app-search-result-info__title">Programme Id</span><span class="govuk-body-s app-search-result-info__value">' + result.iati_identifier + '</span></div><div><span class="govuk-body-s app-search-result-info__title">Start date</span><span class="govuk-body-s app-search-result-info__value"> ' + startDate.getFullYear() + '-' + (startDate.getMonth()+1) + '-' + startDate.getDate() + '</span></div><div><span class="govuk-body-s app-search-result-info__title">Activity status</span><span class="govuk-body-s app-search-result-info__value">' + activityStatus[parseInt(result.activity_status_code) - 1].name + '</span></div><div><span class="govuk-body-s app-search-result-info__title">Total budget</span><span class="govuk-body-s app-search-result-info__value">'+result.totalBudgetWithCurrency+'</span></div></div></div>';
703+
prepareContainer = prepareContainer + '<div class="app-search-result"><h3 class="govuk-heading-s app-search-result-title">'+activityLinkURL+'</h3>'+hasSpecialCharText+'<p class="govuk-body-s app-search-result-department">' + reporting_org + '</p><span class="text-highlighting" style="color: grey"><p>Found a match in field: '+highlightedKey+' - <span>'+highlightedVal+'</span></p></span><p class="govuk-body-s description">' + result.description_narrative[0] + '</p><div class="app-search-result-info"><div><span class="govuk-body-s app-search-result-info__title">Programme Id</span><span class="govuk-body-s app-search-result-info__value">' + result.iati_identifier + '</span></div><div><span class="govuk-body-s app-search-result-info__title">Start date</span><span class="govuk-body-s app-search-result-info__value"> ' + startDate.getFullYear() + '-' + (startDate.getMonth()+1) + '-' + startDate.getDate() + '</span></div><div><span class="govuk-body-s app-search-result-info__title">Activity status</span><span class="govuk-body-s app-search-result-info__value">' + activityStatus[parseInt(result.activity_status_code) - 1].name + '</span></div><div><span class="govuk-body-s app-search-result-info__title">Total budget</span><span class="govuk-body-s app-search-result-info__value">'+result.totalBudgetWithCurrency+'</span></div></div></div>';
699704
}
700705
})
701706
$('#response-container').html(prepareContainer);

0 commit comments

Comments
 (0)