Startseite Erkunden Hilfe
Anmelden
Artois
/
microfolie
2
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

_

Aym vor 5 Jahren
Ursprung
928b4a8080 c08aa2ac95
Commit
3a0357180b
5 geänderte Dateien mit 164 neuen und 165 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 6 15
      WebContent/abonnes.html
  2. 4 13
      WebContent/index.html
  3. 89 87
      WebContent/inscription.jsp
  4. 61 46
      WebContent/scan/index.html
  5. 4 4
      WebContent/settings/index.html

+ 6 - 15
WebContent/abonnes.html
Datei anzeigen 

@@ -6,7 +6,7 @@
 
 
 <head>
 
 	<meta charset="UTF-8">
 
-  <title>Bienvenu à microfolie</title>
 
+  <title>Bienvenue à microfolie</title>
 
   <link rel="stylesheet" type="text/css" href="css/style.css">
 
   <link rel="stylesheet" href="css/style1.css" type="text/css"  /> 
   <link rel="stylesheet" href="css/style.css" type="bootstrap/css/bootstrap.min.css"  />
 
@@ -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="abonnes.html">Nos abonnés</a></li>
 
+                <li><a href="inscription.jsp">Inscription</a></li>
 
             </ul>
 
         </div><!-- end navbar -->
 
     </div><!-- end of header -->
 
@@ -27,19 +27,10 @@
 
 
         <div class="menu">
 
             <ul>
 
-              <li><a href="index.php">Accueil</a></li>
 
-              <li><a href="abonnes.html">nos Abonnés</a></li>
 
-              
+              <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 class="login"> <br />
 
-            <img src="img/contact.png" alt="" />
 
-                <form action="cnx.php" method="post">
 
-                    <input value="Username" name="user" type="text" />
 
-                    <input value="password" name="pwd" type="password" /> <br />
 
-                    <input value="Login" name="sub" type="submit" />
 
-                </form>
 
-            </div>
 
         </div><!--end menu -->
 
         <div class="content">

+ 4 - 13
WebContent/index.html
Datei anzeigen 

@@ -18,7 +18,7 @@
 
         <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>
 
@@ -29,24 +29,15 @@
 
         <div class="menu">
 
             <ul>
 
               <li><a href="index.html">Accueil</a></li>
 
-               <li><a href="abonnes.html">Nos abonnées</a></li>
 
+               <li><a href="abonnes.html">Nos abonnés</a></li>
 
                <li><a href="inscription.jsp">Inscription</a></li>
 
                
             </ul>
 
-
 
-            <div class="login"> <br />
 
-            <img src="img/contact.png" alt="" />
 
-                <form action="cnx.php" method="post">
 
-                    <input value="Username" name="user" type="text" />
 
-                    <input value="password" name="pwd" type="password" /> <br />
 
-                    <input value="Login" name="sub" type="submit" />
 
-                </form>
 
-            </div>
 
         </div><!--end menu -->
 
         <div class="content">
 
      <header>
 
 
-         <h4>Fréquentation des espaces de microfolies</h4>
 
+         <h4>Fréquentation des espaces de microfolie</h4>
 
 
       </header>
 
 
@@ -58,7 +49,7 @@
 
          
          <header>
 
 
-         <h4>Fréquentation des espaces de la semaine courante</h4>
 
+         <h4>Fréquentation de microfolie pour cette semaine</h4>
 
 
       </header>

+ 89 - 87
WebContent/inscription.jsp
Datei anzeigen 

@@ -4,13 +4,10 @@
 
 <head>
 
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 
 <title>Inscription</title>
 
-  <script src="js/index.js" type="text/javascript"></script>
 
-    <script src="js/index.js" type="number/javascript"></script>
 
   <link rel="stylesheet" type="text/css" href="css/style.css">
 
   <link rel="stylesheet" href="css/style1.css" type="text/css"  /> 
   <link rel="stylesheet" href="css/style.css" type="bootstrap/css/bootstrap.min.css"  />
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
 
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
 
 
   
 </head>
 
