Skip to content

Genesys Backend
Genesys Backend
Commit 1d63e2f5 authored by Matija Obreza's avatar Matija Obreza
Browse files
Options

Using the <cms:blurb tag instead of <%@include file="blurb-display.jsp" %>

parent 133dc250
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 70 deletions
src/main/webapp/WEB-INF/jsp/1/crop/index.jsp
View file @ 1d63e2f5
......@@ -37,7 +37,7 @@
<div class="row">
<div class="col-xs-12">
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<cms:blurb blurb="${blurp}"/>
</div>
</div>
</div>
......
src/main/webapp/WEB-INF/jsp/1/index.jsp
View file @ 1d63e2f5
......@@ -17,9 +17,7 @@
<div class="intro-text">
<c:if test="${welcomeBlurp ne null}">
<div class="">
<c:set var="blurp" value="${welcomeBlurp}" />
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<c:remove var="blurp" />
<cms:blurb blurb="${welcomeBlurp }"/>
<a class="btn btn-default" href="<c:url value="/content/about/about" />"><spring:message code="welcome.read-more" /></a>
</div>
</c:if>
......@@ -184,12 +182,8 @@
<div class="col-lg-4 col-md-4 no-space" id="right-col">
<c:if test="${sideBlurp ne null}">
<div class="content-block">
<h2 class="short text-right">${sideBlurp.title}</h2>
<div class="blurp">
<c:set var="blurp" value="${sideBlurp}" />
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<c:remove var="blurp" />
</div>
<h2 class="short text-right"><c:out value="${sideBlurp.title}" /></h2>
<cms:blurb blurb="${sideBlurp}"/>
</div>
</c:if>
......
src/main/webapp/WEB-INF/jsp/content/include/blurp-display.jsp deleted 100644 → 0
View file @ 133dc250
<%@include file="/WEB-INF/jsp/init.jsp"%>
<div class="free-text blurp" dir="${blurp.lang=='fa' || blurp.lang=='ar' ? 'rtl' : 'ltr'}">
<c:out value="${blurp.body}" escapeXml="false" />
</div>
<c:if test="${blurp!=null && blurp.lang != pageContext.response.locale.language}">
<%@include file="/WEB-INF/jsp/not-translated.jsp" %>
</c:if>
src/main/webapp/WEB-INF/jsp/country/details.jsp
View file @ 1d63e2f5
......@@ -36,7 +36,7 @@
</a>
</security:authorize>
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<cms:blurb blurb="${blurp}" />
<gui:alert type="info" display="${itpgrfa != null and itpgrfa.contractingParty=='Yes'}">
<spring:message code="country.is-itpgrfa-contractingParty" arguments="${country.getName(pageContext.response.locale)}" argumentSeparator="|" />
......
src/main/webapp/WEB-INF/jsp/crop/index.jsp
View file @ 1d63e2f5
......@@ -33,10 +33,7 @@
</a>
</security:authorize>
<c:if test="${blurp ne null}">
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp" %>
</c:if>
<cms:blurb blurb="${blurp}" />
<div class="content-section-2015">
<h3>
......
src/main/webapp/WEB-INF/jsp/download/index.jsp
View file @ 1d63e2f5
......@@ -8,7 +8,7 @@
</head>
<body>
<h1><spring:message code="download.page.title" /></h1>
<local:blurb blurb="${info}" />
<cms:blurb blurb="${info}" />
<%--
<pre>
......
src/main/webapp/WEB-INF/jsp/index.jsp
View file @ 1d63e2f5
......@@ -18,9 +18,7 @@
<div class="intro-text">
<c:if test="${welcomeBlurp ne null}">
<div class="">
<c:set var="blurp" value="${welcomeBlurp}" />
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<c:remove var="blurp" />
<cms:blurb blurb="${welcomeBlurp}" />
<a class="btn btn-default" href="<c:url value="/content/about/about" />"><spring:message code="welcome.read-more" /></a>
</div>
</c:if>
......@@ -147,12 +145,8 @@
<div class="col-md-4" id="right-col">
<c:if test="${sideBlurp ne null}">
<div class="content-block">
<h2>${sideBlurp.title}</h2>
<div class="blurp">
<c:set var="blurp" value="${sideBlurp}" />
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<c:remove var="blurp" />
</div>
<h2><c:out value="${sideBlurp.title}" /></h2>
<cms:blurb blurb="${sideBlurp}" />
</div>
</c:if>
......
src/main/webapp/WEB-INF/jsp/itpgrfa/countries.jsp
View file @ 1d63e2f5
......@@ -15,8 +15,8 @@
<a href="<c:url value="/explore"><c:param name="filter" value='{"mls":[true]}' /></c:url>"><spring:message code="view.accessions" /></a>
</div>
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<!-- ITPGRFA introduction text -->
<cms:blurb blurb="${blurp}" />
<div id="letter-top" class="main-col-header">
<c:set value="" var="hoofdleter" />
......
src/main/webapp/WEB-INF/jsp/organization/details.jsp
View file @ 1d63e2f5
......@@ -31,9 +31,8 @@
</a>
</security:authorize>
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<!-- Organization introductory text -->
<cms:blurb blurb="${blurp}" />
<c:set value="" var="countryName" />
<div class="form-horizontal">
......
src/main/webapp/WEB-INF/jsp/project/view.jsp
View file @ 1d63e2f5
......@@ -26,9 +26,8 @@
</a>
</security:authorize>
<c:if test="${blurp ne null}">
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
</c:if>
<!-- Project text -->
<cms:blurb blurb="${blurp}" />
<c:if test="${fn:length(accessionLists) gt 0}">
<div class="content-section-2015">
......
src/main/webapp/WEB-INF/jsp/region/region.jsp
View file @ 1d63e2f5
......@@ -35,12 +35,9 @@
<spring:message code="edit"/>
</a>
</security:authorize>
<c:if test="${blurp ne null}">
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp" %>
</c:if>
<!-- Geographic region text -->
<cms:blurb blurb="${blurp}" />
<c:if test="${subRegions ne null and subRegions.size() gt 0}">
<h3><spring:message code="region.regions-in-region" arguments="${region.getName(pageContext.response.locale)}" /></h3>
......
src/main/webapp/WEB-INF/jsp/registration.jsp
View file @ 1d63e2f5
......@@ -16,7 +16,7 @@
</a>
</security:authorize>
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<cms:blurb blurb="${blurp}" />
<gui:alert type="danger" display="${not empty error}">
<spring:message code="${error}" />
......
src/main/webapp/WEB-INF/jsp/request/confirmrequest.jsp
View file @ 1d63e2f5
......@@ -11,8 +11,9 @@
<spring:message code="request.confirm-request" />
</h1>
<!-- Request confirmation text -->
<cms:blurb blurb="${blurp}" />
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp" %>
<gui:alert type="warning" display="${error ne null}">
<spring:message code="validate.no-such-key" />
</gui:alert>
......
src/main/webapp/WEB-INF/jsp/request/index.jsp
View file @ 1d63e2f5
......@@ -33,7 +33,7 @@
<spring:message code="request.total-vs-available" arguments="${totalCount},${availableCount}" />
</gui:alert>
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<cms:blurb blurb="${blurp}" />
<table class="accessions">
<thead>
......
src/main/webapp/WEB-INF/jsp/request/personal.jsp
View file @ 1d63e2f5
......@@ -11,7 +11,7 @@
<spring:message code="request.page.title" />
</h1>
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<cms:blurb blurb="${blurp}" />
<gui:alert type="danger" display="${error ne null}">
<c:out value="${error.message}" />
......
src/main/webapp/WEB-INF/jsp/request/received.jsp
View file @ 1d63e2f5
......@@ -11,7 +11,7 @@
<spring:message code="request.page.title" />
</h1>
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<cms:blurb blurb="${blurp}" />
</body>
</html>
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/request/validaterequest.jsp
View file @ 1d63e2f5
......@@ -11,7 +11,7 @@
<spring:message code="request.validate-request"/>
</h1>
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp" %>
<cms:blurb blurb="${blurp}" />
<gui:alert type="warning" display="${error ne null}">
<spring:message code="validate.no-such-key"/>
......
src/main/webapp/WEB-INF/jsp/user/email.jsp
View file @ 1d63e2f5
......@@ -11,7 +11,7 @@
<spring:message code="userprofile.password" />
</h1>
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<cms:blurb blurb="${blurp}" />
<gui:alert type="danger" display="${not empty error}">
<spring:message code="${error}" />
......
src/main/webapp/WEB-INF/jsp/wiews/details.jsp
View file @ 1d63e2f5
......@@ -336,7 +336,7 @@
<div class="row">
<div class="col-md-offset-2 col-md-10">
<span property="schema:Organization#description">
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<cms:blurb blurb="${blurp}" />
</span>
</div>
</div>
......
src/main/webapp/WEB-INF/tags/blurb.tag deleted 100644 → 0
View file @ 133dc250
<%@ tag description="Display blurb" pageEncoding="UTF-8" %>
<%@ tag body-content="tagdependent" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ attribute name="blurb" required="true" type="org.genesys2.server.model.impl.Article" %>
<%@ attribute name="title" required="false" type="java.lang.Boolean" %>
<%
%>
<div class="free-text blurp" dir="${blurb.lang=='fa' || blurb.lang=='ar' ? 'rtl' : 'ltr'}">
<c:out value="${blurb.body}" escapeXml="false" />
</div>
<c:if test="${blurb!=null && blurb.lang != pageContext.response.locale.language}">
<local:not-translated />
</c:if>
src/main/webapp/WEB-INF/tags/cms/blurb.tag 0 → 100644
View file @ 1d63e2f5
<%@ tag description="Display a text blurb" pageEncoding="UTF-8" %>
<%@ tag body-content="empty" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="local" tagdir="/WEB-INF/tags"%>
<%@ attribute name="blurb" required="true" type="org.genesys2.server.model.impl.Article" %>
<c:if test="${blurb ne null}">
<div class="free-text blurp" dir="${blurb.lang=='fa' || blurb.lang=='ar' ? 'rtl' : 'ltr'}">
<c:out value="${blurb.body}" escapeXml="false" />
</div>
<c:if test="${blurb.lang != pageContext.response.locale.language}">
<local:not-translated />
</c:if>
</c:if>
\ No newline at end of file
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