From 7da8274cbe7508bde15fe992a5293f37c2263106 Mon Sep 17 00:00:00 2001
From: vbochet <vbochet@gmail.com>
Date: Thu, 28 Apr 2016 11:58:08 +0200
Subject: [PATCH] =?UTF-8?q?Modification=20de=20toutes=20les=20vues=20pour?=
=?UTF-8?q?=20les=20adapter=20au=20nouveau=20syst=C3=A8me=20d'URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/view/Classement/display.html | 8 +++---
app/view/Connexion/displayForm.html | 9 ++++---
app/view/Connexion/displayValid.html | 8 +++---
app/view/Error/error404.html | 9 ++++---
app/view/Index/display.html | 9 ++++---
app/view/Jeu/display.html | 19 +++++++-------
app/view/Jeu/displayFormAdd.html | 11 ++++----
app/view/Jeu/displayListe.html | 8 +++---
app/view/Jeu/displayRequestValid.html | 7 ++---
app/view/Partie/displayForm.html | 10 +++-----
app/view/Partie/displayValid.html | 8 +++---
app/view/Profil/display.html | 37 ++++++++++++++-------------
app/view/Register/displayForm.html | 24 +++++++++--------
app/view/Register/displayValid.html | 7 ++---
14 files changed, 91 insertions(+), 83 deletions(-)
diff --git a/app/view/Classement/display.html b/app/view/Classement/display.html
index d2caf5a..b0c1f6f 100644
--- a/app/view/Classement/display.html
+++ b/app/view/Classement/display.html
@@ -1,7 +1,7 @@
-
-<?php $page_title = "Classement";
- $RACINE = "../../.."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
+<?php
+ $page_title = "Classement";
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
<article>
<h1>Page permettant d'afficher un classement, global ou pour un jeu donné.</h1>
diff --git a/app/view/Connexion/displayForm.html b/app/view/Connexion/displayForm.html
index 594c44f..064cd0a 100644
--- a/app/view/Connexion/displayForm.html
+++ b/app/view/Connexion/displayForm.html
@@ -1,7 +1,8 @@
-<?php session_start(); ?>
-<?php $page_title = "Formulaire de connexion";
- $RACINE = ".."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
+<?php
+ session_start();
+ $page_title = "Formulaire de connexion";
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
<?php if(isset($_SESSION['connexionErrCode'])) { // si message d'erreur
diff --git a/app/view/Connexion/displayValid.html b/app/view/Connexion/displayValid.html
index 8a6ddf3..84ee2b7 100644
--- a/app/view/Connexion/displayValid.html
+++ b/app/view/Connexion/displayValid.html
@@ -1,7 +1,7 @@
-
-<?php $page_title = "Connexion réussie";
- $RACINE = "../.."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
+<?php
+ $page_title = "Connexion réussie";
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
<article class="msg-valide"><h2>Vous êtes connecté !</h2></article>
<article>
diff --git a/app/view/Error/error404.html b/app/view/Error/error404.html
index 61ea1ec..b5cda4d 100644
--- a/app/view/Error/error404.html
+++ b/app/view/Error/error404.html
@@ -1,12 +1,13 @@
+<?php
+ $page_title = "Erreur 404";
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
-<?php $page_title = "Erreur 404";
- $RACINE = "..";
- ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
<article class="msg-erreur">
<h2>Erreur 404</h2>
</article>
<article>
<h3>La page que vous demandez est inaccessible, ou n'existe pas (ou plus...)</h3>
</article>
+
<?php include(ROOT."/app/view/Includes/footer.include.html"); ?>
diff --git a/app/view/Index/display.html b/app/view/Index/display.html
index dc231e1..853e33d 100644
--- a/app/view/Index/display.html
+++ b/app/view/Index/display.html
@@ -1,6 +1,7 @@
-<?php $page_title = "Titre de la page d'index du site de classement de jeux de plateaux pour le projet web ENSIIE 2016, et ce titre est beaucoup trop long !";
- $RACINE = ".."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
+<?php
+ $page_title = "Titre de la page d'index du site de classement de jeux de plateaux pour le projet web ENSIIE 2016, et ce titre est beaucoup trop long !";
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
<article>
<h1>Exemple de page d'accueil</h1>
@@ -27,5 +28,5 @@
</ul>
</article>
+
<?php include(ROOT."/app/view/Includes/footer.include.html"); ?>
-
diff --git a/app/view/Jeu/display.html b/app/view/Jeu/display.html
index 0d57d2e..eb02f83 100644
--- a/app/view/Jeu/display.html
+++ b/app/view/Jeu/display.html
@@ -1,10 +1,11 @@
-<?php $page_title = "Fiche du jeu ".$this->jeu->nom;
- $RACINE = "../.."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
+<?php
+ $page_title = "Fiche du jeu ".$this->jeu->nom;
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
<article>
<h2><?php echo $this->jeu->nom; ?></h2>
- <aside class="jeu-image"><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="Logo du jeu <?php echo $this->jeu->nom; ?>" />
+ <aside class="jeu-image"><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="Logo du jeu <?php echo $this->jeu->nom; ?>" />
</aside>
<div class="row">
<p class="col-7">
@@ -16,11 +17,11 @@
<div class="classement-card">
<table class="classement-table">
<tr><th>N°</th><th colspan="2">Joueur</th><th>Score</th></tr>
- <tr><td>1</td><td><a href="profil.html"><img src="<?php echo $RACINE; ?>/app/view/Includes/images/dummy_web_page.jpg" alt="Image de profil de <nom>" class="classement-profil-img"></a></td><td><a href="profil.html">Gaston</a></td><td>3000000</td></tr>
- <tr><td>2</td><td><a href="profil.html"><img src="<?php echo $RACINE; ?>/app/view/Includes/images/profil_42.jpg" alt="Image de profil de <nom>" class="classement-profil-img"></a></td><td><a href="profil.html">Laurent</a></td><td>150000</td></tr>
- <tr><td>3</td><td><a href="profil.html"><img src="<?php echo $RACINE; ?>/app/view/Includes/images/dummy_web_page.jpg" alt="Image de profil de <nom>" class="classement-profil-img"></a></td><td><a href="profil.html">Jerémy</a></td><td>15200</td></tr>
- <tr><td>4</td><td><a href="profil.html"><img src="<?php echo $RACINE; ?>/app/view/Includes/images/profil_42.jpg" alt="Image de profil de <nom>" class="classement-profil-img"></a></td><td><a href="profil.html">Lucas</a></td><td>500</td></tr>
- <tr><td>5</td><td><a href="profil.html"><img src="<?php echo $RACINE; ?>/app/view/Includes/images/dummy_web_page.jpg" alt="Image de profil de <nom>" class="classement-profil-img"></a></td><td><a href="profil.html">Christophe</a></td><td>-400</td></tr>
+ <tr><td>1</td><td><a href="profil.html"><img src="<?php echo BASE_URL; ?>/images/dummy_web_page.jpg" alt="Image de profil de <nom>" class="classement-profil-img"></a></td><td><a href="profil.html">Gaston</a></td><td>3000000</td></tr>
+ <tr><td>2</td><td><a href="profil.html"><img src="<?php echo BASE_URL; ?>/images/profil_42.jpg" alt="Image de profil de <nom>" class="classement-profil-img"></a></td><td><a href="profil.html">Laurent</a></td><td>150000</td></tr>
+ <tr><td>3</td><td><a href="profil.html"><img src="<?php echo BASE_URL; ?>/images/dummy_web_page.jpg" alt="Image de profil de <nom>" class="classement-profil-img"></a></td><td><a href="profil.html">Jerémy</a></td><td>15200</td></tr>
+ <tr><td>4</td><td><a href="profil.html"><img src="<?php echo BASE_URL; ?>/images/profil_42.jpg" alt="Image de profil de <nom>" class="classement-profil-img"></a></td><td><a href="profil.html">Lucas</a></td><td>500</td></tr>
+ <tr><td>5</td><td><a href="profil.html"><img src="<?php echo BASE_URL; ?>/images/dummy_web_page.jpg" alt="Image de profil de <nom>" class="classement-profil-img"></a></td><td><a href="profil.html">Christophe</a></td><td>-400</td></tr>
</table>
</div>
diff --git a/app/view/Jeu/displayFormAdd.html b/app/view/Jeu/displayFormAdd.html
index 8e62b46..4c8dc20 100644
--- a/app/view/Jeu/displayFormAdd.html
+++ b/app/view/Jeu/displayFormAdd.html
@@ -1,8 +1,8 @@
-<?php session_start(); ?>
-
-<?php $page_title = "Formulaire de demande d'ajout de jeu";
- $RACINE = ".."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
+<?php
+ session_start();
+ $page_title = "Formulaire de demande d'ajout de jeu";
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
<?php if(isset($_SESSION['addRequestErrCode'])) {
@@ -23,6 +23,5 @@
</form>
</div>
</article>
-
<?php include(ROOT."/app/view/Includes/footer.include.html"); ?>
diff --git a/app/view/Jeu/displayListe.html b/app/view/Jeu/displayListe.html
index 08097e5..70c08d9 100644
--- a/app/view/Jeu/displayListe.html
+++ b/app/view/Jeu/displayListe.html
@@ -1,7 +1,7 @@
-<?php $page_title = "Liste des jeux";
- $RACINE = ".."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
-
+<?php
+ $page_title = "Liste des jeux";
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
<?php
$cpt = 1;
diff --git a/app/view/Jeu/displayRequestValid.html b/app/view/Jeu/displayRequestValid.html
index 9852283..460253c 100644
--- a/app/view/Jeu/displayRequestValid.html
+++ b/app/view/Jeu/displayRequestValid.html
@@ -1,6 +1,7 @@
-<?php $page_title = "Demande enregistrée";
- $RACINE = "../.."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
+<?php
+ $page_title = "Demande enregistrée";
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
<article class="msg-valide"><h2>Votre demande a été enregistrée !</h2></article>
<article>
diff --git a/app/view/Partie/displayForm.html b/app/view/Partie/displayForm.html
index ca37245..cb5d00e 100644
--- a/app/view/Partie/displayForm.html
+++ b/app/view/Partie/displayForm.html
@@ -1,9 +1,8 @@
+<?php
+ $page_title = "Formulaire d'ajout de partie";
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
-<?php $page_title = "Formulaire d'ajout de partie";
- $RACINE = ".."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
-
-
<article>
<h2>Formulaire d'ajout de partie</h2>
<div class="addjeu-form">
@@ -30,5 +29,4 @@
</div>
</article>
-
<?php include(ROOT."/app/view/Includes/footer.include.html"); ?>
diff --git a/app/view/Partie/displayValid.html b/app/view/Partie/displayValid.html
index 25c7d37..aed2a7b 100644
--- a/app/view/Partie/displayValid.html
+++ b/app/view/Partie/displayValid.html
@@ -1,7 +1,7 @@
-
-<?php $page_title = "Formulaire d'ajout de partie";
- $RACINE = "../.."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
+<?php
+ $page_title = "Formulaire d'ajout de partie";
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
<article class="msg-valide"><h2>La partie a été enregistrée !</h2></article>
<article>
diff --git a/app/view/Profil/display.html b/app/view/Profil/display.html
index a7afc27..7e94aae 100644
--- a/app/view/Profil/display.html
+++ b/app/view/Profil/display.html
@@ -1,11 +1,12 @@
-<?php $page_title = "Profil de ".$this->profil->pseudo;
- $RACINE = "../.."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
+<?php
+ $page_title = "Profil de ".$this->profil->pseudo;
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
<article>
<h2><?php echo $this->profil->pseudo; ?></h2>
<aside class="profil-image">
- <img src="<?php echo $RACINE; ?>/app/view/Includes/images/profil_42.jpg" alt="Photo de profil de <?php echo $this->profil->pseudo; ?>" />
+ <img src="<?php echo BASE_URL; ?>/images/profil_42.jpg" alt="Photo de profil de <?php echo $this->profil->pseudo; ?>" />
</aside>
<div class="row">
<ul class="col-4 pref">
@@ -26,19 +27,19 @@
<div class="col-6">
<h3 class="stat-title">Jeux préférés</h3>
<table class="jeux-preferes">
- <tr><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td></tr>
- <tr><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td></tr>
+ <tr><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td></tr>
+ <tr><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td></tr>
</table>
</div>
<div class="col-6">
<h3 class="stat-title">Meilleurs classements</h3>
<table class="jeux-preferes">
- <tr><td>1</td><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>1e</td></tr>
- <tr><td>2</td><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>2e</td></tr>
- <tr><td>3</td><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>8e</td></tr>
- <tr><td>4</td><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>9e</td></tr>
- <tr><td>5</td><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>15e</td></tr>
+ <tr><td>1</td><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>1e</td></tr>
+ <tr><td>2</td><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>2e</td></tr>
+ <tr><td>3</td><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>8e</td></tr>
+ <tr><td>4</td><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>9e</td></tr>
+ <tr><td>5</td><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>15e</td></tr>
</table>
<div class="more-link"><a href="" >Plus...</a></div>
@@ -50,18 +51,18 @@
<div class="col-6">
<h3 class="stat-title">Jeux préférés</h3>
<table class="jeux-preferes">
- <tr><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td></tr>
- <tr><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td></tr>
+ <tr><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td></tr>
+ <tr><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td></tr>
</table>
</div>
<div class="col-6">
<h3 class="stat-title">Pire classements</h3>
<table class="jeux-preferes">
- <tr><td>1</td><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>500e</td></tr>
- <tr><td>2</td><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>300e</td></tr>
- <tr><td>3</td><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>250e</td></tr>
- <tr><td>4</td><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>200e</td></tr>
- <tr><td>5</td><td><img src="<?php echo $RACINE; ?>/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>100e</td></tr>
+ <tr><td>1</td><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>500e</td></tr>
+ <tr><td>2</td><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>300e</td></tr>
+ <tr><td>3</td><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>250e</td></tr>
+ <tr><td>4</td><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>200e</td></tr>
+ <tr><td>5</td><td><img src="<?php echo BASE_URL; ?>/images/Cosmic_Encounter_(FFG).jpg" alt="logo jeu <>" /></td><td>Rencontres Cosmiques</td><td>100e</td></tr>
</table>
<div class="more-link"><a href="" >Plus...</a></div>
</div>
diff --git a/app/view/Register/displayForm.html b/app/view/Register/displayForm.html
index 26a22e9..dce6e51 100644
--- a/app/view/Register/displayForm.html
+++ b/app/view/Register/displayForm.html
@@ -1,15 +1,19 @@
-<?php session_start(); ?>
-<?php $page_title = "Formulaire d'inscription";
- $RACINE = ".."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
+<?php
+ session_start();
+
+ $page_title = "Formulaire d'inscription";
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
- <?php if(isset($_SESSION['registerErrCode'])) { // si message d'erreur
- $errCode = $_SESSION['registerErrCode'];
- $errMsg = ($errCode == 2) ? '<h3>Pseudo déjà utilisé !</h3>' : '<h3>Adresse e-mail déjà utilisée !</h3>'; // on détermine le message à afficher
- echo '<article class="msg-erreur">'.$errMsg.'</article>'; // on affiche le message
- unset($_SESSION['registerErrCode']); // on retire la variable de session
- } ?>
+ <?php
+ if(isset($_SESSION['registerErrCode'])) { // si message d'erreur
+ $errCode = $_SESSION['registerErrCode'];
+ $errMsg = ($errCode == 2) ? '<h3>Pseudo déjà utilisé !</h3>' : '<h3>Adresse e-mail déjà utilisée !</h3>'; // on détermine le message à afficher
+ echo '<article class="msg-erreur">'.$errMsg.'</article>'; // on affiche le message
+ unset($_SESSION['registerErrCode']); // on retire la variable de session
+ }
+ ?>
<article>
diff --git a/app/view/Register/displayValid.html b/app/view/Register/displayValid.html
index 3937016..cd0f288 100644
--- a/app/view/Register/displayValid.html
+++ b/app/view/Register/displayValid.html
@@ -1,6 +1,7 @@
-<?php $page_title = "Inscription réussie";
- $RACINE = "../.."; ?>
-<?php include(ROOT."/app/view/Includes/header.include.html"); ?>
+<?php
+ $page_title = "Inscription réussie";
+ include(ROOT."/app/view/Includes/header.include.html");
+?>
<article class="msg-valide"><h2>Vous êtes maintenant inscrit !</h2></article>
<article>
--
GitLab