@@ -22,97 +19,102 @@
 
         <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="abonnes.html">Nos abonnés</a></li>
 
+                <li><a href="inscription.jsp">Inscription</a></li>
 
             </ul>
 
         </div>
 
     </div><!-- end of header -->
 
     <div class="main">
 
-
 
-    
+    	 <div class="menu">
 
+            <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 menu -->
 
         <div class="content">
 
-    
-
 
-     
-
 
-    </div><!-- end of main div -->
 
-    <br>
 
-  	<h1>Inscription à l'espace microfolies</h1>
 
-  
-<br>
 
-
 
-  <form>
 
-  <div class="form-group row">
 
-  <label  class="col-2 col-form-label">Nom* </label>
 
-  <div class="col-10">
 
-    <input class="form-control" type="text" required>
 
-  </div>
 
-</div>
 
-<div class="form-group row">
 
-  <label  class="col-2 col-form-label">Prénom*</label>
 
-  <div class="col-10">
 
-    <input class="form-control" type="text" required>
 
-  </div>
 
-</div>
 
-<div class="form-group row">
 
-  <label  class="col-2 col-form-label">Genre*</label>
 
-  <div class="col-3">
 
-<select class="form-control"  required>
 
-  	<option>Homme</option>
 
-    <option>Femmme</option>
 
-    <option>Autre</option>
 
-</select>  
-</div>
 
-</div>
 
-<div class="form-group row">
 
-  <label  class="col-2 col-form-label">Date de naissance*</label>
 
-  <div class="col-10">
 
-    <input class="form-control" type="date" required>
 
-  </div>
 
-</div>
 
-<div class="form-group row">
 
-  <label  class="col-2 col-form-label">Ville*</label>
 
-  <div class="col-10">
 
-    <input class="form-control" type="text" required>
 
-  </div>
 
-</div>
 
-<div class="form-group row">
 
-  <label  class="col-2 col-form-label">Situation*</label>
 
-  <div class="col-10">
 
-    <input class="form-control" type="text" required>
 
-  </div>
 
-</div>
 
-<div class="form-group row">
 
-  <label class="col-2 col-form-label">Email*</label>
 
-  <div class="col-10">
 
-    <input class="form-control" type="text" required>
 
-  </div>
 
-</div>
 
-<div class="form-group row">
 
-  <label class="col-2 col-form-label" >Téléphone *</label>
 
-  <div class="col-10">
 
-    <input class="form-control" type="text" required>
 
-  </div>
 
-</div>
 
-<div class="form-group row">
 
-  <label  class="col-2 col-form-label" >Contact d'urgence* </label>
 
-  <div class="col-10">
 
-    <input class="form-control" type="text" required>
 
-  </div>
 
-</div>
 
-<div class="form-group row" type="text">
 
-  <label  class="col-2 col-form-label" >Pièce jointe</label>
 
-  <div class="col-10">
 
-    <input class="form-control" type="file" required>
 
-  </div>
 
-</div>
 
-  <button type="submit" class="btn btn-primary">Submit</button>
 
-</form>
 
-</body>
 
-</body>
 
-  <div class="clear"></div>
 
+        	<header>
 
+         		<h4>Inscription à l'espace microfolies</h4>
 
+      		</header>
 
+		      <main>
 
+					<form>
 
+					 	 <div class="form-group row">
 
+					  		<label  class="col-2 col-form-label">Nom* </label>
 
+					  		<div class="col-10">
 
+					    		<input class="form-control" type="text" required>
 
+					  		</div>
 
+					  	</div>
 
+						<div class="form-group row">
 
+					  		<label  class="col-2 col-form-label">Prénom*</label>
 
+					  		<div class="col-10">
 
+					    		<input class="form-control" type="text" required>
 
+					  		</div>
 
+						</div>
 
