From 74ccedd6544daac0845a044b5e6d71d577578c69 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Sun, 7 Oct 2018 05:55:26 +0200
Subject: 2.9 map + filter fix + markdownextra

---
 public/w/home.php  | 49 ++++++++++++++++++++++++++++++++++---------------
 public/w/index.php |  2 ++
 public/w/menu.php  |  4 +---
 3 files changed, 37 insertions(+), 18 deletions(-)

(limited to 'public/w')

diff --git a/public/w/home.php b/public/w/home.php
index 7115918..3094d03 100644
--- a/public/w/home.php
+++ b/public/w/home.php
@@ -9,27 +9,27 @@ echo '<section class="home">';
 if ($app->session() >= $app::EDITOR) {
 
     $app->bddinit($config);
-    $opt = new Opt(Art::classvarlist());
-
-    if(!empty($_GET)) {
-    
-            $_SESSION['opt'] = $_GET;
-            $opt->hydrate($_GET);
-
-    }
-    if(isset($_GET['submit']) && $_GET['submit'] == 'reset') {
-        $opt = new Opt(Art::classvarlist());
-    } elseif(isset($_SESSION['opt'])) {
-        $opt->hydrate($_SESSION['opt']);
-
-    }
 
+    $opt = new Opt(Art::classvarlist());
     $opt->setcol(['id', 'tag', 'lien', 'contenu', 'intro', 'titre', 'datemodif', 'datecreation', 'secure']);
     $table = $app->getlisteropt($opt);
     $app->listcalclien($table);
     $opt->settaglist($table);
+    $opt->submit();
+    
+    
+    
+
+   
+
+   
+
+ 
+
+
     $opt->setcol(['id', 'tag', 'lien', 'contenu', 'intro', 'titre', 'datemodif', 'datecreation', 'secure', 'liento']);
 
+
     $aff->option($app, $opt);
 
     $filtertagfilter = $app->filtertagfilter($table, $opt->tagfilter(), $opt->tagcompare());
@@ -55,8 +55,27 @@ if ($app->session() >= $app::EDITOR) {
     $app->artlistsort($table2, $opt->sortby(), $opt->order());
 
 
+    echo '<div id="flex">';
+    
+    
+    $aff->home2table($app, $table2, $app->getlister());   
+
+
+
+
+    echo '<div id="map">';
+    $aff->mapheader();    
+    if(isset($_GET['map'])) {
+        $aff->mermaid($app->map($table2));
+    }
+    echo '</div>';
+
+
+
+
+
+    echo '</div>';
 
-    $aff->home2table($app, $table2, $app->getlister());
 }
 
 
diff --git a/public/w/index.php b/public/w/index.php
index 887cc9a..f37899f 100644
--- a/public/w/index.php
+++ b/public/w/index.php
@@ -4,6 +4,8 @@
 
 session_start();
 
+
+
 require('../../vendor/autoload.php');
 require('../../fn/fn.php');
 
diff --git a/public/w/menu.php b/public/w/menu.php
index 423ef08..8e89ed1 100644
--- a/public/w/menu.php
+++ b/public/w/menu.php
@@ -42,10 +42,8 @@ if ($app->session() >= $app::EDITOR) {
 
 
 
-    } elseif ($_GET['aff'] == 'map' && $app->session() >= $app::INVITE) {
-        $app->bddinit($config);
-        $aff->map($app, $config->domain());
     } else {
+        
     echo '<h1>Private</h1><p>You dont have the permission to access this page.</p>';
 
     }
-- 
cgit v1.2.3