0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #915 append t parameter

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-03-04 23:40:49 +09:00
parent c28e9be164
commit a9e432d958
32 changed files with 242 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/main/java/org/codelibs/fess/taglib/FessFunctions.java
View file

@ -17,6 +17,9 @@ package org.codelibs.fess.taglib;
import java.io.File;
import java.math.RoundingMode;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@ -28,6 +31,8 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
@ -40,14 +45,38 @@ import org.codelibs.fess.helper.ViewHelper;
import org.codelibs.fess.util.ComponentUtil;
import org.lastaflute.di.util.LdiURLUtil;
import org.lastaflute.web.util.LaRequestUtil;
import org.lastaflute.web.util.LaResponseUtil;
import org.lastaflute.web.util.LaServletContextUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
public class FessFunctions {
private static final Logger logger = LoggerFactory.getLogger(FessFunctions.class);
private static final String GEO_PREFIX = "geo.";
private static final String FACET_PREFIX = "facet.";
private static LoadingCache<String, Long> resourceHashCache = CacheBuilder.newBuilder().maximumSize(1000)
.expireAfterWrite(10, TimeUnit.MINUTES).build(new CacheLoader<String, Long>() {
@Override
public Long load(String key) throws Exception {
try {
final Path path = Paths.get(LaServletContextUtil.getServletContext().getRealPath(key));
if (Files.exists(path)) {
return Files.getLastModifiedTime(path).toMillis();
}
} catch (Exception e) {
logger.debug("Failed to access " + key, e);
}
return 0L;
}
});
protected FessFunctions() {
// nothing
}
@ -231,4 +260,29 @@ public class FessFunctions {
return file.exists();
}
public static String url(String input) {
if (input == null) {
String msg = "The argument 'input' should not be null.";
throw new IllegalArgumentException(msg);
}
if (!input.startsWith("/")) {
String msg = "The argument 'input' should start with slash '/': " + input;
throw new IllegalArgumentException(msg);
}
final String contextPath = LaRequestUtil.getRequest().getContextPath();
final StringBuilder sb = new StringBuilder();
if (contextPath.length() > 1) {
sb.append(contextPath);
}
sb.append(input);
if (input.indexOf('?') == -1) {
try {
final String t = resourceHashCache.get(input).toString();
sb.append("?t=").append(t);
} catch (ExecutionException e) {
logger.debug("Failed to access " + input, e);
}
}
return LaResponseUtil.getResponse().encodeURL(sb.toString());
}
}

7
src/main/webapp/WEB-INF/fe.tld
View file

@ -203,4 +203,11 @@
</example>
</function>
<function>
<description>Calculates URL.</description>
<name>url</name>
<function-class>org.codelibs.fess.taglib.FessFunctions</function-class>
<function-signature>java.lang.String url(java.lang.String)</function-signature>
<example>&lt;a href="${f:url(param:info)}" ...</example>
</function>
</taglib>

14
src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp
View file

@ -7,11 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.system_error_title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}"
<link href="${fe:url('/css/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
</head>
<body class="error">
@ -31,10 +31,10 @@
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
</body>
</html>
<% }catch(Exception e){ session.invalidate();}%>

14
src/main/webapp/WEB-INF/orig/view/error/error.jsp
View file

@ -6,11 +6,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.system_error_title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}"
<link href="${fe:url('/css/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
</head>
<body class="error">
@ -35,9 +35,9 @@
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
</body>
</html>

2
src/main/webapp/WEB-INF/orig/view/error/header.jsp
View file

@ -4,7 +4,7 @@
${fe:facetForm()}${fe:geoForm()}
<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
<la:link styleClass="navbar-brand" href="/">
<img src="${f:url('/images/logo-head.png')}"
<img src="${fe:url('/images/logo-head.png')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
<div

14
src/main/webapp/WEB-INF/orig/view/error/notFound.jsp
View file

@ -6,11 +6,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.system_error_title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}"
<link href="${fe:url('/css/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
</head>
<body class="error">
@ -33,9 +33,9 @@
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
</body>
</html>

14
src/main/webapp/WEB-INF/orig/view/error/system.jsp
View file

