Merge branch 'master' of https://gitlab.univ-artois.fr/ili-2019-2020/microfolielens

WebContent/scan/index.html

@@ -16,7 +16,7 @@
     	<div class="main">
         
         	<div class="content">
-			    <h1>Accueil</h1>
+			    <h1 id="titleScan"></h1>
 			    <video id="preview"></video>
 			    <script type="text/javascript">
 				    //Recupération du cookie espace
@@ -44,6 +44,8 @@
 					}
 					
 			    	let espace = getCookie("microfolies.lens.espace");
+			    	document.getElementById('titleScan').innerHTML = espace;
+ 
 			    	console.log(espace);
 			    	
 			  		//Scanner QRcode

WebContent/settings/index.html

@@ -17,11 +17,6 @@
 <div id="principal">
     <div class="header">
         <div class="navbar">
-            <ul>
-                <li><a href="index.html">Accueil</a></li>
-                <li><a href="abonnes.html">Nos abonnés</a></li>
-                <li><a href="inscription.jsp">Inscription</a></li>
-            </ul>
         </div><!-- end navbar -->
     </div><!-- end of header -->
     <div class="main">

src/servlets/Configure.java

@@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * Servlet implementation class Configure
  */
-@WebServlet(description = "Confiruation Servlet", urlPatterns = { "/configure" })
+@WebServlet(description = "Configuration Servlet", urlPatterns = { "/settings/configure" })
 public class Configure extends HttpServlet {
 
 	/**
@@ -33,7 +33,7 @@ public class Configure extends HttpServlet {
 	 */
 	protected void doGet(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
-
+		request.getServletContext().log("configuring tablet");
 		String mySpace = request.getParameter("espace");
 		String page;