Browse Source

Correction lien entre les pages

Arthur Brandao 5 years ago
parent
commit
7673f86193
5 changed files with 14 additions and 119 deletions
  1. 4 4
      WebContent/abonnes.jsp
  2. 2 2
      WebContent/index.jsp
  3. 4 4
      WebContent/inscription.jsp
  4. 4 4
      WebContent/settings/index.jsp
  5. 0 105
      settings.html

+ 4 - 4
WebContent/abonnes.jsp

@@ -32,7 +32,7 @@
                     </a>
                 </div>
                 <ul class="right mright-2 hide-on-med-and-down">
-                    <li class="active"><a href="${abonnesurl}">Abonn&eacute;s</a></li>
+                    <li class="active"><a href="#">Abonn&eacute;s</a></li>
                     <li><a href="${inscriptionurl}">Inscription</a></li>
                     <li><a href="${settingsurl}">Param&eacute;trage espace</a></li>
                 </ul>
@@ -48,9 +48,9 @@
             <h4>Microfolie Lens</h4>
             <hr />
         </li>
-        <li class="active"><a href="abonnes.html">Abonn&eacute;s</a></li>
-        <li><a href="inscription.jsp">Inscription</a></li>
-        <li><a href="settings">Param&eacute;trage espace</a></li>
+        <li class="active"><a href="#">Abonn&eacute;s</a></li>
+        <li><a href="${inscriptionurl}">Inscription</a></li>
+        <li><a href="${settingsurl}">Param&eacute;trage espace</a></li>
     </ul>
     <div class="mtop-5 hide-on-med-and-down"></div>
 

+ 2 - 2
WebContent/index.jsp

@@ -49,9 +49,9 @@
             <h4>Microfolie Lens</h4>
             <hr />
         </li>
-        <li><a href="abonnes.html">Abonn&eacute;s</a></li>
+        <li><a href="${abonnesurl}">Abonn&eacute;s</a></li>
         <li><a href="${inscriptionurl}">Inscription</a></li>
-        <li><a href="settings">Param&eacute;trage espace</a></li>
+        <li><a href="${settingurl}">Param&eacute;trage espace</a></li>
     </ul>
     <div class="mtop-5 hide-on-med-and-down"></div>
 

+ 4 - 4
WebContent/inscription.jsp

@@ -35,7 +35,7 @@
                 </div>
                 <ul class="right mright-2 hide-on-med-and-down">
                     <li><a href="${abonnesurl}">Abonn&eacute;s</a></li>
-                    <li class="active"><a href="{inscriptionurl}">Inscription</a></li>
+                    <li class="active"><a href="#">Inscription</a></li>
                     <li><a href="${settingsurl}">Param&eacute;trage espace</a></li>
                 </ul>
             </div>
@@ -50,9 +50,9 @@
             <h4>Microfolie Lens</h4>
             <hr />
         </li>
-        <li><a href="abonnes.html">Abonn&eacute;s</a></li>
-        <li class="active"><a href="inscription.jsp">Inscription</a></li>
-        <li><a href="settings">Param&eacute;trage espace</a></li>
+        <li><a href="${abonnesurl}">Abonn&eacute;s</a></li>
+        <li class="active"><a href="#">Inscription</a></li>
+        <li><a href="${settingsurl}">Param&eacute;trage espace</a></li>
     </ul>
     <div class="mtop-5 hide-on-med-and-down"></div>
 

+ 4 - 4
WebContent/settings/index.jsp

@@ -13,7 +13,7 @@
     <link type="text/css" rel="stylesheet" href="<c:url value="/css/materialize.min.css"/>" media="screen,projection" />
     <link type="text/css" rel="stylesheet" href="<c:url value="/css/style.min.css"/>" media="screen,projection" />
     <link rel="icon" href="../img/favicon.ico" />
-    <title>Accueil - Microfolie Lens</title>
+    <title>Paramétrage - Microfolie Lens</title>
 </head>
 
 <body class="grey lighten-3">
@@ -36,7 +36,7 @@
                 <ul class="right mright-2 hide-on-med-and-down">
                     <li><a href="${abonnesurl}">Abonn&eacute;s</a></li>
                     <li><a href="${inscriptionurl}">Inscription</a></li>
-                    <li class="active"><a href="${settingsurl}">Param&eacute;trage espace</a></li>
+                    <li class="active"><a href="#">Param&eacute;trage espace</a></li>
                 </ul>
             </div>
         </nav>
@@ -50,9 +50,9 @@
             <h4>Microfolie Lens</h4>
             <hr />
         </li>
-        <li><a href="../abonnes.html">Abonn&eacute;s</a></li>
+        <li><a href="${abonnesurl}">Abonn&eacute;s</a></li>
         <li><a href="${inscriptionurl}">Inscription</a></li>