@ -7,11 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.system_error_title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}"
<link href="${fe:url('/css/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
</head>
<body class="error">
@ -31,10 +31,10 @@
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
</body>
</html>
<% }catch(Exception e){ session.invalidate();}%>

2
src/main/webapp/WEB-INF/orig/view/header.jsp
View file

@ -4,7 +4,7 @@
${fe:facetForm()}${fe:geoForm()}
<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
<la:link styleClass="navbar-brand" href="/">
<img src="${f:url('/images/logo-head.png')}"
<img src="${fe:url('/images/logo-head.png')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
<div

14
src/main/webapp/WEB-INF/orig/view/help.jsp
View file

@ -6,10 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.search_title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}"
<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
</head>
<body class="help">
@ -29,9 +29,9 @@
</div>
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/help.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/help.js')}"></script>
</body>
</html>

18
src/main/webapp/WEB-INF/orig/view/index.jsp
View file

@ -8,13 +8,13 @@
<title><la:message key="labels.search_title" /></title>
<c:if test="${osddLink}">
<link rel="search" type="application/opensearchdescription+xml"
href="${f:url('/osdd')}"
href="${fe:url('/osdd')}"
title="<la:message key="labels.index_osdd_title" />" />
</c:if>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/font-awesome.min.css')}" rel="stylesheet"
type="text/css" />
</head>
<body>
@ -71,7 +71,7 @@
<div class="row content">
<div class="center-block searchFormBox">
<h1 class="mainLogo">
<img src="${f:url('/images/logo.png')}"
<img src="${fe:url('/images/logo.png')}"
alt="<la:message key="labels.index_title" />" />
</h1>
<div class="notification">${notification}</div>
@ -145,9 +145,9 @@
</la:form>
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/index.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/index.js')}"></script>
</body>
</html>

24
src/main/webapp/WEB-INF/orig/view/login/index.jsp
View file

@ -6,27 +6,27 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.login.title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/style.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/admin/style.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/admin/font-awesome.min.css')}"
<link href="${fe:url('/css/admin/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
<link href="${fe:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/admin/skins/skin-blue.min.css')}"
<link href="${fe:url('/css/admin/skins/skin-blue.min.css')}"
rel="stylesheet" type="text/css" />
<!--[if lt IE 9]>
<script src="${f:url('/css/admin/html5shiv.min.js')}"></script>
<script src="${f:url('/css/admin/respond.min.js')}"></script>
<script src="${fe:url('/css/admin/html5shiv.min.js')}"></script>
<script src="${fe:url('/css/admin/respond.min.js')}"></script>
<![endif]-->
</head>
<body class="hold-transition login-page">
<div class="login-box">
<div class="login-logo">
<la:link href="/">
<img src="${f:url('/images/logo-top.png')}"
<img src="${fe:url('/images/logo-top.png')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
</div>
@ -95,8 +95,8 @@
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/admin/admin.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/admin/admin.js')}"></script>
</body>
</html>

24
src/main/webapp/WEB-INF/orig/view/profile/index.jsp
View file

@ -6,27 +6,27 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.profile.title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/style.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/admin/style.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/admin/font-awesome.min.css')}"
<link href="${fe:url('/css/admin/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
<link href="${fe:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/admin/skins/skin-blue.min.css')}"
<link href="${fe:url('/css/admin/skins/skin-blue.min.css')}"
rel="stylesheet" type="text/css" />
<!--[if lt IE 9]>
<script src="${f:url('/css/admin/html5shiv.min.js')}"></script>
<script src="${f:url('/css/admin/respond.min.js')}"></script>
<script src="${fe:url('/css/admin/html5shiv.min.js')}"></script>
<script src="${fe:url('/css/admin/respond.min.js')}"></script>
<![endif]-->
</head>
<body class="hold-transition login-page">
<div class="login-box">
<div class="login-logo">
<la:link href="/">
<img src="${f:url('/images/logo-top.png')}"
<img src="${fe:url('/images/logo-top.png')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
</div>
@ -109,8 +109,8 @@
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/admin/admin.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/admin/admin.js')}"></script>
</body>
</html>

16
src/main/webapp/WEB-INF/orig/view/search.jsp
View file

