首頁 探索 說明
登入
Artois
/
microfolie
2
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

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

Arthur Brandao 5 年之前
父節點
de38ef39c3 ad279de33e
當前提交
dd0fb55904
共有 6 個文件被更改，包括 41 次插入 和 23 次删除
統一視圖 顯示文件統計
  1. 二進制
      WebContent/WEB-INF/lib/jstl-1.2.jar
  2. 11 5
      WebContent/abonnes.jsp
  3. 4 3
      WebContent/index.jsp
  4. 6 3
      WebContent/inscription.jsp
  5. 14 12
      WebContent/settings/index.jsp
  6. 6 0
      src/struts.xml

二進制
WebContent/WEB-INF/lib/jstl-1.2.jar
查看文件


+ 11 - 5
WebContent/abonnes.html → WebContent/abonnes.jsp
查看文件 

@@ -1,4 +1,7 @@
 
-<!DOCTYPE html>
 
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
 
+	pageEncoding="UTF-8"%>
 
+<%@ taglib prefix="s" uri="/struts-tags"%><!DOCTYPE html>
 
+
 
 <html>
 
 <html>
 
 
 
 <head>
 
 <head>
 
@@ -12,6 +15,9 @@
 
 </head>
 
 </head>
 
 
 
 <body class="grey lighten-3">
 
 <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 -->
 
     <header class="navbar-fixed">
 
     <header class="navbar-fixed">
 
         <nav class="red">
 
         <nav class="red">
 
@@ -26,9 +32,9 @@
 
                     </a>
 
                     </a>
 
                 </div>
 
                 </div>
 
                 <ul class="right mright-2 hide-on-med-and-down">
 
                 <ul class="right mright-2 hide-on-med-and-down">
 
-                    <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="${abonnesurl}">Abonn&eacute;s</a></li>
 
+                    <li><a href="${inscriptionurl}">Inscription</a></li>
 
+                    <li><a href="${settingsurl}">Param&eacute;trage espace</a></li>
 
                 </ul>
 
                 </ul>
 
             </div>
 
             </div>
 
         </nav>
 
         </nav>
 
@@ -84,7 +90,7 @@
 
         </div>
 
         </div>
 
         <div class="footer-copyright">
 
         <div class="footer-copyright">
 
             <div class="container">
 
             <div class="container">
 
-                © 2019 Copyright Text
 
+                © 2019 Copyright Text
 
                 <a class="grey-text text-lighten-4 right" href="https://villedelens.fr" target="_blank">Ville de
 
                 <a class="grey-text text-lighten-4 right" href="https://villedelens.fr" target="_blank">Ville de
 
                     Lens</a>
 
                     Lens</a>
 
             </div>
 
             </div>

+ 4 - 3
WebContent/index.jsp
查看文件 

@@ -17,7 +17,8 @@
 
 
 
 <body class="grey lighten-3">
 
 <body class="grey lighten-3">
 
 	<s:url var="inscriptionurl" action="gotoinscription"/>
 
 	<s:url var="inscriptionurl" action="gotoinscription"/>
 
-
 
+    <s:url var="abonnesurl" action="gotoabonnes"/>
 
+	<s:url var="settingsurl" action="gotosettings"/>
 
     <!-- Header -->
 
     <!-- Header -->
 
     <header class="navbar-fixed">
 
     <header class="navbar-fixed">
 
         <nav class="red">
 
         <nav class="red">
 
@@ -32,9 +33,9 @@
 
                     </a>
 
                     </a>
 
                 </div>
 
                 </div>
 
                 <ul class="right mright-2 hide-on-med-and-down">
 
                 <ul class="right mright-2 hide-on-med-and-down">
 
-                    <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="${inscriptionurl}">Inscription</a></li>
 
-                    <li><a href="settings">Param&eacute;trage espace</a></li>
 
+                    <li><a href="${settingsurl}">Param&eacute;trage espace</a></li>
 
                 </ul>
 
                 </ul>
 
             </div>
 
             </div>
 
         </nav>
 
         </nav>

+ 6 - 3
WebContent/inscription.jsp
查看文件 

@@ -17,6 +17,9 @@
 
 </head>
 
 </head>
 
 
 
 <body class="grey lighten-3">
 
 <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 -->
 
     <header class="navbar-fixed">
 
     <header class="navbar-fixed">
 
         <nav class="red">
 
         <nav class="red">
 
@@ -31,9 +34,9 @@
 
                     </a>
 
                     </a>
 
                 </div>
 
                 </div>
 
                 <ul class="right mright-2 hide-on-med-and-down">
 
                 <ul class="right mright-2 hide-on-med-and-down">
 
-                    <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="{inscriptionurl}">Inscription</a></li>
 
+                    <li><a href="${settingsurl}">Param&eacute;trage espace</a></li>
 
                 </ul>
 
                 </ul>
 
             </div>
 
             </div>
 
         </nav>
 
         </nav>

