From 3c3721de29b7f9bf3d1fb57bfdd1991759ad768b Mon Sep 17 00:00:00 2001
From: vbochet <vbochet@gmail.com>
Date: Thu, 28 Apr 2016 11:47:13 +0200
Subject: [PATCH] =?UTF-8?q?Modification=20du=20syst=C3=A8me=20d'URL=20dans?=
=?UTF-8?q?=20les=20vues=20;=20d=C3=A9placement=20des=20images=20et=20du?=
=?UTF-8?q?=20CSS=20dans=20www/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/view/Includes/header.include.html | 12 ++++++------
{app/view/Includes => www}/css/style.css | 0
.../images/Cosmic_Encounter_(FFG).jpg | Bin
.../view/Includes => www}/images/dummy_web_page.jpg | Bin
{app/view/Includes => www}/images/find.png | Bin
{app/view/Includes => www}/images/logo.png | Bin
{app/view/Includes => www}/images/plus-symbol.png | Bin
{app/view/Includes => www}/images/profil_42.jpg | Bin
www/index.php | 1 +
9 files changed, 7 insertions(+), 6 deletions(-)
rename {app/view/Includes => www}/css/style.css (100%)
rename {app/view/Includes => www}/images/Cosmic_Encounter_(FFG).jpg (100%)
rename {app/view/Includes => www}/images/dummy_web_page.jpg (100%)
rename {app/view/Includes => www}/images/find.png (100%)
rename {app/view/Includes => www}/images/logo.png (100%)
rename {app/view/Includes => www}/images/plus-symbol.png (100%)
rename {app/view/Includes => www}/images/profil_42.jpg (100%)
diff --git a/app/view/Includes/header.include.html b/app/view/Includes/header.include.html
index 98b29fd..2fc4832 100644
--- a/app/view/Includes/header.include.html
+++ b/app/view/Includes/header.include.html
@@ -4,15 +4,15 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title><?php echo $page_title; ?></title>
- <link rel="stylesheet" href="<?php echo $RACINE; ?>/app/view/Includes/css/style.css">
+ <link rel="stylesheet" href="<?php echo BASE_URL; ?>/css/style.css">
<link href='https://fonts.googleapis.com/css?family=Work+Sans' rel='stylesheet' type='text/css'>
</head>
<body>
<div class="wrapper">
<header class="row">
<div class="col-2 col-m-2">
- <a href="<?php echo $RACINE; ?>/www">
- <img class="logo-image" src="<?php echo $RACINE; ?>/app/view/Includes/images/logo.png" alt="logo du site web"/>
+ <a href="<?php echo BASE_URL; ?>">
+ <img class="logo-image" src="<?php echo BASE_URL; ?>/images/logo.png" alt="logo du site web"/>
</a>
</div>
@@ -22,7 +22,7 @@
<input class="search-bar" type="text" name="machin" title="machin" />
</div>
- <button type="submit" class="glass"><img src="<?php echo $RACINE; ?>/app/view/Includes/images/find.png" alt="icône de recherche" height="30px"/> </button>
+ <button type="submit" class="glass"><img src="<?php echo BASE_URL; ?>/images/find.png" alt="icône de recherche" height="30px"/> </button>
</form>
-->
</div>
@@ -31,8 +31,8 @@
</div>
<div class="connexion col-3 col-m-6">
- <div class="signin"><a class="connexion-link" href="<?php echo $RACINE; ?>/www/inscription">Inscription</a></div>
- <div class="login"><a class="connexion-link" href="<?php echo $RACINE; ?>/www/connexion">Connexion</a></div>
+ <div class="signin"><a class="connexion-link" href="<?php echo BASE_URL; ?>/inscription">Inscription</a></div>
+ <div class="login"><a class="connexion-link" href="<?php echo BASE_URL; ?>/connexion">Connexion</a></div>
</div>
</header>
diff --git a/app/view/Includes/css/style.css b/www/css/style.css
similarity index 100%
rename from app/view/Includes/css/style.css
rename to www/css/style.css
diff --git a/app/view/Includes/images/Cosmic_Encounter_(FFG).jpg b/www/images/Cosmic_Encounter_(FFG).jpg
similarity index 100%
rename from app/view/Includes/images/Cosmic_Encounter_(FFG).jpg
rename to www/images/Cosmic_Encounter_(FFG).jpg
diff --git a/app/view/Includes/images/dummy_web_page.jpg b/www/images/dummy_web_page.jpg
similarity index 100%
rename from app/view/Includes/images/dummy_web_page.jpg
rename to www/images/dummy_web_page.jpg
diff --git a/app/view/Includes/images/find.png b/www/images/find.png
similarity index 100%
rename from app/view/Includes/images/find.png
rename to www/images/find.png
diff --git a/app/view/Includes/images/logo.png b/www/images/logo.png
similarity index 100%
rename from app/view/Includes/images/logo.png
rename to www/images/logo.png
diff --git a/app/view/Includes/images/plus-symbol.png b/www/images/plus-symbol.png
similarity index 100%
rename from app/view/Includes/images/plus-symbol.png
rename to www/images/plus-symbol.png
diff --git a/app/view/Includes/images/profil_42.jpg b/www/images/profil_42.jpg
similarity index 100%
rename from app/view/Includes/images/profil_42.jpg
rename to www/images/profil_42.jpg
diff --git a/www/index.php b/www/index.php
index d51346b..f9c2c0a 100644
--- a/www/index.php
+++ b/www/index.php
@@ -11,6 +11,7 @@
//
define("ROOT", realpath(__dir__."/..")); // on définit une sorte de variable globale, nommée ROOT, qui contient le répertoire racine de notre site. On s'en servira par la suite lorsque l'on voudra accéder à tel ou tel fichier (vue, contrôleur, modèle ou autre...
+define("BASE_URL", "http://localhost/projet-web-2016/www"); // on définit une sorte de variable globale, nommée BASE_URL, qui contient le répertoire du point d'entrée de notre site, qui contient les images, css, etc.
require_once(ROOT . "/app/kernel/Kernel.php"); // première chose à faire : on inclut le fichier noyau, qui va gérer les différentes actions à effectuer (trouver quelle page est demandée, quel contrôleur appeler, quelle vue afficher, etc.)
--
GitLab