From 73e2d40ee0d82c9d68eca8db35b323db77eb5713 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Tue, 17 Mar 2020 12:20:58 +0100
Subject: move deepsearch into pages list

---
 app/view/templates/home.php | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'app/view/templates/home.php')

diff --git a/app/view/templates/home.php b/app/view/templates/home.php
index 1d15a8d..8078d4a 100644
--- a/app/view/templates/home.php
+++ b/app/view/templates/home.php
@@ -19,22 +19,6 @@
         $this->insert('homemenu', ['user' => $user, 'opt' => $opt, 'optlist' => $optlist, 'pagelist' => $pagelist, 'faviconlist' => $faviconlist, 'thumbnaillist' => $thumbnaillist, 'editorlist' => $editorlist, 'colors' => $colors]);
     ?>
 
-    <div id="deepsearchbar" class="hidephone">
-        <form action="<?= $this->url('home') ?>" method="get">
-            <input type="text" name="search" value="<?= $deepsearch ?>" id="search" placeholder="deep search">
-            <input type="checkbox" name="title" id="deeptitle" value="1" <?= $searchopt['title'] ? 'checked' : '' ?>>
-            <label for="deeptitle">title</label>
-            <input type="checkbox" name="description" id="deepdescription" value="1"  <?= $searchopt['description'] ? 'checked' : '' ?>>
-            <label for="deepdescription">description</label>
-            <input type="checkbox" name="content" id="deepcontent" value="1"  <?= $searchopt['content'] ? 'checked' : '' ?>>
-            <label for="deepcontent" title="Markdown content : MAIN, HEADER, NAV, ASIDE, FOOTER">content</label>
-            <input type="checkbox" name="other" id="deepother" value="1"  <?= $searchopt['other'] ? 'checked' : '' ?>>
-            <label for="deepother" title="Structure content : BODY, CSS, Javascript">other</label>
-            <input type="checkbox" name="case" id="deepcase" value="1"  <?= $searchopt['casesensitive'] ? 'checked' : '' ?>>
-            <label for="deepcase" title="Case sensitive or not">case sensitive</label>
-            <input type="submit" value="search">
-        </form>
-    </div>
 
 
     <main class="home">
@@ -48,6 +32,24 @@
 
                 <h2 class="hidephone">Pages (<?= count($table2) ?>)</h2>
 
+
+                <div id="deepsearchbar" class="hidephone">
+                    <form action="<?= $this->url('home') ?>" method="get">
+                        <input type="text" name="search" value="<?= $deepsearch ?>" id="deepsearch" placeholder="deep search">
+                        <input type="checkbox" name="title" id="deeptitle" value="1" <?= $searchopt['title'] ? 'checked' : '' ?>>
+                        <label for="deeptitle">title</label>
+                        <input type="checkbox" name="description" id="deepdescription" value="1"  <?= $searchopt['description'] ? 'checked' : '' ?>>
+                        <label for="deepdescription">description</label>
+                        <input type="checkbox" name="content" id="deepcontent" value="1"  <?= $searchopt['content'] ? 'checked' : '' ?>>
+                        <label for="deepcontent" title="Markdown content : MAIN, HEADER, NAV, ASIDE, FOOTER">content</label>
+                        <input type="checkbox" name="other" id="deepother" value="1"  <?= $searchopt['other'] ? 'checked' : '' ?>>
+                        <label for="deepother" title="Structure content : BODY, CSS, Javascript">other</label>
+                        <input type="checkbox" name="case" id="deepcase" value="1"  <?= $searchopt['casesensitive'] ? 'checked' : '' ?>>
+                        <label for="deepcase" title="Case sensitive or not">case sensitive</label>
+                        <input type="submit" value="search">
+                    </form>
+                </div>
+
                 <div class="scroll">
 
                     <table id="home2table">
-- 
cgit v1.2.3


From 7d1b16dce7e435caefd39975ca68a08c4f79fc03 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Mon, 23 Mar 2020 16:19:48 +0100
Subject: map integration in home

---
 app/view/templates/home.php | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

(limited to 'app/view/templates/home.php')

diff --git a/app/view/templates/home.php b/app/view/templates/home.php
index 8078d4a..204864f 100644
--- a/app/view/templates/home.php
+++ b/app/view/templates/home.php
@@ -30,8 +30,37 @@
 
             <div class="block">
 