@ -9,13 +9,13 @@
key="labels.search_title" /></title>
<c:if test="${osddLink}">
<link rel="search" type="application/opensearchdescription+xml"
href="${f:url('/osdd')}"
href="${fe:url('/osdd')}"
title="<la:message key="labels.index_osdd_title" />" />
</c:if>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/font-awesome.min.css')}" rel="stylesheet"
type="text/css" />
</head>
<body class="search">
@ -127,9 +127,9 @@
</div>
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
</body>
</html>

4
src/main/webapp/WEB-INF/orig/view/searchResults.jsp
View file

@ -33,8 +33,8 @@
<a class="link" href="${doc.url_link}"
data-uri="${doc.url_link}" data-id="${doc.doc_id}"
data-order="${s.index}"> <img
src="${f:url('/images/blank.png')}"
data-src="${f:url('/thumbnail/')}?docId=${f:u(doc.doc_id)}&queryId=${f:u(queryId)}"
src="${fe:url('/images/blank.png')}"
data-src="${fe:url('/thumbnail/')}?docId=${f:u(doc.doc_id)}&queryId=${f:u(queryId)}"
class="thumbnail">
</a>
</div>

2
src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp
View file

@ -76,7 +76,7 @@
<th><la:message
key="labels.crawling_info_session_id" /></th>
<td><a
href="${f:url('/admin/searchlist/search')}?q=segment:${f:u(sessionId)}">${f:h(sessionId)}</a>
href="${fe:url('/admin/searchlist/search')}?q=segment:${f:u(sessionId)}">${f:h(sessionId)}</a>
<la:hidden property="sessionId" /></td>
</tr>
<c:forEach var="info" items="${crawlingInfoParamItems}">

2
src/main/webapp/WEB-INF/view/admin/dashboard/admin_dashboard.jsp
View file

@ -20,6 +20,6 @@
<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
</div>
<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
<script src="${f:url('/js/admin/dashboard.js')}" type="text/javascript"></script>
<script src="${fe:url('/js/admin/dashboard.js')}" type="text/javascript"></script>
</body>
</html>

4
src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
View file

@ -378,7 +378,7 @@
<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
</div>
<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
<script src="${f:url('/js/admin/form-validator/jquery.form-validator.min.js')}" type="text/javascript"></script>
<script src="${f:url('/js/admin/load-validator.js')}" type="text/javascript"></script>
<script src="${fe:url('/js/admin/form-validator/jquery.form-validator.min.js')}" type="text/javascript"></script>
<script src="${fe:url('/js/admin/load-validator.js')}" type="text/javascript"></script>
</body>
</html>

14
src/main/webapp/WEB-INF/view/common/admin/foot.jsp
View file

@ -1,8 +1,8 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<script src="${f:url('/js/admin/jquery-2.2.4.min.js')}" type="text/javascript"></script>
<script src="${f:url('/js/admin/bootstrap.min.js')}" type="text/javascript"></script>
<script src="${f:url('/js/admin/moment-with-locales.min.js')}" type="text/javascript"></script>
<script src="${f:url('/js/admin/plugins/daterangepicker/daterangepicker.js')}" type="text/javascript"></script>
<script src="${f:url('/js/admin/plugins/timepicker/bootstrap-timepicker.min.js')}" type="text/javascript"></script>
<script src="${f:url('/js/admin/app.min.js')}" type="text/javascript"></script>
<script src="${f:url('/js/admin/admin.js')}" type="text/javascript"></script>
<script src="${fe:url('/js/admin/jquery-2.2.4.min.js')}" type="text/javascript"></script>
<script src="${fe:url('/js/admin/bootstrap.min.js')}" type="text/javascript"></script>
<script src="${fe:url('/js/admin/moment-with-locales.min.js')}" type="text/javascript"></script>
<script src="${fe:url('/js/admin/plugins/daterangepicker/daterangepicker.js')}" type="text/javascript"></script>
<script src="${fe:url('/js/admin/plugins/timepicker/bootstrap-timepicker.min.js')}" type="text/javascript"></script>
<script src="${fe:url('/js/admin/app.min.js')}" type="text/javascript"></script>
<script src="${fe:url('/js/admin/admin.js')}" type="text/javascript"></script>

