Merge pull request #1668 from deka0106/bootstrap-update

Update to Bootstrap 4.1.1 #685
codelibs · May 30, 2018 · df3651a · df3651a
2 parents 4e68551 + 22fba87
commit df3651a
Show file tree

Hide file tree

Showing 18 changed files with 842 additions and 10,944 deletions.
diff --git a/src/main/webapp/WEB-INF/view/advance.jsp b/src/main/webapp/WEB-INF/view/advance.jsp
diff --git a/src/main/webapp/WEB-INF/view/error/badRequest.jsp b/src/main/webapp/WEB-INF/view/error/badRequest.jsp
@@ -7,7 +7,7 @@
 <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="${fe:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/bootstrap.min.css')}" rel="stylesheet"
 	type="text/css" />
 <link href="${fe:url('/css/style.css')}" rel="stylesheet"
 	type="text/css" />
@@ -16,23 +16,19 @@
 </head>
 <body class="error">
 	<jsp:include page="../header.jsp" />
-	<div class="container">
-		<div class="content">
-			<div class="center row">
-				<div class="col-md-12">
-					<h2>
-						<la:message key="labels.request_error_title" />
-					</h2>
-					<div class="errormessage"><la:message key="labels.bad_request" /></div>
-				</div>
-			</div>
+	<main class="container">
+		<div class="text-center">
+			<h2>
+				<la:message key="labels.request_error_title" />
+			</h2>
+			<div class="errormessage"><la:message key="labels.bad_request" /></div>
 		</div>
-		<jsp:include page="../footer.jsp" />
-	</div>
+	</main>
+	<jsp:include page="../footer.jsp" />
 	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
 		src="${fe:url('/js/jquery-3.2.1.min.js')}"></script>
-	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.min.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>

diff --git a/src/main/webapp/WEB-INF/view/error/error.jsp b/src/main/webapp/WEB-INF/view/error/error.jsp
@@ -6,7 +6,7 @@
 <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="${fe:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/bootstrap.min.css')}" rel="stylesheet"
 	type="text/css" />
 <link href="${fe:url('/css/style.css')}" rel="stylesheet"
 	type="text/css" />
@@ -15,28 +15,24 @@
 </head>
 <body class="error">
 	<jsp:include page="../header.jsp" />
-	<div class="container">
-		<div class="content">
-			<div class="center row">
-				<div class="col-md-12">
-					<h2>
-						<la:message key="labels.error_title" />
-					</h2>
-					<div>
-						<la:info id="msg" message="true">
-							<div class="alert alert-info">${msg}</div>
-						</la:info>
-						<la:errors styleClass="list-unstyled"/>
-					</div>
-				</div>
+	<main class="container">
+		<div class="text-center">
+			<h2>
+				<la:message key="labels.error_title" />
+			</h2>
+			<div>
+				<la:info id="msg" message="true">
+					<div class="alert alert-info">${msg}</div>
+				</la:info>
+				<la:errors styleClass="list-unstyled"/>
 			</div>
 		</div>
-		<jsp:include page="../footer.jsp" />
-	</div>
+	</main>
+	<jsp:include page="../footer.jsp" />
 	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
 		src="${fe:url('/js/jquery-3.2.1.min.js')}"></script>
-	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.min.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>

diff --git a/src/main/webapp/WEB-INF/view/error/notFound.jsp b/src/main/webapp/WEB-INF/view/error/notFound.jsp
@@ -6,7 +6,7 @@
 <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="${fe:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/bootstrap.min.css')}" rel="stylesheet"
 	type="text/css" />
 <link href="${fe:url('/css/style.css')}" rel="stylesheet"
 	type="text/css" />
@@ -15,26 +15,22 @@
 </head>
 <body class="error">
 	<jsp:include page="../header.jsp" />
-	<div class="container">
-		<div class="content">
-			<div class="center row">
-				<div class="col-md-12">
-					<h2>
-						<la:message key="labels.page_not_found_title" />
-					</h2>
-					<div class="message">
-						<la:message key="labels.check_url" />
-						<br /> ${f:h(url)}
-					</div>
-				</div>
+	<main class="container">
+		<div class="text-center">
+			<h2>
+				<la:message key="labels.page_not_found_title" />
+			</h2>
+			<div>
+				<la:message key="labels.check_url" />
+				<br /> ${f:h(url)}
 			</div>
 		</div>
-		<jsp:include page="../footer.jsp" />
-	</div>
+	</main>
+	<jsp:include page="../footer.jsp" />
 	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
 		src="${fe:url('/js/jquery-3.2.1.min.js')}"></script>
-	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.min.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>