-                <h2 class="hidephone">Pages (<?= count($table2) ?>)</h2>
+                <h2 class="hidephone">Pages (<?= count($table2) ?>) <span class="right"><a href="?display=list" <?= $display === 'list' ? 'style="color: white"' : '' ?> >list</a> / <a href="?display=map"  <?= $display === 'map' ? 'style="color: white"' : '' ?>  >map</a></span> </h2>
+
+                <?php if($display === 'map') { ?>
+
+                <!-- ___________________ M  A  P _________________________ -->
+
+                <div id="deepsearchbar">
+                    <form action="" method="get">
+                        <input type="hidden" name="display" value="map">
+                        <input type="checkbox" name="" id="orphan" checked>
+                        <label for="orphan">Show orphans pages</label>
+                        <select name="layout" id="layout">
+                            <?= options(Wcms\Model::MAP_LAYOUTS, $layout) ?>
+                        </select>
+                        <label for="layout">graph style</label>
+                        <input type="submit" value="update">
+                    </form>
+                </div>
+
+                <div id="graph"></div>
+
+                <script>
+                    var data = <?= $json ?>;
+                    console.log(data);
+                </script>
 
+                <script src="<?= Wcms\Model::jspath() ?>map.bundle.js"></script>
+
+                <?php } else { ?>
+
+                <!-- ___________________ L I S T _________________________ -->
 
                 <div id="deepsearchbar" class="hidephone">
                     <form action="<?= $this->url('home') ?>" method="get">
@@ -161,6 +190,8 @@
                     </table>
                 </div>
 
+                <?php } ?>
+
             </div>
 
         </section>
-- 
cgit v1.2.3


From 1a93d70c938f3ae2b050f3a102c961cf1cc3cefc Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Mon, 23 Mar 2020 21:04:15 +0100
Subject: filter map and orphans hide

---
 app/view/templates/home.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/view/templates/home.php')

diff --git a/app/view/templates/home.php b/app/view/templates/home.php
index 204864f..33bca81 100644
--- a/app/view/templates/home.php
+++ b/app/view/templates/home.php
@@ -30,7 +30,7 @@
 
             <div class="block">
 
-                <h2 class="hidephone">Pages (<?= count($table2) ?>) <span class="right"><a href="?display=list" <?= $display === 'list' ? 'style="color: white"' : '' ?> >list</a> / <a href="?display=map"  <?= $display === 'map' ? 'style="color: white"' : '' ?>  >map</a></span> </h2>
+                <h2 class="hidephone">Pages (<?= count($pagelistopt) ?>) <span class="right"><a href="?display=list" <?= $display === 'list' ? 'style="color: white"' : '' ?> >list</a> / <a href="?display=map"  <?= $display === 'map' ? 'style="color: white"' : '' ?>  >map</a></span> </h2>
 
                 <?php if($display === 'map') { ?>
 
@@ -39,12 +39,12 @@
                 <div id="deepsearchbar">
                     <form action="" method="get">
                         <input type="hidden" name="display" value="map">
-                        <input type="checkbox" name="" id="orphan" checked>
-                        <label for="orphan">Show orphans pages</label>
+                        <input type="checkbox" name="hideorphans" value="1" id="hideorphans" <?= $hideorphans ? 'checked' : '' ?>>
+                        <label for="hideorphans">hide orphans pages</label>
                         <select name="layout" id="layout">
                             <?= options(Wcms\Model::MAP_LAYOUTS, $layout) ?>
                         </select>
-                        <label for="layout">graph style</label>
+                        <label for="layout">graph layout</label>
                         <input type="submit" value="update">
                     </form>
                 </div>
@@ -134,7 +134,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <?php foreach ($table2 as $item) { ?>
+                            <?php foreach ($pagelistopt as $item) { ?>
                             <tr>
                                 <?php if($user->issupereditor()) { ?><td class="hidephone"><input type="checkbox" name="pagesid[]" value="<?= $item->id() ?>" id="id_<?= $item->id() ?>" form="multi"></td><?php } ?>
                                 <?php if($columns['favicon']) { ?>
-- 
cgit v1.2.3


From d17713051ca2fef29de8025fe876d417838cea7f Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Wed, 25 Mar 2020 19:53:38 +0100
Subject: graph look, add redirections, close #50

---
 app/view/templates/home.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'app/view/templates/home.php')

diff --git a/app/view/templates/home.php b/app/view/templates/home.php
index 33bca81..482ce17 100644
--- a/app/view/templates/home.php
+++ b/app/view/templates/home.php
@@ -24,7 +24,7 @@
     <main class="home">
 
 
-        <?php $this->insert('homeopt', ['opt' => $opt, 'user' => $user]) ?>
+        <?php $this->insert('homeopt', ['opt' => $opt, 'user' => $user, 'display' => $display]) ?>
 
         <section class="pages">
 
@@ -39,8 +39,10 @@
                 <div id="deepsearchbar">
                     <form action="" method="get">
                         <input type="hidden" name="display" value="map">
-                        <input type="checkbox" name="hideorphans" value="1" id="hideorphans" <?= $hideorphans ? 'checked' : '' ?>>
-                        <label for="hideorphans">hide orphans pages</label>
+                        <input type="checkbox" name="showorphans" value="1" id="showorphans" <?= $showorphans ? 'checked' : '' ?>>
+                        <label for="showorphans">show orphans pages</label>
+                        <input type="checkbox" name="showredirection" value="1" id="showredirection" <?= $showredirection ? 'checked' : '' ?>>
+                        <label for="showredirection">show redirections</label>
                         <select name="layout" id="layout">
                             <?= options(Wcms\Model::MAP_LAYOUTS, $layout) ?>
                         </select>
-- 
cgit v1.2.3