18
src/main/webapp/WEB-INF/view/common/admin/head.jsp
View file

@ -1,15 +1,15 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link href="${f:url('/css/admin/bootstrap.min.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/font-awesome.min.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/skins/skin-blue.min.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/plugins/daterangepicker/daterangepicker.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/plugins/timepicker/bootstrap-timepicker.min.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/style.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/admin/bootstrap.min.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/admin/font-awesome.min.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/admin/skins/skin-blue.min.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/admin/plugins/daterangepicker/daterangepicker.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/admin/plugins/timepicker/bootstrap-timepicker.min.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/admin/style.css')}" rel="stylesheet" type="text/css" />
<!--[if lt IE 9]>
<script src="${f:url('/css/admin/html5shiv.min.js')}"></script>
<script src="${f:url('/css/admin/respond.min.js')}"></script>
<script src="${fe:url('/css/admin/html5shiv.min.js')}"></script>
<script src="${fe:url('/css/admin/respond.min.js')}"></script>
<![endif]-->

2
src/main/webapp/WEB-INF/view/common/admin/header.jsp
View file

@ -7,7 +7,7 @@
src="${f:url('/images/logo-head.png')}"
alt="<la:message key="labels.header_brand_name" />" /></span>
<span class="logo-lg"><img
src="${f:url('/images/logo-head.png')}"
src="${fe:url('/images/logo-head.png')}"
alt="<la:message key="labels.header_brand_name" />" /></span>
</la:link>
<!-- Header Navbar -->

14
src/main/webapp/WEB-INF/view/error/badRequest.jsp
View file

@ -7,11 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.system_error_title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}"
<link href="${fe:url('/css/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
</head>
<body class="error">
@ -31,10 +31,10 @@
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
</body>
</html>
<% }catch(Exception e){ session.invalidate();}%>

14
src/main/webapp/WEB-INF/view/error/error.jsp
View file

@ -6,11 +6,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.system_error_title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}"
<link href="${fe:url('/css/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
</head>
<body class="error">
@ -35,9 +35,9 @@
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
</body>
</html>

2
src/main/webapp/WEB-INF/view/error/header.jsp
View file

@ -4,7 +4,7 @@
${fe:facetForm()}${fe:geoForm()}
<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
<la:link styleClass="navbar-brand" href="/">
<img src="${f:url('/images/logo-head.png')}"
<img src="${fe:url('/images/logo-head.png')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
<div

14
src/main/webapp/WEB-INF/view/error/notFound.jsp
View file

@ -6,11 +6,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.system_error_title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}"
<link href="${fe:url('/css/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
</head>
<body class="error">
@ -33,9 +33,9 @@
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
</body>
</html>

14
src/main/webapp/WEB-INF/view/error/system.jsp
View file

@ -7,11 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.system_error_title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}"
<link href="${fe:url('/css/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
</head>
<body class="error">
@ -31,10 +31,10 @@
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
</body>
</html>
<% }catch(Exception e){ session.invalidate();}%>

2
src/main/webapp/WEB-INF/view/header.jsp
View file

@ -4,7 +4,7 @@
${fe:facetForm()}${fe:geoForm()}
<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
<la:link styleClass="navbar-brand" href="/">
<img src="${f:url('/images/logo-head.png')}"
<img src="${fe:url('/images/logo-head.png')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
<div

14
src/main/webapp/WEB-INF/view/help.jsp
View file

@ -6,10 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.search_title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}"
<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
</head>
<body class="help">
@ -29,9 +29,9 @@
</div>
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/help.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/help.js')}"></script>
</body>
</html>

18
src/main/webapp/WEB-INF/view/index.jsp
View file

@ -8,13 +8,13 @@
<title><la:message key="labels.search_title" /></title>
<c:if test="${osddLink}">
<link rel="search" type="application/opensearchdescription+xml"
href="${f:url('/osdd')}"
href="${fe:url('/osdd')}"
title="<la:message key="labels.index_osdd_title" />" />
</c:if>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/font-awesome.min.css')}" rel="stylesheet"
type="text/css" />
</head>
<body>
@ -71,7 +71,7 @@
<div class="row content">
<div class="center-block searchFormBox">
<h1 class="mainLogo">
<img src="${f:url('/images/logo.png')}"
<img src="${fe:url('/images/logo.png')}"
alt="<la:message key="labels.index_title" />" />
</h1>
<div class="notification">${notification}</div>
@ -145,9 +145,9 @@
</la:form>
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/index.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/index.js')}"></script>
</body>
</html>