diff --git a/src/main/webapp/WEB-INF/view/error/system.jsp b/src/main/webapp/WEB-INF/view/error/system.jsp
@@ -7,7 +7,7 @@
 <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="${fe:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/bootstrap.min.css')}" rel="stylesheet"
 	type="text/css" />
 <link href="${fe:url('/css/style.css')}" rel="stylesheet"
 	type="text/css" />
@@ -16,23 +16,19 @@
 </head>
 <body class="error">
 	<jsp:include page="../header.jsp" />
-	<div class="container">
-		<div class="content">
-			<div class="center row">
-				<div class="col-md-12">
-					<h2>
-						<la:message key="labels.system_error_title" />
-					</h2>
-					<div class="errormessage"><la:message key="labels.contact_site_admin" /></div>
-				</div>
-			</div>
+	<main class="container">
+		<div class="text-center">
+			<h2>
+				<la:message key="labels.system_error_title" />
+			</h2>
+			<div class="errormessage"><la:message key="labels.contact_site_admin" /></div>
 		</div>
-		<jsp:include page="../footer.jsp" />
-	</div>
+	</main>
+	<jsp:include page="../footer.jsp" />
 	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
 		src="${fe:url('/js/jquery-3.2.1.min.js')}"></script>
-	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.min.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>

diff --git a/src/main/webapp/WEB-INF/view/footer.jsp b/src/main/webapp/WEB-INF/view/footer.jsp
@@ -1,7 +1,7 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
-<footer class="bd-footer text-muted" role="contentinfo">
-	<div id="footer" class="container center">
-		<p>
+<footer role="contentinfo">
+	<div class="container text-center">
+		<p class="textmuted">
 			<la:message key="labels.footer.copyright" />
 		</p>
 	</div>

diff --git a/src/main/webapp/WEB-INF/view/header.jsp b/src/main/webapp/WEB-INF/view/header.jsp
@@ -2,80 +2,85 @@
 <la:form action="/search" method="get" styleId="searchForm"
 	role="search">
 	${fe:facetForm()}${fe:geoForm()}
-	<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
-		<la:link styleClass="navbar-brand" href="/">
-			<img src="${fe:url('/images/logo-head.png')}"
-				alt="<la:message key="labels.header_brand_name" />" />
-		</la:link>
-		<div
-			class="search-box navbar-form col-lg-5 col-md-6 col-sm-6 col-xs-8"
-			role="search">
-			<div class="input-group">
-				<la:text property="q" maxlength="1000" styleId="query"
-					styleClass="form-control" autocomplete="off" />
-				<span class="input-group-btn">
-					<button type="submit" name="search" id="searchButton"
-						class="btn btn-primary">
-						<i class="fa fa-search"></i>
-					</button>
-					<button type="button" class="btn btn-secondary"
-						data-toggle="control-options" data-target="#searchOptions"
-						id="searchOptionsButton">
-						<i class="fa fa-cog"></i> <span class="sr-only"><la:message
-								key="labels.header_form_option_btn" /></span>
-					</button>
-				</span>
-			</div>
-		</div>
-		<ul class="nav navbar-nav hidden-xs-down pull-right">
-			<c:choose>
-				<c:when test="${!empty username && username != 'guest'}">
-					<li class="nav-item">
-						<div class="dropdown">
-							<a class="nav-link dropdown-toggle" data-toggle="dropdown"
-								href="#" role="button" aria-haspopup="true"
-								aria-expanded="false"> <i class="fa fa-user"></i>
-								<span>${username}</span>
-							</a>
-							<div class="dropdown-menu" aria-labelledby="userMenu">
-								<c:if test="${editableUser == true}">
-									<la:link href="/profile" styleClass="dropdown-item">
-										<la:message key="labels.profile" />
-									</la:link>
-								</c:if>
-								<c:if test="${adminUser == true}">
-									<la:link href="/admin" styleClass="dropdown-item">
-										<la:message key="labels.administration" />
-									</la:link>
-								</c:if>
-								<la:link href="/logout/" styleClass="dropdown-item">
-									<la:message key="labels.logout" />
-								</la:link>
-							</div>
-						</div>
-					</li>
-				</c:when>
-				<c:when test="${ pageLoginLink }">
-					<li class="nav-item"><la:link href="/login"
-							styleClass="nav-link  " role="button" aria-haspopup="true"
+	<header>
+		<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
+			<div id="content" class="container">
+				<la:link styleClass="navbar-brand d-inline-flex" href="/">
+					<img src="${fe:url('/images/logo-head.png')}"
+						alt="<la:message key="labels.header_brand_name" />"
+						class="align-items-center" />
+				</la:link>
+				<div
+					class="navbar-form col-md-6 col-sm-8 col-6 mr-auto p-0"
+					role="search">
+					<div class="input-group">
+						<la:text property="q" maxlength="1000" styleId="query"
+							styleClass="form-control" autocomplete="off" />
+						<span class="input-group-append">
+							<button type="submit" name="search" id="searchButton"
+								class="btn btn-primary">
+								<i class="fa fa-search"></i>
+							</button>
+							<button type="button" class="btn"
+								data-toggle="control-options" data-target="#searchOptions"
+								id="searchOptionsButton">
+								<i class="fa fa-cog"></i> <span class="sr-only"><la:message
+										key="labels.header_form_option_btn" /></span>
+							</button>
+						</span>
+					</div>
+				</div>
+				<ul class="nav navbar-nav d-none d-md-flex">
+					<c:choose>
+						<c:when test="${!empty username && username != 'guest'}">
+							<li class="nav-item">
+								<div class="dropdown">
+									<a class="nav-link dropdown-toggle" data-toggle="dropdown"
+										href="#" role="button" aria-haspopup="true"
+										aria-expanded="false"> <i class="fa fa-fw fa-user"></i>
+										<span>${username}</span>
+									</a>
+									<div class="dropdown-menu" aria-labelledby="userMenu">
+										<c:if test="${editableUser == true}">
+											<la:link href="/profile" styleClass="dropdown-item">
+												<la:message key="labels.profile" />
+											</la:link>
+										</c:if>
+										<c:if test="${adminUser == true}">
+											<la:link href="/admin" styleClass="dropdown-item">
+												<la:message key="labels.administration" />
+											</la:link>
+										</c:if>
+										<la:link href="/logout/" styleClass="dropdown-item">
+											<la:message key="labels.logout" />
+										</la:link>
+									</div>
+								</div>
+							</li>
+						</c:when>
+						<c:when test="${ pageLoginLink }">
+							<li class="nav-item"><la:link href="/login"
+									styleClass="nav-link  " role="button" aria-haspopup="true"
+									aria-expanded="false">
+									<i class="fa fa-fw fa-sign-in"></i>
+									<span><la:message key="labels.login" /></span>
+								</la:link></li>
+						</c:when>
+					</c:choose>
+					<li class="nav-item"><la:link href="/help" styleClass="nav-link" role="help" aria-haspopup="true"
 							aria-expanded="false">
