From 4d5de94f8ba96ba316ee0b85193bdecead7f1a92 Mon Sep 17 00:00:00 2001
From: Adrien W <git@rob-air.fr>
Date: Thu, 30 Sep 2021 20:18:31 +0200
Subject: [PATCH] lots of small improvements, new pages, added htaccess for url
 rewriting

---
 .htaccess              |  8 ++++++++
 assets/style.css       | 15 +++++++++++----
 includes/_mainmenu.php | 10 +---------
 includes/_menus.php    | 30 +++++++++++++++---------------
 index.php              |  1 -
 5 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/.htaccess b/.htaccess
index f0ef49a..46688b8 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,5 +1,13 @@
+# Apache rules
 RewriteEngine On
 RewriteRule ^index\.html$ /index.php [L]
 RewriteRule ^cgu\.html$ /cgu.php [L]
 RewriteRule ^interventions\.html$ /interventions.php [L]
 RewriteRule ^solutions\.html$ /solutions.php [L]
+
+
+# nginx rules
+#rewrite ^index\.html$ /index.php last
+#rewrite ^cgu\.html$ /cgu.php last
+#rewrite ^interventions\.html$ /interventions.php last
+#rewrite ^solutions\.html$ /solutions.php last
diff --git a/assets/style.css b/assets/style.css
index 7121425..29e7c73 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -68,24 +68,31 @@ body {
     font-size: 1em;
 }
 
-.clawd a {
+.clawd p a {
     color: var(--tartorange);
     text-decoration: none;
     border-bottom: 1px solid var(--tartorange);
 }
 
-.clawd a:hover {
+.clawd p a:hover {
     color: #000000;
     background-color: var(--yellowryb);
     text-decoration: none;
 }
 
+.clawd #mainmenu a.item {
+    font-family: var(--textfont);
+    font-weight: bolder;
+}
+
+.clawd #mainmenu a.item.active {
+    border-bottom-color: var(--tartorange);
+}
+
 .clawd .footer a {
-    border-bottom: none;
 }
 
 .clawd .footer a:hover {
-    background-color: transparent;
     color: var(--yellowryblighter) !important;
 }
 
diff --git a/includes/_mainmenu.php b/includes/_mainmenu.php
index 96293a0..d872f91 100644
--- a/includes/_mainmenu.php
+++ b/includes/_mainmenu.php
@@ -1,4 +1,4 @@
-        <div class="ui container">
+        <div class="ui container" id="mainmenu">
             <div class="ui large secondary inverted pointing menu">
                 <a class="toc item">
                     <i class="sidebar icon"></i>
@@ -11,13 +11,5 @@
                 }
                 ?>
 
-                <a href="#" class="ui right floated dropdown item">
-                    Aide <i class="dropdown icon"></i>
-                    <div class="menu">
-                        <div class="item">FAQ</div>
-                        <div class="item">Support</div>
-                        <div class="item">Documentation</div>
-                    </div>
-                </a>
             </div>
         </div>
diff --git a/includes/_menus.php b/includes/_menus.php
index b522e48..e325698 100644
--- a/includes/_menus.php
+++ b/includes/_menus.php
@@ -1,24 +1,24 @@
 <!-- Following Menu -->
 <div class="ui large top fixed hidden menu">
     <div class="ui container">
-        <a class="active item">Accueil</a>
-        <a class="item" href="solutions.html">Nextcloud</a>
-        <a href="#" class="ui right floated dropdown item">
-            Aide <i class="dropdown icon"></i>
-            <div class="menu">
-                <div class="item">FAQ</div>
-                <div class="item">Support</div>
-                <div class="item">Documentation</div>
-            </div>
-        </a>
+        <?php
+        foreach ($mainMenu as $item) {
+            $active = $currentPage==$item? 'active ': '';
+            echo '
+                <a class="'.$active.'item" href="'.$item['key'].'.html" target="_self">'.$item['name'].'</a>';
+        }
+        ?>
+
     </div>
 </div>
 
 <!-- Sidebar Menu -->
 <div class="ui vertical inverted sidebar menu">
-    <a class="active item">Accueil</a>
-    <a class="item" href="solutions.html">Nextcloud</a>
-    <a class="item">FAQ</a>
-    <a class="item">Support</a>
-    <a class="item">Documentation</a>
+    <?php
+    foreach ($mainMenu as $item) {
+        $active = $currentPage==$item? 'active ': '';
+        echo '
+                <a class="'.$active.'item" href="'.$item['key'].'.html" target="_self">'.$item['name'].'</a>';
+    }
+    ?>
 </div>
diff --git a/index.php b/index.php
index aea8024..9ae923e 100644
--- a/index.php
+++ b/index.php
@@ -25,7 +25,6 @@ $currentPage = $pages['index'];
             <h1 class="ui header" id="logo">CLAWD.FR</h1>
             <h2>HÉBERGEUR ENGAGÉ</h2>
             <span class="intro">Vous avez des besoins en stockage de fichiers en ligne?<br>Vous voulez sortir des griffes des GAFAM sans vous ruiner?<br>Vous êtes au bon endroit, laissez-vous guider!</span>
-            <div class="ui huge primary button">Dites-moi tout <i class="right arrow icon"></i></div>
         </div>
 
     </div>