+						<div class="form-group row">
 
+					  		<label  class="col-2 col-form-label">Genre*</label>
 
+					  		<div class="col-3">
 
+								<select class="form-control"  required>
 
+									<option value=""></option>
 
+								  	<option>Homme</option>
 
+								    <option>Femme</option>
 
+								    <option>Autre</option>
 
+								</select>  
+							</div>
 
+						</div>
 
+						<div class="form-group row">
 
+					  		<label  class="col-2 col-form-label">Date de naissance*</label>
 
+					  		<div class="col-10">
 
+					    		<input class="form-control" type="date" required>
 
+					  		</div>
 
+						</div>
 
+						<div class="form-group row">
 
+					  		<label  class="col-2 col-form-label">Ville*</label>
 
+					  		<div class="col-10">
 
+					    		<input class="form-control" type="text" required>
 
+					  		</div>
 
+						</div>
 
+						<div class="form-group row">
 
+					  		<label  class="col-2 col-form-label">Situation*</label>
 
+					  		<div class="col-10">
 
+					    		<input class="form-control" type="text" required>
 
+					  		</div>
 
+						</div>
 
+						<div class="form-group row">
 
+						 	<label class="col-2 col-form-label">Email*</label>
 
+						  	<div class="col-10">
 
+						   		 <input class="form-control" type="text" required>
 
+						  	</div>
 
+						</div>
 
+						<div class="form-group row">
 
+					  		<label class="col-2 col-form-label" >Téléphone *</label>
 
+					  		<div class="col-10">
 
+					    		<input class="form-control" type="text" required>
 
+					  		</div>
 
+						</div>
 
+						<div class="form-group row">
 
+					  		<label  class="col-2 col-form-label" >Contact d'urgence* </label>
 
+					  		<div class="col-10">
 
+					    		<input class="form-control" type="text" required>
 
+					  		</div>
 
+						</div>
 
+						<div class="form-group row" type="text">
 
+					  		<label  class="col-2 col-form-label" >Pièce jointe</label>
 
+					  		<div class="col-10">
 
+					    		<input class="form-control" type="file" />
 
+					  		</div>
 
+						</div>
 
+					  	<button type="submit" class="btn btn-primary">Valider</button>
 
+					</form>
 
+		      </main>
 
+    	</div><!-- end of content div -->
 
+    </div><!-- end of main div --> 
+	<br> 
+	<div class="clear"></div>
 
     <div class="footer"></div>
 
     </div>
 
+</body>
 
+  
 </html>

+ 61 - 46
WebContent/scan/index.html
Datei anzeigen 

@@ -1,55 +1,70 @@
 
 <!DOCTYPE html>

-<html>

+<html xmlns="http://www.w3.org/1999/xhtml">

   <head>

+  	<meta charset="UTF-8">

     <title>Instascan</title>

     <script type="text/javascript" src="https://rawgit.com/schmich/instascan-builds/master/instascan.min.js"></script>

+    <link rel="stylesheet" type="text/css" href="../css/style.css">

+  	<link rel="stylesheet" href="../css/style1.css" type="text/css"  /> 

+  	<link rel="stylesheet" href="../css/style.css" type="bootstrap/css/bootstrap.min.css"  />

   </head>

   <body>

-	<h1>Scanner QrCODE</h1>

-    <video id="preview"></video>

-    <script type="text/javascript">

-	    //Recupération du cookie espace

-		function getCookieVal(offset) {

-			let endstr = document.cookie.indexOf (";", offset);

-			if (endstr==-1)

-				endstr = document.cookie.length;

-			return unescape(document.cookie.substring(offset, endstr));

-		}

-	

-		function getCookie (name) {

-			let arg = name + "=";

-			let alen = arg.length;

-			let clen = document.cookie.length;

-			let i = 0;

-			while (i < clen) {

-				let j = i+alen;

-				if (document.cookie.substring(i, j) == arg)

-					return getCookieVal(j);

-				i = document.cookie.indexOf(" ",i)+1;

-				if (i == 0)

-					break;

-			}

-			return null;

-		}