-							<i class="fa fa-sign-in"></i>
-							<span><la:message key="labels.login" /></span>
+							<i class="fa fa-fw fa-question-circle"></i>
+							<span><la:message key="labels.index_help" /></span>
 						</la:link></li>
-				</c:when>
-			</c:choose>
-			<li class="nav-item"><la:link href="/help" styleClass="nav-link" role="help" aria-haspopup="true"
-					aria-expanded="false">
-					<i class="fa fa-question-circle"></i>
-					<span><la:message key="labels.index_help" /></span>
-				</la:link></li>
-		</ul>
-	</nav>
+				</ul>
+			</div>
+		</nav>
+	</header>
 	<div id="searchOptions" class="control-options">
 		<div class="container">
 			<jsp:include page="/WEB-INF/view/searchOptions.jsp" />
 			<div>
-				<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
+				<button type="button" class="btn" id="searchOptionsClearButton">
 					<la:message key="labels.search_options_clear" />
 				</button>
 				<button type="submit" class="btn btn-primary">
@@ -86,7 +91,7 @@
 					<i class="fa fa-cog"></i>
 					<la:message key="labels.advance" />
 				</la:link>
-				<button type="button" class="btn btn-secondary pull-right"
+				<button type="button" class="btn pull-right"
 					data-toggle="control-options" data-target="#searchOptions"
 					id="searchOptionsCloseButton">
 					<i class="fa fa-times-circle"></i>

diff --git a/src/main/webapp/WEB-INF/view/help.jsp b/src/main/webapp/WEB-INF/view/help.jsp
@@ -6,31 +6,31 @@
 <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="${fe:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/bootstrap.min.css')}" rel="stylesheet"
 	type="text/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">
+<body>
 	<jsp:include page="header.jsp" />
-	<div class="container">
+	<main class="container">
 		<div class="row">
-			<div class="col-md-12">
+			<div class="col">
 
 				<jsp:include page="${helpPage}" />
 
 			</div>
 		</div>
-		<p class="pull-right move-to-top">
+		<div class="text-right">
 			<a href="#"><la:message key="labels.footer_back_to_top" /></a>
-		</p>
-		<jsp:include page="footer.jsp" />
-	</div>
+		</div>
+	</main>
+	<jsp:include page="footer.jsp" />
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
 		src="${fe:url('/js/jquery-3.2.1.min.js')}"></script>
-	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.min.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>