24
src/main/webapp/WEB-INF/view/login/index.jsp
View file

@ -6,27 +6,27 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.login.title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/style.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/admin/style.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/admin/font-awesome.min.css')}"
<link href="${fe:url('/css/admin/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
<link href="${fe:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/admin/skins/skin-blue.min.css')}"
<link href="${fe:url('/css/admin/skins/skin-blue.min.css')}"
rel="stylesheet" type="text/css" />
<!--[if lt IE 9]>
<script src="${f:url('/css/admin/html5shiv.min.js')}"></script>
<script src="${f:url('/css/admin/respond.min.js')}"></script>
<script src="${fe:url('/css/admin/html5shiv.min.js')}"></script>
<script src="${fe:url('/css/admin/respond.min.js')}"></script>
<![endif]-->
</head>
<body class="hold-transition login-page">
<div class="login-box">
<div class="login-logo">
<la:link href="/">
<img src="${f:url('/images/logo-top.png')}"
<img src="${fe:url('/images/logo-top.png')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
</div>
@ -95,8 +95,8 @@
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/admin/admin.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/admin/admin.js')}"></script>
</body>
</html>

24
src/main/webapp/WEB-INF/view/profile/index.jsp
View file

@ -6,27 +6,27 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><la:message key="labels.profile.title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/style.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/admin/style.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/admin/font-awesome.min.css')}"
<link href="${fe:url('/css/admin/font-awesome.min.css')}"
rel="stylesheet" type="text/css" />
<link href="${f:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
<link href="${fe:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/admin/skins/skin-blue.min.css')}"
<link href="${fe:url('/css/admin/skins/skin-blue.min.css')}"
rel="stylesheet" type="text/css" />
<!--[if lt IE 9]>
<script src="${f:url('/css/admin/html5shiv.min.js')}"></script>
<script src="${f:url('/css/admin/respond.min.js')}"></script>
<script src="${fe:url('/css/admin/html5shiv.min.js')}"></script>
<script src="${fe:url('/css/admin/respond.min.js')}"></script>
<![endif]-->
</head>
<body class="hold-transition login-page">
<div class="login-box">
<div class="login-logo">
<la:link href="/">
<img src="${f:url('/images/logo-top.png')}"
<img src="${fe:url('/images/logo-top.png')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
</div>
@ -109,8 +109,8 @@
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/admin/admin.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/admin/admin.js')}"></script>
</body>
</html>

16
src/main/webapp/WEB-INF/view/search.jsp
View file

@ -9,13 +9,13 @@
key="labels.search_title" /></title>
<c:if test="${osddLink}">
<link rel="search" type="application/opensearchdescription+xml"
href="${f:url('/osdd')}"
href="${fe:url('/osdd')}"
title="<la:message key="labels.index_osdd_title" />" />
</c:if>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${f:url('/css/font-awesome.min.css')}" rel="stylesheet"
<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
<link href="${fe:url('/css/font-awesome.min.css')}" rel="stylesheet"
type="text/css" />
</head>
<body class="search">
@ -127,9 +127,9 @@
</div>
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
</body>
</html>

4
src/main/webapp/WEB-INF/view/searchResults.jsp
View file

@ -33,8 +33,8 @@
<a class="link" href="${doc.url_link}"
data-uri="${doc.url_link}" data-id="${doc.doc_id}"
data-order="${s.index}"> <img
src="${f:url('/images/blank.png')}"
data-src="${f:url('/thumbnail/')}?docId=${f:u(doc.doc_id)}&queryId=${f:u(queryId)}"
src="${fe:url('/images/blank.png')}"
data-src="${fe:url('/thumbnail/')}?docId=${f:u(doc.doc_id)}&queryId=${f:u(queryId)}"
class="thumbnail">
</a>
</div>