Browse Source

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

TIBAL 5 năm trước cách đây
mục cha
commit
b00e2ab17d
3 tập tin đã thay đổi với 4 bổ sung9 xóa
  1. 2 2
      WebContent/index.html
  2. 0 5
      WebContent/settings/index.html
  3. 2 2
      src/servlets/Configure.java

+ 2 - 2
WebContent/index.html

@@ -18,8 +18,8 @@
         <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>
+<li><a href="inscription.jsp">Inscription</a></li>
+                
                 
             </ul>
         </div><!-- end navbar -->

+ 0 - 5
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">

+ 2 - 2
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;