+ 14 - 12
WebContent/settings/index.jsp
查看文件 

@@ -1,6 +1,7 @@
 
 <%@ page language="java" contentType="text/html; charset=utf-8"
 
 <%@ page language="java" contentType="text/html; charset=utf-8"
 
 	pageEncoding="utf-8"%>
 
 	pageEncoding="utf-8"%>
 
 <%@ taglib prefix="s" uri="/struts-tags"%>
 
 <%@ taglib prefix="s" uri="/struts-tags"%>
 
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 
 
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html>
 
 <html>
 
@@ -8,33 +9,34 @@
 
 <head>
 
 <head>
 
     <meta charset="UTF-8">
 
     <meta charset="UTF-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <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 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="../img/favicon.ico" />
 
     <link rel="icon" href="../img/favicon.ico" />
 
     <title>Accueil - Microfolie Lens</title>
 
     <title>Accueil - Microfolie Lens</title>
 
 </head>
 
 </head>
 
 
 
 <body class="grey lighten-3">
 
 <body class="grey lighten-3">
 
 	<s:url var="inscriptionurl" action="gotoinscription"/>
 
 	<s:url var="inscriptionurl" action="gotoinscription"/>
 
-
 
+    <s:url var="abonnesurl" action="gotoabonnes"/>
 
+	<s:url var="settingsurl" action="gotosettings"/>
 
     <!-- Header -->
 
     <!-- Header -->
 
     <header class="navbar-fixed">
 
     <header class="navbar-fixed">
 
         <nav class="red">
 
         <nav class="red">
 
             <div class="nav-wrapper">
 
             <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="<c:url value="/img/logo.png"/>"
 
                         title="Logo Microfolie" class="responsive-img" style="max-width: 128px;" /></a>
 
                         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="<c:url value="/"/>" 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="#!" data-target="mobile-nav" class="sidenav-trigger"><i class="material-icons">menu</i></a>
 
                 <div class="left mleft-2 hide-on-med-and-down">
 
                 <div class="left mleft-2 hide-on-med-and-down">
 
-                    <a href="../">
 
+                    <a href="<c:url value="/"/>">
 
                         <h5>Microfolie Lens</h5>
 
                         <h5>Microfolie Lens</h5>
 
                     </a>
 
                     </a>
 
                 </div>
 
                 </div>
 
                 <ul class="right mright-2 hide-on-med-and-down">
 
                 <ul class="right mright-2 hide-on-med-and-down">
 
-                    <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="${inscriptionurl}">Inscription</a></li>
 
-                    <li class="active"><a href="./">Param&eacute;trage espace</a></li>
 
+                    <li class="active"><a href="${settingsurl}">Param&eacute;trage espace</a></li>
 
                 </ul>
 
                 </ul>
 
             </div>
 
             </div>
 
         </nav>
 
         </nav>
 
@@ -63,13 +65,13 @@
 
         </div>
 
         </div>
 
         <div class="row center-align">
 
         <div class="row center-align">
 
             <div class="col l4 m6 s12">
 
             <div class="col l4 m6 s12">
 
-                <a href="configure?espace=accueil" class="waves-effect waves-light btn-large red">Accueil</a>
 
+                <a href="<c:url value="/settings/configure?espace=accueil"/>" class="waves-effect waves-light btn-large red">Accueil</a>
 
             </div>
 
             </div>
 
             <div class="col l4 m6 s12">
 
             <div class="col l4 m6 s12">
 
-                <a href="configure?espace=imprimante3D" class="waves-effect waves-light btn-large red">Imprimante 3D</a>
 
+                <a href="<c:url value="/settings/configure?espace=imprimante3D"/>" class="waves-effect waves-light btn-large red">Imprimante 3D</a>
 
             </div>
 
             </div>
 
             <div class="col l4 m6 s12">
 
             <div class="col l4 m6 s12">
 
-                <a href="configure?espace=jeux-video" class="waves-effect waves-light btn-large red">Jeux vid&eacute;os</a>
 
+                <a href="<c:url value="/settings/configure?espace=jeux-video"/>" class="waves-effect waves-light btn-large red">Jeux vid&eacute;os</a>
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
     </main>
 
     </main>

+ 6 - 0
src/struts.xml
查看文件 

@@ -15,5 +15,11 @@
 
         <action name="gotoinscription" class="microfolie.Inscription" method="before">
 
         <action name="gotoinscription" class="microfolie.Inscription" method="before">
 
             <result>/inscription.jsp</result>
 
             <result>/inscription.jsp</result>
 
         </action>
 
         </action>
 
+        <action name="gotoabonnes">
 
+            <result>/abonnes.jsp</result>
 
+        </action>
 
+        <action name="gotosettings">
 
+            <result>/settings/</result>
 
+        </action>
 
     </package>
 
     </package>
 
 </struts>
 
 </struts>