-		

-    	let espace = getCookie("microfolies.lens.espace");

-    	console.log(espace);

+  	<div id="principal">

+    	<div class="header">

+    	</div><!-- end of header -->

     	

-  		//Scanner QRcode

-		let scanner = new Instascan.Scanner({ video: document.getElementById('preview') });

-		scanner.addListener('scan', function (content) {

-			espace ? console.log(content + "/" + espace) : console.log(content);

-		});

-		Instascan.Camera.getCameras().then(function (cameras) {

-			if (cameras.length > 0) {

-		    	scanner.start(cameras[0]);

-		    }

-			else {

-		    console.error('No cameras found.');

-		    }

-		}).catch(function (e) {

-		    console.error(e);

-		});

-    </script>

+    	<div class="main">

+        

+        	<div class="content">

+			    <h1>Accueil</h1>

+			    <video id="preview"></video>

+			    <script type="text/javascript">

+				    //Recupération du cookie espace

+					function getCookieVal(offset) {

+						let endstr = document.cookie.indexOf (";", offset);

+						if (endstr==-1)

+							endstr = document.cookie.length;

+						return unescape(document.cookie.substring(offset, endstr));

+					}

+				

+					function getCookie (name) {

+						let arg = name + "=";

+						let alen = arg.length;

+						let clen = document.cookie.length;

+						let i = 0;

+						while (i < clen) {

+							let j = i+alen;

+							if (document.cookie.substring(i, j) == arg)

+								return getCookieVal(j);

+							i = document.cookie.indexOf(" ",i)+1;

+							if (i == 0)

+								break;

+						}

+						return null;

+					}

+					

+			    	let espace = getCookie("microfolies.lens.espace");

+			    	console.log(espace);

+			    	

+			  		//Scanner QRcode

+					let scanner = new Instascan.Scanner({ video: document.getElementById('preview') });

+					scanner.addListener('scan', function (content) {

+						espace ? document.getElementById("resultScan").value = content + "/" + espace : document.getElementById("resultScan").value = content;

+					});

+					Instascan.Camera.getCameras().then(function (cameras) {

+						if (cameras.length > 0) {

+					    	scanner.start(cameras[0]);

+					    }

+						else {

+					    console.error('No cameras found.');

+					    }

+					}).catch(function (e) {

+					    console.error(e);

+					});

+			    </script>

+			    <textarea id="resultScan" read_only="true"></textarea>

+        	</div>

+        </div>

+	</div>

   </body>

 </html>

+ 4 - 4
WebContent/settings.html → WebContent/settings/index.html
Datei anzeigen 

@@ -6,7 +6,7 @@
 
 
 <head>
 
 	<meta charset="UTF-8">
 
-  <title>Bienvenu à microfolie</title>
 
+  <title>Bienvenue à microfolie</title>
 
   <link rel="stylesheet" type="text/css" href="css/style.css">
 
   <link rel="stylesheet" type="text/css" href="css/settings.css">
 
   <link rel="stylesheet" type="text/css" href="css/bootstrap/css/bootstrap.css">
 
@@ -19,8 +19,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="abonnes.html">Nos abonnés</a></li>
 
+                <li><a href="inscription.jsp">Inscription</a></li>
 
             </ul>
 
         </div><!-- end navbar -->
 
     </div><!-- end of header -->
 
@@ -31,7 +31,7 @@
 
      
 	      <main>         
 	         <div class="container">
 
-	            <h4 class="section-title">Nos espace:</h4>
 
+	            <h4 class="section-title">Nos espaces:</h4>
 
 	           <div>
 
 				<a href="http://localhost:8080/lens/configure?espace=accueil"><button type="button" class="btn btn-danger btn-lg espace" >Accueil</button></a>	 
 			   </div>