-        <li class="active"><a href="./">Param&eacute;trage espace</a></li>
+        <li class="active"><a href="#">Param&eacute;trage espace</a></li>
     </ul>
     <div class="mtop-5 hide-on-med-and-down"></div>
 

+ 0 - 105
settings.html

@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link type="text/css" rel="stylesheet" href="../css/material-icons.css" />
-    <link type="text/css" rel="stylesheet" href="../css/materialize.min.css" media="screen,projection" />
-    <link type="text/css" rel="stylesheet" href="../css/style.min.css" media="screen,projection" />
-    <link rel="icon" href="img/favicon.ico" />
-    <title>Accueil - Microfolie Lens</title>
-</head>
-
-<body class="grey lighten-3">
-    <!-- Header -->
-    <header class="navbar-fixed">
-        <nav class="red">
-            <div class="nav-wrapper">
-                <a href="../" class="brand-logo center mtop-half hide-on-med-and-down"><img src="img/logo.png"
-                        title="Logo Microfolie" class="responsive-img" style="max-width: 128px;" /></a>
-                <a href="../" class="brand-logo center hide-on-large-only">Microfolie Lens</a>
-                <a href="#!" data-target="mobile-nav" class="sidenav-trigger"><i class="material-icons">menu</i></a>
-                <div class="left mleft-2 hide-on-med-and-down">
-                    <a href="../">
-                        <h5>Microfolie Lens</h5>
-                    </a>
-                </div>
-                <ul class="right mright-2 hide-on-med-and-down">
-                    <li><a href="#abonne">Abonn&eacute;s</a></li>
-                    <li><a href="../inscription.html">Inscription</a></li>
-                    <li class="active"><a href="./">Param&eacute;trage espace</a></li>
-                </ul>
-            </div>
-        </nav>
-    </header>
-    <!-- Header Mobile -->
-    <ul class="sidenav" id="mobile-nav">
-        <li class="center-align mtop-1">
-            <img src="img/logo.png" title="Logo Microfolie" class="responsive-img" style="max-height: 150px;" />
-        </li>
-        <li class="center-align">
-            <h4>Microfolie Lens</h4>
-            <hr />
-        </li>
-        <li><a href="#abonne">Abonn&eacute;s</a></li>
-        <li><a href="../inscription.html">Inscription</a></li>
-        <li class="active"><a href="./">Param&eacute;trage espace</a></li>
-    </ul>
-    <div class="mtop-5 hide-on-med-and-down"></div>
-
-    <!-- Main -->
-    <main class="container">
-        <div class="row">
-            <div class="col s12 center-align">
-                <h3>Param&eacute;trage</h3>
-            </div>
-        </div>
-        <div class="row center-align">
-            <div class="col l4 m6 s12">
-                <a href="settings/configure?espace=accueil" class="waves-effect waves-light btn-large red">Accueil</a>
-            </div>
-            <div class="col l4 m6 s12">
-                <a href="settings/configure?espace=imprimante+3D" class="waves-effect waves-light btn-large red">Imprimante 3D</a>
-            </div>
-            <div class="col l4 m6 s12">
-                <a href="settings/configure?espace=jeux+video" class="waves-effect waves-light btn-large red">Jeux vid&eacute;os</a>
-            </div>
-        </div>
-    </main>
-
-    <!-- Footer -->
-    <footer class="page-footer red">
-        <div class="container">
-            <div class="row">
-                <div class="col l6 s12">
-                    <h5 class="white-text">Microfolie Lens</h5>
-                    <p class="grey-text text-lighten-4">Bla bla bla ...</p>
-                </div>
-                <div class="col l4 offset-l2 s12">
-                    <h5 class="white-text">Liens utiles</h5>
-                    <ul>
-                        <li><a class="grey-text text-lighten-3" href="../">Accueil</a></li>
-                        <li><a class="grey-text text-lighten-3" href="#apropos">Qui somme nous</a></li>
-                        <li><a class="grey-text text-lighten-3" href="#mention">Mentions l&eacute;gales</a></li>
-                        <li><a class="grey-text text-lighten-3" href="#contact">Contact</a></li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-        <div class="footer-copyright">
-            <div class="container">
-                © 2019 Copyright Text
-                <a class="grey-text text-lighten-4 right" href="https://villedelens.fr" target="_blank">Ville de
-                    Lens</a>
-            </div>
-        </div>
-    </footer>
-
-    <!-- Script -->
-    <script type="text/javascript" src="../js/jquery.min.js"></script>
-    <script type="text/javascript" src="../js/materialize.min.js"></script>
-    <script type="text/javascript" src="../js/script.js"></script>
-</body>
-
-</html>