Commit e012be01 authored by Matija Obreza's avatar Matija Obreza

Project URL displayed on project page, Organizations text converted to blurb

parent 9d2a4d8f
......@@ -101,6 +101,7 @@ public class HtmlController extends BaseController {
model.addAttribute("lastNews", contentService.lastNews());
model.addAttribute("welcomeBlurp", contentService.getGlobalArticle("welcome", getLocale()));
model.addAttribute("sideBlurp", contentService.getGlobalArticle("sideBlurp", getLocale()));
model.addAttribute("organizationsBlurb", contentService.getGlobalArticle("welcome-organizations", getLocale()));
model.addAttribute("numberOfCountries", statisticsService.numberOfCountries());
model.addAttribute("numberOfInstitutes", statisticsService.numberOfInstitutes());
......
......@@ -91,16 +91,10 @@
<div class="see-also-block" style="background-image: url('<c:url value="/html/images/aim/three-2.jpg" />')">
<div class="content">
<h2 class="short">
<spring:message code="organization.page.list.title" />
<c:out value="${organizationsBlurb.title}" />
</h2>
<div class="padding10 white-background body" dir="ltr">
<a href="<c:url value="/org/CGIAR" />">CGIAR International Genebanks</a>
&bull;
<a href="<c:url value="/org/EURISCO" />">ECPGR EURISCO network</a>
&bull;
<a href="<c:url value="/org/USDA" />">USDA ARS NPGS</a>
&bull;
<a href="<c:url value="/org/COGENT" />">COGENT</a>
<div class="padding10 white-background body">
<c:out value="${organizationsBlurb.body}" escapeXml="false" />
</div>
</div>
</div>
......
......@@ -30,6 +30,12 @@
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
</c:if>
<c:if test="${project.url ne ''}">
<p>
<a title="<c:out value="${project.name}" />" href="<c:url value="${project.url}" />"><c:out value="${project.url}" /></a>
</p>
</c:if>
<div class="content-section-2015">
<h3>
<span>
......@@ -185,6 +191,13 @@
<spring:message code="see-also.overview" />
</a>
</li>
<c:if test="${project.url ne ''}">
<li>
<a title="<c:out value="${project.name}" />" href="<c:url value="${project.url}" />">
<spring:message code="project.url" />
</a>
</li>
</c:if>
</ul>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment