From 4ba652bf17dcb5e4b116258d5fbffd2f6469075a Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@kobold.cafe>
Date: Wed, 30 Dec 2020 19:42:46 +0100
Subject: [PATCH] fix: fix header and footer

---
 components/footer-content.php | 29 +++++++++++++++++++++++++++++
 components/header-content.php |  6 ++++++
 components/logo.php           |  6 +++---
 components/navbar-footer.php  | 24 ------------------------
 components/navbar-pages.php   | 34 ++++++----------------------------
 footer.php                    |  3 +--
 header.php                    | 17 ++++++-----------
 7 files changed, 51 insertions(+), 68 deletions(-)
 create mode 100644 components/footer-content.php
 create mode 100644 components/header-content.php
 delete mode 100644 components/navbar-footer.php

diff --git a/components/footer-content.php b/components/footer-content.php
new file mode 100644
index 0000000..7f6a7f3
--- /dev/null
+++ b/components/footer-content.php
@@ -0,0 +1,29 @@
+<footer>
+  <ul class="social">
+    <li class="social-li"><a class="social-link" href="https://twitter.com/kazhnuz" alt="Twitter"><i class="fa fa-fw fa-twitter"></i></a></li>
+    <li class="social-li"><a class="social-link" href="https://octodon.social/users/kazhnuz" alt="Mastodon"><i class="fa fa-fw fa-mastodon"></i></a></li>
+    <li class="social-li"><a class="social-link" href="https://framasphere.org/u/kazhnuz" alt="Diaspora"><i class="fa fa-fw fa-diaspora"></i></a></li>
+    <li class="social-li"><a class="social-link" href="https://deviantart.com/kazhnuz" alt="DeviantART"><i class="fa fa-fw fa-deviantart"></i></a></li>
+    <li class="social-li"><a class="social-link" href="https://github.com/kazhnuz" alt="Github"><i class="fa fa-fw fa-github"></i></a></li>
+    <li class="social-li"><a class="social-link" href="https://git.kobold.cafe/kazhnuz" alt="Gitlab"><i class="fa fa-fw fa-git"></i></a></li>
+  </ul>
+
+  <div class="footer-collumns">
+    <div>
+      <p>Ce site fait partie de <a href="https://kobold.city">kobold.city</a></p>
+      <p>Kobold City et les différents sites/services qui le composent sont fourni "tel-quel", sans garantie. Ce sont des sites fait pour le fun, et fourni en tant que tel sur un petit serveur random maintenue par une seule personne.</p>
+      <p>Cependant, toute critique, remarque, etc. est la bienvenue. Pour cela, vous pouvez me contacter à kazhnuz [at] kobold [point] cafe ou sur les réseaux sociaux visible plus haut</p>
+    </div>
+
+    <div>
+      <p>Ce site est propulsé par <a href="https://picturepan2.github.io/spectre/">Spectre</a> et <a href="https://forkawesome.github.io/Fork-Awesome/">Fork-Awesome</a> et <a href="https://wordpress.org">Wordpress</a></p>
+      <p>Le style utilisé est <a href="https://git.kobold.cafe/kazhnuz/kspace.css">kazhnuz.css</a>, sous licence CC BY-SA et GPL v3.</p>
+      <p>Le code source du theme wordpress est accessible à <a href="https://git.kobold.cafe/kazhnuz/kspace-wordpress-theme">l'adresse suivante</a>.</p>
+    </div>
+
+    <div>
+      <p>Les contenus sont diffusé sous licence Creative Common Attribution - Partage à l'Identique 4.0 - hors mention contraire.</p>
+      <p>Ces licences vous autorise à partager et copier mes travaux, tant que vous me citiez en source, et que vous autorisez la même chose pour les travaux qui en seraient dérivés. N'hésitez pas à partager ! <i class="color-red fa fa-heart"></i></p>
+    </div>
+  </div>
+</footer>
diff --git a/components/header-content.php b/components/header-content.php
new file mode 100644
index 0000000..b9824a3
--- /dev/null
+++ b/components/header-content.php
@@ -0,0 +1,6 @@
+<header id="page-header">
+  <div class="header-collumns">
+    <?php include(TEMPLATEPATH . '/components/logo.php'); ?>
+    <?php include(TEMPLATEPATH . '/components/navbar-pages.php'); ?>
+  </div>
+</header>
diff --git a/components/logo.php b/components/logo.php
index af2f983..9093918 100644
--- a/components/logo.php
+++ b/components/logo.php
@@ -1,3 +1,3 @@
-<section class="container-fluid">
-  <h1><a href="<?php echo site_url(); ?>"><img src="<?php echo get_template_directory_uri();?>/img/logo.png"></a></h1>
-</section>
+<div class="logo-area">
+    <h1><a href="<?php echo site_url(); ?>"><img src="<?php echo get_template_directory_uri();?>/img/logo.png" alt="Kazhnuz"/></a></h1>
+</div>
diff --git a/components/navbar-footer.php b/components/navbar-footer.php
deleted file mode 100644
index 9a4d388..0000000
--- a/components/navbar-footer.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<footer class="navbar navbar-expand-lg navbar-dark bg-dark">
-  <div class="container-fluid">
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#SecondNavbar" aria-controls="SecondNavbar" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
-
-  <div class="collapse navbar-collapse" id="SecondNavbar">
-    <ul class="navbar-nav mr-auto mt-2 mt-lg-0">
-      <li class="nav-item inactive">
-        CC BY-SA 2013-<?php print(date('Y')); ?> <strong><?php bloginfo('name'); ?></strong>
-      </li>
-    </ul>
-
-    <ul class="navbar-nav my-2 my-lg-0">
-      <li class="nav-item active">
-        <a class="nav-link" href="feed:<?php bloginfo('rss2_url'); ?>"><i class="fa fa-fw fa-rss"></i></a>
-      </li>
-      <li class="nav-item active">
-        <a class="nav-link" href="https://twitter.com/qdouze_blog/"><i class="fa fa-fw fa-twitter"></i></a>
-      </li>
-    </ul>
-  </div>
-  </div>
-</footer>
diff --git a/components/navbar-pages.php b/components/navbar-pages.php
index 3b60e6f..f276c0f 100644
--- a/components/navbar-pages.php
+++ b/components/navbar-pages.php
@@ -1,28 +1,6 @@
-<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
-  <div class="container-fluid">
-  <a class="navbar-brand" href="<?php echo site_url(); ?>" id="" ><img src="<?php echo get_template_directory_uri();?>/img/brand-icon.png" alt="Quarante-Douze"></a>
-
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
-
-  <div class="collapse navbar-collapse" id="navbarSupportedContent">
-    <ul class="navbar-nav mr-auto">
-      <?php $pages = get_pages();
-      if ( $pages ) {
-        foreach( $pages as $page ) {
-          echo '<li class="nav-item">';
-          echo '<a class="nav-link" href="' . get_page_link( $page->ID ) . '">'. $page->post_title .'</a>';
-          echo '</li>';
-        }
-      }?>
-    </ul>
-    
-    <ul class="navbar-nav my-2 my-lg-0">
-      <li class="form">
-        <?php include(TEMPLATEPATH . '/components/searchform.php'); ?>
-      </li>
-    </ul>
-  </div>
-  </div>
-</nav>
+<div class="navbar-area">
+  <!-- <a href="/blog.html" class="btn btn-navbar">Blog</a> -->
+  <!-- <a href="/crea.html" class="btn btn-navbar">Romans</a> -->
+  <!-- <a href="/apropos.html" class="btn btn-navbar">A propos</a> -->
+  <a href="<?php bloginfo('rss2_url'); ?>" class="btn btn-navbar"><i class="fa fa-rss"></i></a>
+</div>
diff --git a/footer.php b/footer.php
index 06cae27..4020679 100644
--- a/footer.php
+++ b/footer.php
@@ -1,8 +1,7 @@
 	  </div>
-  </section>
-  <?php include(TEMPLATEPATH . '/components/navbar-footer.php'); ?>
   </div>
 
+	<?php include(TEMPLATEPATH . '/components/footer-content.php'); ?>
   <?php wp_footer(); ?>
   <script src="<?php echo get_template_directory_uri();?>/dep/jquery/js/jquery.min.js"></script>
 </body>
diff --git a/header.php b/header.php
index ea51b11..251c001 100644
--- a/header.php
+++ b/header.php
@@ -12,23 +12,18 @@
 
   <?php wp_head(); ?>
   <?php include(TEMPLATEPATH . '/components/opengraph.php'); ?>
-
-		<!-- mon icon -->
 	<link rel="shortcut icon" href="img/favicon.png">
 
-		<!-- framework utilisés -->
+	<!-- framework utilisés -->
 	<link href="<?php echo get_template_directory_uri() . "/dep/spectre/css/spectre.min.css"; ?>" rel="stylesheet"/>
 	<link href="<?php echo get_template_directory_uri() . "/dep/fork-awesome/css/fork-awesome.min.css"; ?>" rel="stylesheet"/>
 
+	<!-- CSS -->
 	<link href="<?php bloginfo('stylesheet_url'); ?>" rel="stylesheet"/>
 </head>
 
+<!-- Début du vrai HTML -->
 <body>
-  <div id="wrapper" class="card">
-    <header>
-      <?php include(TEMPLATEPATH . '/components/navbar-pages.php'); ?>
-	    <?php include(TEMPLATEPATH . '/components/logo.php'); ?>
-	    <?php include(TEMPLATEPATH . '/components/navbar-category.php'); ?>
-    </header>
-    <section class="container-fluid">
-      <div class="row">
+  <div id="wrapper">
+    <?php include(TEMPLATEPATH . '/components/header-content.php'); ?>
+    <div class="container-blog">