Browse Source

Amélioration navigation

Arthur Brandao 5 years ago
parent
commit
e27eccd92d
1 changed files with 17 additions and 31 deletions
  1. 17 31
      WebContent/scan/generate.jsp

+ 17 - 31
WebContent/scan/generate.jsp

@@ -1,6 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
 <%@ taglib prefix="s" uri="/struts-tags"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 
 <!DOCTYPE html>
 <html>
@@ -8,10 +9,10 @@
 <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" />
+    <link type="text/css" rel="stylesheet" href="<c:url value="/css/material-icons.css"/>" />
+    <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="<c:url value="/img/favicon.ico"/>" />
     <title>QRCode - Microfolie Lens</title>
     
     <style>
@@ -23,47 +24,32 @@
 </head>
 
 <body class="grey lighten-3">
-	<s:url var="inscriptionurl" action="gotoinscription"/>
-    <s:url var="abonnesurl" action="gotoabonnes"/>
-	<s:url var="settingsurl" action="gotosettings"/>
     <!-- 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"
+                <a href="<c:url value="/" />" 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>
+                <a href="<c:url value="/" />" class="brand-logo center hide-on-large-only">Microfolie Lens</a>
                 <div class="left mleft-2 hide-on-med-and-down">
-                    <a href="../">
+                    <span>
                         <h5>Microfolie Lens</h5>
-                    </a>
+                    </span>
                 </div>
-                <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><a href="${settingsurl}">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="${abonnesurl}">Abonn&eacute;s</a></li>
-        <li><a href="${inscriptionurl}">Inscription</a></li>
-        <li><a href="${settingurl}">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">
+    			<a onclick="window.history.back()" class="waves-effect waves-light btn" >
+    				<i class="material-icons left">arrow_back</i>Retour
+    			</a>
+    		</div>
+    	</div>
     	<div class="row">
     		<div class="col s12 center-align">
     			<h3>Code : <span id="code"></span></h3>
@@ -96,7 +82,7 @@
                 <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="<c:url value="/" />">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>