Commit ec1ffbe2 authored by Maxym Borodenko's avatar Maxym Borodenko Committed by Matija Obreza
Browse files

href and src missing <c:url (fixes #211)

parent fb80e00c
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<meta name="_csrf_header" content="${_csrf.headerName}" /> <meta name="_csrf_header" content="${_csrf.headerName}" />
<!-- Links --> <!-- Links -->
<link rel="shortcut icon" href="<c:url value="/html/1/images/genesys.png" />" /> <link rel="shortcut icon" href="<c:url value="${cdnServers.next}/html/1/images/genesys.png" />" />
<!-- opensearch.org --> <!-- opensearch.org -->
<link rel="search" hreflang="${pageContext.response.locale.language}" type="application/opensearchdescription+xml" href="<c:url value="/acn/opensearch/desc" />" <link rel="search" hreflang="${pageContext.response.locale.language}" type="application/opensearchdescription+xml" href="<c:url value="/acn/opensearch/desc" />"
......
...@@ -701,7 +701,7 @@ ...@@ -701,7 +701,7 @@
if ($(this).find("input:checkbox").is(":checked")) { if ($(this).find("input:checkbox").is(":checked")) {
if (layers[title] == null) { if (layers[title] == null) {
layers[title] = L.tileLayer("{s}/explore/tile/{z}/{x}/{y}?filter=" + filter + "&color=" + tilesColor, { layers[title] = L.tileLayer("{s}/explore/tile/{z}/{x}/{y}?filter=" + filter + "&color=" + tilesColor, {
attribution: "<a href='${baseUrl}'>Genesys</a>", attribution: "<a href='<c:url value="${baseUrl}" />'>Genesys</a>",
styleId: 22677, styleId: 22677,
subdomains: ${cdnServers.serverList} subdomains: ${cdnServers.serverList}
}).addTo(map); }).addTo(map);
...@@ -912,7 +912,7 @@ ...@@ -912,7 +912,7 @@
function loadTiles() { function loadTiles() {
layer = L.tileLayer("{s}/explore/tile/{z}/{x}/{y}?filter=" + JSON.stringify(jsonData), { layer = L.tileLayer("{s}/explore/tile/{z}/{x}/{y}?filter=" + JSON.stringify(jsonData), {
attribution: "Accession localities from <a href='${baseUrl}'>Genesys PGR</a>", attribution: "Accession localities from <a href='<c:url value="${baseUrl}" />'>Genesys PGR</a>",
styleId: 22677, styleId: 22677,
subdomains: ${cdnServers.serverList} subdomains: ${cdnServers.serverList}
}); });
...@@ -926,7 +926,7 @@ ...@@ -926,7 +926,7 @@
if (layer !== null) { if (layer !== null) {
map.removeLayer(layer); map.removeLayer(layer);
layer = L.tileLayer("{s}/explore/tile/{z}/{x}/{y}?filter=" + JSON.stringify(jsonData), { layer = L.tileLayer("{s}/explore/tile/{z}/{x}/{y}?filter=" + JSON.stringify(jsonData), {
attribution: "Accession localities from <a href='${baseUrl}'>Genesys PGR</a>", attribution: "Accession localities from <a href='<c:url value="${baseUrl}" />'>Genesys PGR</a>",
styleId: 22677, styleId: 22677,
subdomains: ${cdnServers.serverList} subdomains: ${cdnServers.serverList}
}); });
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<body class="about-page text-page news-item-page"> <body class="about-page text-page news-item-page">
<content tag="header"> <content tag="header">
<div class="hidden-xs top-image"> <div class="hidden-xs top-image">
<img src="<c:url value="/html/1/images/banner-${jspHelper.randomInt(1, 4)}.jpg" />" title="${title}" /> <img src="<c:url value="${cdnServers.next}/html/1/images/banner-${jspHelper.randomInt(1, 4)}.jpg" />" title="${title}" />
</div> </div>
<div class="top-title"> <div class="top-title">
<div class="container" style="position: absolute; right: 0; padding: 10px 0;"> <div class="container" style="position: absolute; right: 0; padding: 10px 0;">
......
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
<div id="crop-list-titles" class="container"> <div id="crop-list-titles" class="container">
<c:forEach var="entry" items="${cropsMap}"> <c:forEach var="entry" items="${cropsMap}">
<div class="col-xs-6 col-sm-3 col-lg-2 crop-wrap"> <div class="col-xs-6 col-sm-3 col-lg-2 crop-wrap">
<a class="fff" href="<c:url value="/c/${entry.key.shortName}" />"></a> <a href="<c:url value="/c/${entry.key.shortName}" />"></a>
<div class="img-wrap"> <div class="img-wrap">
<img class="img-responsive icon" src="/html/1/images/<c:out value="${entry.key.shortName}"/>.png" alt="<c:out value="${entry.key.shortName}"/>"/> <img class="img-responsive icon" src="<c:url value='${cdnServers.next}/html/1/images/${entry.key.shortName}.png' />" alt="<c:out value="${entry.key.shortName}"/>"/>
</div> </div>
<p class="bold"><c:out value="${entry.key.getName(pageContext.response.locale)}" /></p> <p class="bold"><c:out value="${entry.key.getName(pageContext.response.locale)}" /></p>
<hr class="crop-inner-hr"> <hr class="crop-inner-hr">
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
.header .logo {display:block; padding:0 0 5px 0;} .header .logo {display:block; padding:0 0 5px 0;}
.menu {background:#2b2924; border-bottom:10px solid #fff;} .menu {background:#2b2924; border-bottom:10px solid #fff;}
.menu a {background:#2b2924; color:#fff; display:block; font-weight:bold; padding:10px 50px; text-decoration:none; text-transform:uppercase;} .menu a {background:#2b2924; color:#fff; display:block; font-weight:bold; padding:10px 50px; text-decoration:none; text-transform:uppercase;}
.content {background:url('<c:url value="/html/1/images/bg_error.jpg" />') no-repeat; min-height:500px; margin-top:20px; position:relative; width:990px;} .content {background:url('<c:url value="${cdnServers.next}/html/1/images/bg_error.jpg" />') no-repeat; min-height:500px; margin-top:20px; position:relative; width:990px;}
.content .error-title { .content .error-title {
color:#88ba42; color:#88ba42;
font-size:50px; font-size:50px;
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<div class="body"> <div class="body">
<div class="row"> <div class="row">
<div class="col-lg-4 hidden-md"> <div class="col-lg-4 hidden-md">
<div class="see-also-img" style="background-image: url('/html/1/images/three-1.jpg');"></div> <div class="see-also-img" style="background-image: url('<c:url value="${cdnServers.next}/html/1/images/three-1.jpg" />');"></div>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-8 no-space"> <div class="col-xs-12 col-sm-12 col-md-12 col-lg-8 no-space">
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<div class="body"> <div class="body">
<div class="row"> <div class="row">
<div class="col-lg-4 hidden-md"> <div class="col-lg-4 hidden-md">
<div class="see-also-img" style="background: url('<c:url value="/html/1/images/three-3.jpg" />') 82% no-repeat;"></div> <div class="see-also-img" style="background: url('<c:url value="${cdnServers.next}/html/1/images/three-3.jpg" />') 82% no-repeat;"></div>
</div> </div>
<div class="col-md-12 col-lg-8 no-space"> <div class="col-md-12 col-lg-8 no-space">
<a href="<c:url value='/content/help/how-to-use-genesys' />"> <a href="<c:url value='/content/help/how-to-use-genesys' />">
......
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
<div class="col-lg-offset-2 col-lg-10 col-md-offset-3 col-md-9 col-sm-offset-3 col-sm-9 col-xs-12"> <div class="col-lg-offset-2 col-lg-10 col-md-offset-3 col-md-9 col-sm-offset-3 col-sm-9 col-xs-12">
<input type="submit" value="<spring:message code="login.login-button" />" class="btn btn-primary" /> <input type="submit" value="<spring:message code="login.login-button" />" class="btn btn-primary" />
<a href="<c:url value="/google/login" />" class="btn btn-default google-signin"><spring:message code="login.with-google-plus"/></a> <a href="<c:url value="/google/login" />" class="btn btn-default google-signin"><spring:message code="login.with-google-plus"/></a>
<a href="registration" id="registration" class="btn btn-default"><spring:message code="login.register-now"/></a> <a href="<c:url value="/registration" />" id="registration" class="btn btn-default"><spring:message code="login.register-now"/></a>
<a href="/profile/forgot-password" id="forgot-password" class="btn btn-default"><spring:message code="login.forgot-password"/></a> <a href="<c:url value="/profile/forgot-password" />" id="forgot-password" class="btn btn-default"><spring:message code="login.forgot-password"/></a>
</div> </div>
</div> </div>
<!-- CSRF protection --> <!-- CSRF protection -->
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<span dir="ltr" class="sci-name text-clip"><c:out escapeXml="false" value="${accession.taxonomy.taxonNameHtml}" /></span> <span dir="ltr" class="sci-name text-clip"><c:out escapeXml="false" value="${accession.taxonomy.taxonNameHtml}" /></span>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<a href="https://purl.org/germplasm/id/${accession.uuid}"><c:out value="${accession.uuid}" /></a> <a href="<c:url value="https://purl.org/germplasm/id/${accession.uuid}" />" ><c:out value="${accession.uuid}" /></a>
</div> </div>
</div> </div>
</c:forEach> </c:forEach>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div class="pagination"> <div class="pagination">
<spring:message code="paged.pageOfPages" arguments="${pagedData.number+1},${pagedData.totalPages}" /> <spring:message code="paged.pageOfPages" arguments="${pagedData.number+1},${pagedData.totalPages}" />
<c:url value="" var="baseLink"><c:param name="q" value="${q}" /></c:url> <c:url value="" var="baseLink"><c:param name="q" value="${q}" /></c:url>
<a class="${pagedData.number eq 0 ? 'disabled' :''}" href="${baseLink}&amp;page=${pagedData.number eq 0 ? 1 : pagedData.number}"><spring:message code="pagination.previous-page" /></a> <a href="${baseLink}&amp;page=${pagedData.number + 2}"><spring:message code="pagination.next-page" /></a> <a class="${pagedData.number eq 0 ? 'disabled' :''}" href="<c:url value="${baseLink}&amp;page=${pagedData.number eq 0 ? 1 : pagedData.number}" />" ><spring:message code="pagination.previous-page" /></a> <a href="${baseLink}&amp;page=${pagedData.number + 2}"><spring:message code="pagination.next-page" /></a>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -8,16 +8,16 @@ ...@@ -8,16 +8,16 @@
<%@ attribute name="id" required="true" type="java.lang.String" %> <%@ attribute name="id" required="true" type="java.lang.String" %>
<%@ attribute name="title" required="true" type="java.lang.String" %> <%@ attribute name="title" required="true" type="java.lang.String" %>
<div class="panel panel-default" id="panel_${id}"> <div class="panel panel-default" id="panel_<c:out value="${id}" />">
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
<a data-toggle="collapse" href="#panel_${id}_collapse" class="collapsed"> <a data-toggle="collapse" href="#panel_<c:out value="${id}" />_collapse" class="collapsed">
<spring:message code="${title}" /> <spring:message code="${title}" />
</a> </a>
</h4> </h4>
</div> </div>
<div id="panel_${id}_collapse" class="panel-collapse collapse"> <div id="panel_<c:out value="${id}"/>_collapse" class="panel-collapse collapse">
<div class="panel-body"> <div class="panel-body">
<jsp:doBody /> <jsp:doBody />
</div> </div>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<c:param name="summary" value="${jspHelper.htmlToText(summary, 256)}" /> <c:param name="summary" value="${jspHelper.htmlToText(summary, 256)}" />
</c:if> </c:if>
</c:url> </c:url>
<a class="linkedin-share-button" target="_blank" href="${shareUrl}" data-size="${dataSize}" title="<spring:message code="linkedin.share-this" />"> <a class="linkedin-share-button" target="_blank" href="<c:url value="${shareUrl}" />" data-size="${dataSize}" title="<spring:message code="linkedin.share-this" />">
<i class="fa fa-linkedin"></i> <i class="fa fa-linkedin"></i>
<c:if test="${iconOnly eq null or not iconOnly}"> <c:if test="${iconOnly eq null or not iconOnly}">
<spring:message code="linkedin.share-this" /> <spring:message code="linkedin.share-this" />
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<c:param name="hashtags" value="${hashTags}" /> <c:param name="hashtags" value="${hashTags}" />
</c:if> </c:if>
</c:url> </c:url>
<a class="twitter-share-button" target="_blank" href="${twatUrl}" data-size="${dataSize}" title="<spring:message code="twitter.tweet-this" />"> <a class="twitter-share-button" target="_blank" href="<c:url value="${twatUrl}" />" data-size="${dataSize}" title="<spring:message code="twitter.tweet-this" />">
<i class="fa fa-twitter"></i> <i class="fa fa-twitter"></i>
<c:if test="${iconOnly eq null or not iconOnly}"> <c:if test="${iconOnly eq null or not iconOnly}">
<spring:message code="twitter.tweet-this" /> <spring:message code="twitter.tweet-this" />
......
...@@ -8,6 +8,6 @@ ...@@ -8,6 +8,6 @@
<c:url var="twatUrl" value="https://twitter.com/intent/follow"> <c:url var="twatUrl" value="https://twitter.com/intent/follow">
<c:param name="screen_name" value="${screenName}" /> <c:param name="screen_name" value="${screenName}" />
</c:url> </c:url>
<a class="twitter-follow-button" target="_blank" href="${twatUrl}" data-size="${dataSize}" dir="ltr"> <a class="twitter-follow-button" target="_blank" href="<c:url value="${twatUrl}" />" data-size="${dataSize}" dir="ltr">
<i class="fa fa-twitter"></i> @<c:out value="${screenName}" /> <i class="fa fa-twitter"></i> @<c:out value="${screenName}" />
<%-- <spring:message code="twitter.follow-X" arguments="${screenName}" /> --%></a> <%-- <spring:message code="twitter.follow-X" arguments="${screenName}" /> --%></a>
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