From 055fc3fb2cf510ed6b2fe3e36828047bb42c8ff8 Mon Sep 17 00:00:00 2001
From: vbochet <vbochet@gmail.com>
Date: Tue, 3 May 2016 14:12:12 +0200
Subject: [PATCH] =?UTF-8?q?d=C3=A9but=20de=20travail=20non=20finalis=C3=A9?=
 =?UTF-8?q?=20sur=20le=20css=20pour=20ajouter=20un=20menu=20en=20haut=20de?=
 =?UTF-8?q?s=20pages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/view/Includes/header.include.html | 72 ++++++++++++++-------------
 app/view/Includes/menu.include.html   |  5 ++
 www/css/style.css                     | 18 ++++++-
 3 files changed, 59 insertions(+), 36 deletions(-)
 create mode 100644 app/view/Includes/menu.include.html

diff --git a/app/view/Includes/header.include.html b/app/view/Includes/header.include.html
index ecf38f0..a41b02f 100644
--- a/app/view/Includes/header.include.html
+++ b/app/view/Includes/header.include.html
@@ -15,44 +15,48 @@ if(!isset($_SESSION)) { // si
 <body>
 <div class="wrapper">
     <header class="row">
-        <div class="col-2 col-m-2">
-            <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>
+		<div class="header row">
+			<div class="col-2 col-m-2">
+				<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>
 
-        <div class="search-bar-conteneur col-3 col-m-3">
-            <!-- <form method="post" name="truc" class="search-bar-form">
-                <div class="search-bar-input-conteneur">
-                    <input  class="search-bar" type="text" name="machin" title="machin" />
-                </div>
+			<div class="search-bar-conteneur col-3 col-m-3">
+				<!-- <form method="post" name="truc" class="search-bar-form">
+					<div class="search-bar-input-conteneur">
+						<input  class="search-bar" type="text" name="machin" title="machin" />
+					</div>
 
-                 <button type="submit" class="glass"><img src="<?php echo BASE_URL; ?>/images/find.png" alt="icône de recherche" height="30px"/> </button>
-            </form>
-            -->
-        </div>
+					 <button type="submit" class="glass"><img src="<?php echo BASE_URL; ?>/images/find.png" alt="icône de recherche" height="30px"/> </button>
+				</form>
+				-->
+			</div>
 
-        <div class="col-4 space col-m-1">
-
-        </div>
-		<?php 
-		if(isset($_SESSION['connected']) && $_SESSION['connected'] == true) {
-		?>
-        <div class="connexion col-3 col-m-6">
-            <?php echo $_SESSION['user']->prenom.' '.$_SESSION['user']->nom; ?>
-        </div>
-		<?php 
-		}
-		else { 
-		?>
-        <div class="connexion col-3 col-m-6">
-            <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>
-		<?php 
-		} 
-		?>
+			<div class="col-4 space col-m-1">
 
+			</div>
+			<?php 
+			if(isset($_SESSION['connected']) && $_SESSION['connected'] == true) {
+			?>
+			<div class="connexion col-3 col-m-6">
+				<?php echo $_SESSION['user']->prenom.' '.$_SESSION['user']->nom; ?>
+			</div>
+			<?php 
+			}
+			else { 
+			?>
+			<div class="connexion col-3 col-m-6">
+				<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>
+			<?php 
+			} 
+			?>
+		</div>
+		
+		<?php include(ROOT."/app/view/Includes/menu.include.html"); ?>
     </header>
 	
+	
 	<div class="main" id="top">
diff --git a/app/view/Includes/menu.include.html b/app/view/Includes/menu.include.html
new file mode 100644
index 0000000..e322789
--- /dev/null
+++ b/app/view/Includes/menu.include.html
@@ -0,0 +1,5 @@
+    <nav class="row">
+		<ul>
+			<li>Un élément du menu</li>
+		</ul>
+    </nav>
diff --git a/www/css/style.css b/www/css/style.css
index 388ddaa..dbf0f13 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -12,14 +12,28 @@ body {
 
 header
 {
-    padding:5px;
+	padding:0;
     position: fixed;
     top: 0;
     right: 0;
     left: 0;
-    background:#26346D;
     height: 120px;
 	z-index:100;
+	margin-bottom: 15px;
+}
+
+.header {
+    padding:5px;
+	min-height:44px;
+    background:#26346D;
+}
+
+nav
+{
+    padding:5px;
+    background:#26346D;
+    height: 40px;
+	z-index:100;
 }
 
 footer{
-- 
GitLab