From cdd3895f772d60404c73abf9067b0f0a09e4ebf2 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Wed, 22 Jan 2020 02:14:11 +0100
Subject: admin use actual interface style

---
 app/view/templates/admin.php | 389 +++++++++++++++++++++----------------------
 1 file changed, 189 insertions(+), 200 deletions(-)

(limited to 'app/view')

diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php
index f7d25b3..7186f26 100644
--- a/app/view/templates/admin.php
+++ b/app/view/templates/admin.php
@@ -10,284 +10,273 @@
 
     <main class="admin">
 
-        <section>
+    <nav class="admin">
+
+        <div class="block">
+            <h1>Administration</h1>
+            
+            <div class="scroll">
+                <ul>
+                    <li><a href="#home-page">Home page</a></li>
+                    <li><a href="#page-creation">Page creation</a></li>
+                    <li><a href="#alert-pages">Alert Pages</a></li>
+                    <li><a href="#render">Render</a></li>
+                    <li><a href="#css">CSS</a></li>
+                    <li><a href="#databases">Databases</a></li>
+                    <li><a href="#interface">Interface</a></li>
+                    <li><a href="#tracking">Tracking</a></li>
+                </ul>
+                
+                <form action="<?= $this->url('adminupdate') ?>" method="post" id="admin">
+                    <input type="submit" value="Update configuration">
+                </form>
+            </div>
+        </div>
+    </nav>
+
+        <section class="admin">
 
             <div class="block">
 
-                <h1>Administration</h1>
                 
                 <div class="scroll">
                         
-                    <form action="<?= $this->url('adminupdate') ?>" method="post">
-
-
-                        <article>
-
-
-                            <input type="submit" value="Update configuration">
-                        </article>
-
-                        <article>
-
-                            <h2>Home page</h2>
-
-                            <p>Here you can set the home-page view for visitors.</p>
-
-                            <div class="radio">
-                                <input type="radio" name="homepage" value="default" id="default" <?= Wcms\Config::homepage() === 'default' ? 'checked' : '' ?>>
-                                <label for="default">default</label>
-                            </div>
-
-                            <div class="radio">
-                                <input type="radio" name="homepage" value="search" id="searchbar" <?= Wcms\Config::homepage() === 'search' ? 'checked' : '' ?>>
-                                <label for="searchbar">search bar</label>
-                            </div>
-
-                            <div class="radio">
-                                <input type="radio" name="homepage" value="redirect" id="redirect" <?= Wcms\Config::homepage() === 'redirect' ? 'checked' : '' ?>>
-                                <label for="redirect">redirect to page</label>
-                            </div>
-
-                            <select name="homeredirect" id="homeredirect">
-                                <option value="" <?= Wcms\Config::homeredirect() === null ? 'selected' : '' ?>>--select page to redirect--</option>
-
-                                <?php
-                                foreach ($pagelist as $page) {
-                                    ?>
-                                    <option value="<?= $page ?>" <?= Wcms\Config::homeredirect() === $page ? 'selected' : '' ?>><?= $page ?></option>
-                                <?php
-                                }
-
-
-                                ?>
-                            </select>
-
-                        </article>
-
-                        <article>
 
-                            <h2>Page creation</h2>
+                    <h2 id="home-page">Home page</h2>
 
-                            <p>What really happend when you create a new page</p>
+                    <p>Here you can set the home-page view for visitors.</p>
 
-                            <label for="defaultprivacy">Default privacy</label>
-                            <select name="defaultprivacy" id="defaultprivacy">
-                                <option value="0" <?= Wcms\Config::defaultprivacy() == 0 ? 'selected' : '' ?>>public</option>
-                                <option value="1" <?= Wcms\Config::defaultprivacy() == 1 ? 'selected' : '' ?>>private</option>
-                                <option value="2" <?= Wcms\Config::defaultprivacy() == 2 ? 'selected' : '' ?>>not published</option>
-                            </select>
+                    <div class="radio">
+                        <input type="radio" name="homepage" value="default" id="default" <?= Wcms\Config::homepage() === 'default' ? 'checked' : '' ?> form="admin">
+                        <label for="default">default</label>
+                    </div>
 
+                    <div class="radio">
+                        <input type="radio" name="homepage" value="search" id="searchbar" <?= Wcms\Config::homepage() === 'search' ? 'checked' : '' ?> form="admin">
+                        <label for="searchbar">search bar</label>
+                    </div>
 
+                    <div class="radio">
+                        <input type="radio" name="homepage" value="redirect" id="redirect" <?= Wcms\Config::homepage() === 'redirect' ? 'checked' : '' ?> form="admin">
+                        <label for="redirect">redirect to page</label>
+                    </div>
 
+                    <select name="homeredirect" id="homeredirect" form="admin">
+                        <option value="" <?= Wcms\Config::homeredirect() === null ? 'selected' : '' ?>>--select page to redirect--</option>
 
-
-                            <label for="defaultpage">Or, create new page BODY based on an already existing one</label>
-                            <select name="defaultpage" id="defaultpage">
-                                <option value="" <?= Wcms\Config::defaultpage() === '' || !$defaultpageexist ? 'selected' : '' ?>>--use default BODY element--</option>
-                                <?php
-                                foreach ($pagelist as $page) {
-                                    ?>
-                                    <option value="<?= $page ?>" <?= Wcms\Config::defaultpage() === $page ? 'selected' : '' ?>><?= $page ?></option>
-                                <?php    }
-                                ?>
-                            </select>
-
-                            <?php
-                            if (empty(!$defaultpageexist || Wcms\Config::defaultpage())) {
-                                ?>
-                                <label for="defaultbody">Edit default BODY element</label>
-                                <textarea name="defaultbody" id="defaultbody" cols="30" rows="10"><?= Wcms\Config::defaultbody() ?></textarea>
-                            <?php
-                            }
+                        <?php
+                        foreach ($pagelist as $page) {
                             ?>
-
-                        </article>
-
-                        <article>
-
-
-
-                            <h2>Alert pages</h2>
-
-                            <h4>Common options</h4>
-
-                            <label for="alerttitle">H1 Title</label>
-                            <input type="text" name="alerttitle" id="alerttitle" value="<?= Wcms\Config::alerttitle() ?>">
+                            <option value="<?= $page ?>" <?= Wcms\Config::homeredirect() === $page ? 'selected' : '' ?>><?= $page ?></option>
+                        <?php
+                        }
 
 
-                            <label for="alertlink">Link to this page (for visitors)</label>
-                            <select name="alertlink" id="alertlink">
-                                <option value="" <?= empty(Wcms\Config::alertlink()) ? 'selected' : '' ?>>--No link--</option>
-                                <?php
-                                foreach ($pagelist as $page) {
-                                    ?>
-                                    <option value="<?= $page ?>" <?= Wcms\Config::alertlink() === $page ? 'selected' : '' ?>><?= $page ?></option>
-                                <?php    }
-                                ?>
-                            </select>
+                        ?>
+                    </select>
 
 
-                            <label for="alertlinktext">Link text</label>
-                            <input type="text" name="alertlinktext" id="alertlinktext" value="<?= Wcms\Config::alertlinktext() ?>">
+                    <h2 id="page-creation">Page creation</h2>
 
+                    <p>What really happend when you create a new page</p>
 
+                    <label for="defaultprivacy">Default privacy</label>
+                    <select name="defaultprivacy" id="defaultprivacy" form="admin">
+                        <option value="0" <?= Wcms\Config::defaultprivacy() == 0 ? 'selected' : '' ?>>public</option>
+                        <option value="1" <?= Wcms\Config::defaultprivacy() == 1 ? 'selected' : '' ?>>private</option>
+                        <option value="2" <?= Wcms\Config::defaultprivacy() == 2 ? 'selected' : '' ?>>not published</option>
+                    </select>
 
-                            <h4>Un-existing</h4>
 
-                            <label for="existnot">Text to show when a page does not exist yet.</label>
-                            <i>This will also be shown as a tooltip over links.</i>
-                            <input type="text" name="existnot" id="existnot" value="<?= Wcms\Config::existnot() ?>">
 
-                            <div class="checkbox">
-                                <input type="hidden" name="existnotpass" value="0">
-                                <input type="checkbox" name="existnotpass" id="existnotpass" value="1" <?= Wcms\Config::existnotpass() ? 'checked' : '' ?>>
-                                <label for="existnotpass">Ask for password</label>
-                            </div>
 
-                            <h4>Private</h4>
 
-                            <label for="private">Text to show when a page is private.</label>
-                            <input type="text" name="private" id="private" value="<?= Wcms\Config::private() ?>">
-
-                            <div class="checkbox">
-                                <input type="hidden" name="privatepass" value="0">
-                                <input type="checkbox" name="privatepass" id="privatepass" value="1" <?= Wcms\Config::privatepass() ? 'checked' : '' ?>>
-                                <label for="privatepass">Ask for password</label>
-                            </div>
+                    <label for="defaultpage">Or, create new page BODY based on an already existing one</label>
+                    <select name="defaultpage" id="defaultpage" form="admin">
+                        <option value="" <?= Wcms\Config::defaultpage() === '' || !$defaultpageexist ? 'selected' : '' ?>>--use default BODY element--</option>
+                        <?php
+                        foreach ($pagelist as $page) {
+                            ?>
+                            <option value="<?= $page ?>" <?= Wcms\Config::defaultpage() === $page ? 'selected' : '' ?>><?= $page ?></option>
+                        <?php    }
+                        ?>
+                    </select>
 
-                            <h4>Not published</h4>
+                    <?php
+                    if (empty(!$defaultpageexist || Wcms\Config::defaultpage())) {
+                        ?>
+                        <label for="defaultbody">Edit default BODY element</label>
+                        <textarea name="defaultbody" id="defaultbody" cols="30" rows="10" form="admin"><?= Wcms\Config::defaultbody() ?></textarea>
+                    <?php
+                    }
+                    ?>
 
-                            <label for="notpublished">Text to show when a page is not published.</label>
-                            <input type="text" name="notpublished" id="notpublished" value="<?= Wcms\Config::notpublished() ?>">
 
-                            <div class="checkbox">
-                                <input type="hidden" name="notpublishedpass" value="0">
-                                <input type="checkbox" name="notpublishedpass" id="notpublishedpass" value="1" <?= Wcms\Config::notpublishedpass() ? 'checked' : '' ?>>
-                                <label for="notpublishedpass">Ask for password</label>
-                            </div>
+                    <h2 id="alert-pages">Alert pages</h2>
 
-                            <h4>CSS</h4>
+                    <h4>Common options</h4>
 
-                            <div class="checkbox">
-                                <input type="hidden" name="alertcss" value="0">
-                                <input type="checkbox" name="alertcss" id="alertcss" value="1" <?= Wcms\Config::alertcss() ? 'checked' : '' ?>>
-                                <label for="alertcss">Use global.css for those page as well</label>
-                            </div>
+                    <label for="alerttitle">H1 Title</label>
+                    <input type="text" name="alerttitle" id="alerttitle" value="<?= Wcms\Config::alerttitle() ?>" form="admin">
 
-                            <p>
-                                <i>You can use <code>body.alert</code> class to specify style.</i>
-                            </p>
 
-                        </article>
-                        
-                        
-                        <article>
-                            
+                    <label for="alertlink">Link to this page (for visitors)</label>
+                    <select name="alertlink" id="alertlink" form="admin">
+                        <option value="" <?= empty(Wcms\Config::alertlink()) ? 'selected' : '' ?>>--No link--</option>
+                        <?php
+                        foreach ($pagelist as $page) {
+                            ?>
+                            <option value="<?= $page ?>" <?= Wcms\Config::alertlink() === $page ? 'selected' : '' ?>><?= $page ?></option>
+                        <?php    }
+                        ?>
+                    </select>
 
-                            <h2>Render</h2>
 
-                            <div class="checkbox">
-                                <input type="hidden" name="reccursiverender" value="0">
-                                <input type="checkbox" name="reccursiverender" id="reccursiverender" value="1" <?= Wcms\Config::reccursiverender() ? 'checked' : '' ?>>
-                                <label for="reccursiverender">Reccursive render</label>
-                            </div>
+                    <label for="alertlinktext">Link text</label>
+                    <input type="text" name="alertlinktext" id="alertlinktext" value="<?= Wcms\Config::alertlinktext() ?>" form="admin">
 
 
-                            <h4>Links</h4>
 
-                            <div class="checkbox">
-                                <input type="hidden" name="externallinkblank" value="0">
-                                <input type="checkbox" name="externallinkblank" id="externallinkblank" value="1" <?= Wcms\Config::externallinkblank() ? 'checked' : '' ?>>
-                                <label for="externallinkblank">Open external links in new tab</label>
-                            </div>
+                    <h4>Un-existing</h4>
 
-                            <div class="checkbox">
-                                <input type="hidden" name="internallinkblank" value="0">
-                                <input type="checkbox" name="internallinkblank" id="internallinkblank" value="1" <?= Wcms\Config::internallinkblank() ? 'checked' : '' ?>>
-                                <label for="internallinkblank">Open internal links in new tab</label>
-                            </div>
+                    <label for="existnot">Text to show when a page does not exist yet.</label>
+                    <i>This will also be shown as a tooltip over links.</i>
+                    <input type="text" name="existnot" id="existnot" value="<?= Wcms\Config::existnot() ?>" form="admin">
 
-                            <i>(This modifications need re-rendering)</i>
+                    <div class="checkbox">
+                        <input type="hidden" name="existnotpass" value="0" form="admin">
+                        <input type="checkbox" name="existnotpass" id="existnotpass" value="1" <?= Wcms\Config::existnotpass() ? 'checked' : '' ?> form="admin">
+                        <label for="existnotpass">Ask for password</label>
+                    </div>
 
+                    <h4>Private</h4>
 
-                        </article>
+                    <label for="private">Text to show when a page is private.</label>
+                    <input type="text" name="private" id="private" value="<?= Wcms\Config::private() ?>" form="admin">
 
+                    <div class="checkbox">
+                        <input type="hidden" name="privatepass" value="0" form="admin">
+                        <input type="checkbox" name="privatepass" id="privatepass" value="1" <?= Wcms\Config::privatepass() ? 'checked' : '' ?> form="admin">
+                        <label for="privatepass">Ask for password</label>
+                    </div>
 
+                    <h4>Not published</h4>
 
+                    <label for="notpublished">Text to show when a page is not published.</label>
+                    <input type="text" name="notpublished" id="notpublished" value="<?= Wcms\Config::notpublished() ?>" form="admin">
 
+                    <div class="checkbox">
+                        <input type="hidden" name="notpublishedpass" value="0" form="admin">
+                        <input type="checkbox" name="notpublishedpass" id="notpublishedpass" value="1" <?= Wcms\Config::notpublishedpass() ? 'checked' : '' ?> form="admin">
+                        <label for="notpublishedpass">Ask for password</label>
+                    </div>
 
-                        <article>
+                    <h4>CSS</h4>
 
-                            <h2>CSS</h2>
+                    <div class="checkbox">
+                        <input type="hidden" name="alertcss" value="0" form="admin">
+                        <input type="checkbox" name="alertcss" id="alertcss" value="1" <?= Wcms\Config::alertcss() ? 'checked' : '' ?> form="admin">
+                        <label for="alertcss">Use global.css for those page as well</label>
+                    </div>
 
-                            <label for="globalcss">Edit global css that will apply to every pages</label>
-                            <textarea name="globalcss" id="globalcss" cols="30" rows="10"><?= $globalcss ?></textarea>
+                    <p>
+                        <i>You can use <code>body.alert</code> class to specify style.</i>
+                    </p>
 
-                            <label for="defaultfavicon">Default favicon</label>
-                            <select name="defaultfavicon" id="defaultfavicon">
-                                <option value="">--no favicon--</option>
-                                <?php
-                                foreach ($faviconlist as $favicon) {
-                                    ?>
-                                    <option value="<?= $favicon ?>" <?= Wcms\Config::defaultfavicon() === $favicon ? 'selected' : '' ?>><?= $favicon ?></option>
-                                <?php
-                                }
-                                ?>
-                            </select>
+                    
 
-                        </article>
+                    <h2 id="render">Render</h2>
 
+                    <div class="checkbox">
+                        <input type="hidden" name="reccursiverender" value="0" form="admin">
+                        <input type="checkbox" name="reccursiverender" id="reccursiverender" value="1" <?= Wcms\Config::reccursiverender() ? 'checked' : '' ?> form="admin">
+                        <label for="reccursiverender">Reccursive render</label>
+                    </div>
 
 
+                    <h4>Links</h4>
 
+                    <div class="checkbox">
+                        <input type="hidden" name="externallinkblank" value="0" form="admin">
+                        <input type="checkbox" name="externallinkblank" id="externallinkblank" value="1" <?= Wcms\Config::externallinkblank() ? 'checked' : '' ?> form="admin">
+                        <label for="externallinkblank">Open external links in new tab</label>
+                    </div>
 
+                    <div class="checkbox">
+                        <input type="hidden" name="internallinkblank" value="0" form="admin">
+                        <input type="checkbox" name="internallinkblank" id="internallinkblank" value="1" <?= Wcms\Config::internallinkblank() ? 'checked' : '' ?> form="admin">
+                        <label for="internallinkblank">Open internal links in new tab</label>
+                    </div>
 
+                    <i>(This modifications need re-rendering)</i>
 
-                        <article>
 
-                            <h2>Interface</h2>
 
-                            <p>Set interface Style</p>
+                    <h2 id="css">CSS</h2>
 
-                            <select name="interfacecss" id="interfacecss">
-                                <option value="null">--default interface style---</option>
-                                <?php
-                                foreach ($interfacecsslist as $interfacecss) {
-                                    ?>
-                                    <option value="<?= $interfacecss ?>" <?= $interfacecss === Wcms\Config::interfacecss() ? 'selected' : '' ?>><?= $interfacecss ?></option>
-                                <?php
-                                }
-                                ?>
-                            </select>
+                    <label for="globalcss">Edit global css that will apply to every pages</label>
+                    <textarea name="globalcss" id="globalcss" cols="30" rows="30" form="admin"><?= $globalcss ?></textarea>
 
-                        </article>
+                    <label for="defaultfavicon">Default favicon</label>
+                    <select name="defaultfavicon" id="defaultfavicon" form="admin">
+                        <option value="">--no favicon--</option>
+                        <?php
+                        foreach ($faviconlist as $favicon) {
+                            ?>
+                            <option value="<?= $favicon ?>" <?= Wcms\Config::defaultfavicon() === $favicon ? 'selected' : '' ?>><?= $favicon ?></option>
+                        <?php
+                        }
+                        ?>
+                    </select>
 
 
 
+                    <h2 id="databases">Databases</h2>
 
+                    <p>Manage databases</p>
 
-                        <article>
+                    <p>
+                        <label for="database">Select database to use</label>
 
-                            <h2>Tracking</h2>
+                        <select name="database" id="database">
+                            <option value="01"><?= Wcms\Config::pagetable() ?></option>
+                        </select>
+                    </p>
 
-                            <label for="analytics">Google analytics Tracking ID</label>
-                            <input type="text" name="analytics" id="analytics" value="<?= Wcms\Config::analytics() ?>">
+                    <p>
+                    <form action="" method="post">
+                        <label for="name">new name</label>
+                        <input type="text" name="name" id="name" value="<?= Wcms\Config::pagetable() ?>_1">
+                        <input type="submit" value="duplicate">
+                    </form>
+                    </p>
+                    
 
-                            <i>(Need rendering to work)</i>
 
-                        </article>
+                    <h2 id="interface">Interface</h2>
 
+                    <p>Set interface Style</p>
 
+                    <select name="interfacecss" id="interfacecss" form="admin">
+                        <option value="null">--default interface style---</option>
+                        <?php
+                        foreach ($interfacecsslist as $interfacecss) {
+                            ?>
+                            <option value="<?= $interfacecss ?>" <?= $interfacecss === Wcms\Config::interfacecss() ? 'selected' : '' ?>><?= $interfacecss ?></option>
+                        <?php
+                        }
+                        ?>
+                    </select>
 
 
+                    <h2 id="tracking">Tracking</h2>
 
-                        <article>
-                            <input type="submit" value="Update configuration">
-                        </article>
+                    <label for="analytics">Google analytics Tracking ID</label>
+                    <input type="text" name="analytics" id="analytics" value="<?= Wcms\Config::analytics() ?>" form="admin">
 
+                    <i>(Need rendering to work)</i>
 
 
-                    </form>
 
                 </div>
                 
-- 
cgit v1.2.3


From 40ef00fee7286a186673ff3fb26b6802421b2bc4 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Thu, 30 Jan 2020 01:54:50 +0100
Subject: work on thumbnail admin

---
 app/view/templates/admin.php       | 12 ++++++++++++
 app/view/templates/editleftbar.php | 33 ++++++++++++++++++++++++---------
 2 files changed, 36 insertions(+), 9 deletions(-)

(limited to 'app/view')

diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php
index 7186f26..ab71957 100644
--- a/app/view/templates/admin.php
+++ b/app/view/templates/admin.php
@@ -229,6 +229,18 @@
                         ?>
                     </select>
 
+                    <label for="defaultfavicon">Default thumbnail</label>
+                    <select name="defaultthumbnail" id="defaultthumbnail" form="admin">
+                        <option value="">--no thumbnail--</option>
+                        <?php
+                        foreach ($thumbnaillist as $thumbnail) {
+                            ?>
+                            <option value="<?= $thumbnail ?>" <?= Wcms\Config::defaultthumbnail() === $thumbnail ? 'selected' : '' ?>><?= $thumbnail ?></option>
+                        <?php
+                        }
+                        ?>
+                    </select>
+
 
 
                     <h2 id="databases">Databases</h2>
diff --git a/app/view/templates/editleftbar.php b/app/view/templates/editleftbar.php
index 8302090..a7a8be6 100644
--- a/app/view/templates/editleftbar.php
+++ b/app/view/templates/editleftbar.php
@@ -43,11 +43,26 @@
             ?>
             </select>
 
-            <div id="thumbnail">
-                <label for="thumbnail">Thumbnail</label>
-                <input type="file" id="thumbnail" name="thumbnail" accept=".jpg, .JPG, .jpeg, .JPEG">
-                <img src="<?= Wcms\Model::thumbnailpath() ?><?= $page->id() ?>.jpg" alt="no-thumbnail">
-            </div>
+            
+            <label for="thumbnail">Thumbnail</label>
+            <select name="thumbnail" id="thumbnail">
+            <?php
+            if(!empty($page->templatebody()) && $page->template()['thumbnail']) {
+                ?>
+                <option value="<?= $page->thumbnail() ?>">--using template thumbnail--</option>
+                <?php
+            } else {
+                echo '<option value="">--no thumbnail--</option>';
+            foreach ($thumbnaillist as $thumbnail) {
+                ?>
+                <option value="<?= $thumbnail ?>" <?= $page->thumbnail() === $thumbnail ? 'selected' : '' ?>><?= $thumbnail ?></option>
+                <?php
+                }
+            }
+            ?>
+            </select>
+
+            
 
 
 
@@ -98,10 +113,6 @@
                 <label for="oreccursivecss">Reccursive template</label>
                 </div>
                 <div class="subtemplate">
-                <input type="checkbox" name="templateoptions[]" id="oquickcss" value="quickcss" <?= in_array('quickcss', $page->templateoptions()) ? 'checked' : '' ?>>
-                <label for="oquickcss">Quickcss</label>
-                </div>
-                <div class="subtemplate">
                 <input type="checkbox" name="templateoptions[]" id="oexternalcss" value="externalcss" <?= in_array('externalcss', $page->templateoptions()) ? 'checked' : '' ?>>
                 <label for="oexternalcss">External CSS</label>
                 </div>
@@ -109,6 +120,10 @@
                 <input type="checkbox" name="templateoptions[]" id="ofavicon" value="favicon" <?= in_array('favicon', $page->templateoptions()) ? 'checked' : '' ?>>
                 <label for="ofavicon">Favicon</label>
                 </div>
+                <div class="subtemplate">
+                <input type="checkbox" name="templateoptions[]" id="othumbnail" value="thumbnail" <?= in_array('thumbnail', $page->templateoptions()) ? 'checked' : '' ?>>
+                <label for="othumbnail">Thumbnail</label>
+                </div>
                 <?php
             } else {
                 foreach($page->templateoptions() as $option) {
-- 
cgit v1.2.3


From eab190e895124ef643c2b0574c84f3424857eeac Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Thu, 30 Jan 2020 02:46:19 +0100
Subject: default thumbnail fix #49

---
 app/view/templates/admin.php       | 2 +-
 app/view/templates/edit.php        | 2 +-
 app/view/templates/editleftbar.php | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'app/view')

diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php
index ab71957..57abfcc 100644
--- a/app/view/templates/admin.php
+++ b/app/view/templates/admin.php
@@ -229,7 +229,7 @@
                         ?>
                     </select>
 
-                    <label for="defaultfavicon">Default thumbnail</label>
+                    <label for="defaultthumbnail">Default thumbnail</label>
                     <select name="defaultthumbnail" id="defaultthumbnail" form="admin">
                         <option value="">--no thumbnail--</option>
                         <?php
diff --git a/app/view/templates/edit.php b/app/view/templates/edit.php
index d0125f2..a27171a 100644
--- a/app/view/templates/edit.php
+++ b/app/view/templates/edit.php
@@ -17,7 +17,7 @@
 
     <div id="workspace">
 
-    <?php $this->insert('editleftbar', ['page' => $page, 'tablist' => $tablist, 'pagelist' => $pagelist, 'showleftpanel' => $showleftpanel, 'faviconlist' => $faviconlist]) ?>
+    <?php $this->insert('editleftbar', ['page' => $page, 'tablist' => $tablist, 'pagelist' => $pagelist, 'showleftpanel' => $showleftpanel, 'faviconlist' => $faviconlist, 'thumbnaillist' => $thumbnaillist]) ?>
     <?php $this->insert('edittabs', ['tablist' => $tablist, 'opentab' => $page->interface(), 'templates' => $page->template()]) ?>
     <?php $this->insert('editrightbar', ['page' => $page, 'pagelist' => $pagelist, 'showrightpanel' => $showrightpanel, 'templates' => $page->template(), 'tagpagelist' => $tagpagelist, 'lasteditedpagelist' => $lasteditedpagelist, 'editorlist' => $editorlist, 'user' => $user]) ?>
 
diff --git a/app/view/templates/editleftbar.php b/app/view/templates/editleftbar.php
index a7a8be6..cf30624 100644
--- a/app/view/templates/editleftbar.php
+++ b/app/view/templates/editleftbar.php
@@ -62,6 +62,12 @@
             ?>
             </select>
 
+            <?php if(!empty($page->thumbnail())) { ?>
+            <div id="showthumbnail">
+                <img src="<?= Wcms\Model::thumbnailpath() . $page->thumbnail() ?>">
+            </div>
+            <?php } ?>
+
             
 
 
-- 
cgit v1.2.3


From 27f1fb9c19fa2c2fd28863809ccc6ba526499c0d Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Thu, 30 Jan 2020 03:32:31 +0100
Subject: thumbnail can be changed in multi edit

---
 app/view/templates/editleftbar.php | 38 ++++++++++----------------------------
 app/view/templates/edittopbar.php  |  2 +-
 app/view/templates/home.php        |  2 +-
 app/view/templates/homemenu.php    | 12 +++++++++++-
 4 files changed, 23 insertions(+), 31 deletions(-)

(limited to 'app/view')

diff --git a/app/view/templates/editleftbar.php b/app/view/templates/editleftbar.php
index cf30624..3004351 100644
--- a/app/view/templates/editleftbar.php
+++ b/app/view/templates/editleftbar.php
@@ -52,7 +52,9 @@
                 <option value="<?= $page->thumbnail() ?>">--using template thumbnail--</option>
                 <?php
             } else {
-                echo '<option value="">--no thumbnail--</option>';
+                if(!file_exists(Wcms\Model::thumbnailpath() . $page->thumbnail())) {
+                    echo '<option value="">--no thumbnail--</option>';
+                }
             foreach ($thumbnaillist as $thumbnail) {
                 ?>
                 <option value="<?= $thumbnail ?>" <?= $page->thumbnail() === $thumbnail ? 'selected' : '' ?>><?= $thumbnail ?></option>
@@ -97,6 +99,11 @@
             ?>
             </select>
 
+            <div class="subtemplate">
+                <input type="checkbox" name="templateoptions[]" id="othumbnail" value="thumbnail" <?= in_array('thumbnail', $page->templateoptions()) ? 'checked' : '' ?>>
+                <label for="othumbnail">Thumbnail</label>
+            </div>
+
 
             <label for="templatecss">CSS template</label>
             <select name="templatecss" id="templatecss">
@@ -109,10 +116,6 @@
             }
             ?>
             </select>
-            
-            <?php
-            if(!empty($page->templatecss())) {
-                ?>
 
                 <div class="subtemplate">
                 <input type="checkbox" name="templateoptions[]" id="oreccursivecss" value="reccursivecss" <?= in_array('reccursivecss', $page->templateoptions()) ? 'checked' : '' ?>>
@@ -126,20 +129,7 @@
                 <input type="checkbox" name="templateoptions[]" id="ofavicon" value="favicon" <?= in_array('favicon', $page->templateoptions()) ? 'checked' : '' ?>>
                 <label for="ofavicon">Favicon</label>
                 </div>
-                <div class="subtemplate">
-                <input type="checkbox" name="templateoptions[]" id="othumbnail" value="thumbnail" <?= in_array('thumbnail', $page->templateoptions()) ? 'checked' : '' ?>>
-                <label for="othumbnail">Thumbnail</label>
-                </div>
-                <?php
-            } else {
-                foreach($page->templateoptions() as $option) {
-                    if($option != 'externaljavascript') {
-                        echo '<input type="hidden" name="templateoptions[]" value="'.$option.'">';
-                    }
-                }
-            }
-            
-            ?>
+
 
 
             <label for="templatejavascript">Javascript template</label>
@@ -155,20 +145,12 @@
             </select>
 
 
-            <?php
-            if(!empty($page->templatejavascript())) {
-            ?>
+
             <div class="subtemplate">
             <input type="checkbox" name="templateoptions[]" value="externaljavascript" id="oexternaljs" <?= in_array('externaljavascript', $page->templateoptions()) ? 'checked' : '' ?>>
             <label for="oexternaljs">external js</label>
             </div>
 
-            <?php } else {
-                if(in_array('externaljavascript', $page->templateoptions())) {
-                    echo '<input type="hidden" name="templateoptions[]" value="externaljavascript">';
-                }
-                
-            } ?>
 
 
             </fieldset>
diff --git a/app/view/templates/edittopbar.php b/app/view/templates/edittopbar.php
index 5aa13ba..2eefd0f 100644
--- a/app/view/templates/edittopbar.php
+++ b/app/view/templates/edittopbar.php
@@ -2,7 +2,7 @@
 
 
 
-    <form action="<?= $this->upage('pageupdate', $page->id()) ?>" method="post" id="update" enctype="multippage/form-data">
+    <form action="<?= $this->upage('pageupdate', $page->id()) ?>" method="post" id="update">
 
     <div id="editmenu">
 
diff --git a/app/view/templates/home.php b/app/view/templates/home.php
index 3ca4556..fafd87b 100644
--- a/app/view/templates/home.php
+++ b/app/view/templates/home.php
@@ -16,7 +16,7 @@
 
     <?php
         $optlist = $optlist ?? null;
-        $this->insert('homemenu', ['user' => $user, 'opt' => $opt, 'optlist' => $optlist, 'pagelist' => $pagelist, 'faviconlist' => $faviconlist, 'editorlist' => $editorlist, 'colors' => $colors]);
+        $this->insert('homemenu', ['user' => $user, 'opt' => $opt, 'optlist' => $optlist, 'pagelist' => $pagelist, 'faviconlist' => $faviconlist, 'thumbnaillist' => $thumbnaillist, 'editorlist' => $editorlist, 'colors' => $colors]);
     ?>
 
 
diff --git a/app/view/templates/homemenu.php b/app/view/templates/homemenu.php
index 51a58e9..e437a4e 100644
--- a/app/view/templates/homemenu.php
+++ b/app/view/templates/homemenu.php
@@ -76,7 +76,7 @@
                 </select>
                 <label for="setlevel">Privacy level</label>
                 </br>
-                <strong>Favicon</strong>
+                <strong>Images</strong>
                 </br>
                 <select name="datas[favicon]" id="favicon">
                 <option value="" disabled selected>--set favicon--</option>
@@ -88,6 +88,16 @@
                 </select>
                 <label for="favicon">Favicon</label>
                 </br>
+                <select name="datas[thumbnail]" id="thumbnail">
+                <option value="" disabled selected>--set thumbnail--</option>
+                    <?php
+                        foreach ($thumbnaillist as $thumbnail) {
+                            echo '<option value ="' . $thumbnail . '">' . $thumbnail . '</option>';
+                        }
+                    ?>
+                </select>
+                <label for="favicon">Thumnail</label>
+                </br>
                 <strong>Templates</strong>
                 </br>
                 <select name="datas[templatebody]" id="templatebody">
-- 
cgit v1.2.3


From f3bc327be7be8a1aeeb49c7f46c86628e5d52e77 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Thu, 30 Jan 2020 04:13:14 +0100
Subject: multi edit can unset templates thumbnail favicon

---
 app/view/templates/homemenu.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'app/view')

diff --git a/app/view/templates/homemenu.php b/app/view/templates/homemenu.php
index e437a4e..83d2b90 100644
--- a/app/view/templates/homemenu.php
+++ b/app/view/templates/homemenu.php
@@ -69,7 +69,7 @@
                 <strong>Privacy</strong>
                 </br>
                 <select name="datas[secure]" id="setlevel">
-                    <option value=""  disabled selected>--change privacy--</option>
+                    <option value=""  selected>--keep privacy--</option>
                     <option value="0">public</option>
                     <option value="1">private</option>
                     <option value="2">not_published</option>
@@ -79,7 +79,8 @@
                 <strong>Images</strong>
                 </br>
                 <select name="datas[favicon]" id="favicon">
-                <option value="" disabled selected>--set favicon--</option>
+                <option value=""  selected>--keep favicon--</option>
+                <option value="!" >--unset favicon--</option>
                     <?php
                         foreach ($faviconlist as $favicon) {
                             echo '<option value ="' . $favicon . '">' . $favicon . '</option>';
@@ -88,20 +89,24 @@
                 </select>
                 <label for="favicon">Favicon</label>
                 </br>
+
                 <select name="datas[thumbnail]" id="thumbnail">
-                <option value="" disabled selected>--set thumbnail--</option>
+                <option value="" selected>--keep thumbnail--</option>
+                <option value="!">--unset thumbnail--</option>
                     <?php
                         foreach ($thumbnaillist as $thumbnail) {
                             echo '<option value ="' . $thumbnail . '">' . $thumbnail . '</option>';
                         }
                     ?>
                 </select>
-                <label for="favicon">Thumnail</label>
+                <label for="thumbnail">Thumnail</label>
                 </br>
+
                 <strong>Templates</strong>
                 </br>
                 <select name="datas[templatebody]" id="templatebody">
-                    <option value="" disabled selected>--set template body--</option>
+                    <option value="" selected>--keep template body--</option>
+                    <option value="!" >--unset template body--</option>
                     <?php
                         foreach ($pagelist as $page) {
                             echo '<option value ="' . $page . '">' . $page . '</option>';
@@ -110,8 +115,10 @@
                 </select>
                 <label for="templatebody">Body</label>
                 </br>
+
                 <select name="datas[templatecss]" id="templatecss">
-                <option value="" disabled selected>--set css template--</option>
+                <option value="" selected>--keep css template--</option>
+                <option value="!" >--unset css template--</option>
                     <?php
                         foreach ($pagelist as $page) {
                             echo '<option value ="' . $page . '">' . $page . '</option>';
@@ -119,8 +126,10 @@
                     ?>                </select>
                 <label for="templatecss">CSS</label>
                 </br>
+
                 <select name="datas[templatejavascript]" id="templatejavascript">
-                <option value="" disabled selected>--set javascript template--</option>
+                <option value="" selected>--keep javascript template--</option>
+                <option value="!" >--unset javascript template--</option>
                     <?php
                         foreach ($pagelist as $page) {
                             echo '<option value ="' . $page . '">' . $page . '</option>';
-- 
cgit v1.2.3


From 9d3f97870810e739041eccad234d47308747cb1f Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Thu, 6 Feb 2020 18:06:07 +0100
Subject: new feature : admin database manager fix  #12

---
 app/view/templates/admin.php      | 145 +++++++++++++++++++++-----------------
 app/view/templates/backtopbar.php |   9 +--
 2 files changed, 81 insertions(+), 73 deletions(-)

(limited to 'app/view')

diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php
index 57abfcc..0c9f5af 100644
--- a/app/view/templates/admin.php
+++ b/app/view/templates/admin.php
@@ -10,37 +10,37 @@
 
     <main class="admin">
 
-    <nav class="admin">
-
-        <div class="block">
-            <h1>Administration</h1>
-            
-            <div class="scroll">
-                <ul>
-                    <li><a href="#home-page">Home page</a></li>
-                    <li><a href="#page-creation">Page creation</a></li>
-                    <li><a href="#alert-pages">Alert Pages</a></li>
-                    <li><a href="#render">Render</a></li>
-                    <li><a href="#css">CSS</a></li>
-                    <li><a href="#databases">Databases</a></li>
-                    <li><a href="#interface">Interface</a></li>
-                    <li><a href="#tracking">Tracking</a></li>
-                </ul>
-                
-                <form action="<?= $this->url('adminupdate') ?>" method="post" id="admin">
-                    <input type="submit" value="Update configuration">
-                </form>
+        <nav class="admin">
+
+            <div class="block">
+                <h1>Administration</h1>
+
+                <div class="scroll">
+                    <ul>
+                        <li><a href="#home-page">Home page</a></li>
+                        <li><a href="#page-creation">Page creation</a></li>
+                        <li><a href="#alert-pages">Alert Pages</a></li>
+                        <li><a href="#render">Render</a></li>
+                        <li><a href="#css">CSS</a></li>
+                        <li><a href="#interface">Interface</a></li>
+                        <li><a href="#tracking">Tracking</a></li>
+                    </ul>
+
+                    <form action="<?= $this->url('adminupdate') ?>" method="post" id="admin">
+                        <input type="submit" value="Update configuration">
+                    </form>
+                </div>
             </div>
-        </div>
-    </nav>
+        </nav>
 
         <section class="admin">
 
             <div class="block">
 
-                
+                <h1>configuration</h1>
+
                 <div class="scroll">
-                        
+
 
                     <h2 id="home-page">Home page</h2>
 
@@ -51,11 +51,6 @@
                         <label for="default">default</label>
                     </div>
 
-                    <div class="radio">
-                        <input type="radio" name="homepage" value="search" id="searchbar" <?= Wcms\Config::homepage() === 'search' ? 'checked' : '' ?> form="admin">
-                        <label for="searchbar">search bar</label>
-                    </div>
-
                     <div class="radio">
                         <input type="radio" name="homepage" value="redirect" id="redirect" <?= Wcms\Config::homepage() === 'redirect' ? 'checked' : '' ?> form="admin">
                         <label for="redirect">redirect to page</label>
@@ -66,7 +61,7 @@
 
                         <?php
                         foreach ($pagelist as $page) {
-                            ?>
+                        ?>
                             <option value="<?= $page ?>" <?= Wcms\Config::homeredirect() === $page ? 'selected' : '' ?>><?= $page ?></option>
                         <?php
                         }
@@ -96,7 +91,7 @@
                         <option value="" <?= Wcms\Config::defaultpage() === '' || !$defaultpageexist ? 'selected' : '' ?>>--use default BODY element--</option>
                         <?php
                         foreach ($pagelist as $page) {
-                            ?>
+                        ?>
                             <option value="<?= $page ?>" <?= Wcms\Config::defaultpage() === $page ? 'selected' : '' ?>><?= $page ?></option>
                         <?php    }
                         ?>
@@ -104,7 +99,7 @@
 
                     <?php
                     if (empty(!$defaultpageexist || Wcms\Config::defaultpage())) {
-                        ?>
+                    ?>
                         <label for="defaultbody">Edit default BODY element</label>
                         <textarea name="defaultbody" id="defaultbody" cols="30" rows="10" form="admin"><?= Wcms\Config::defaultbody() ?></textarea>
                     <?php
@@ -114,6 +109,8 @@
 
                     <h2 id="alert-pages">Alert pages</h2>
 
+                    <p>Set the style and text to show when a page does not exist, or when a visitor don't have access to it.</p>
+
                     <h4>Common options</h4>
 
                     <label for="alerttitle">H1 Title</label>
@@ -125,7 +122,7 @@
                         <option value="" <?= empty(Wcms\Config::alertlink()) ? 'selected' : '' ?>>--No link--</option>
                         <?php
                         foreach ($pagelist as $page) {
-                            ?>
+                        ?>
                             <option value="<?= $page ?>" <?= Wcms\Config::alertlink() === $page ? 'selected' : '' ?>><?= $page ?></option>
                         <?php    }
                         ?>
@@ -183,7 +180,7 @@
                         <i>You can use <code>body.alert</code> class to specify style.</i>
                     </p>
 
-                    
+
 
                     <h2 id="render">Render</h2>
 
@@ -222,7 +219,7 @@
                         <option value="">--no favicon--</option>
                         <?php
                         foreach ($faviconlist as $favicon) {
-                            ?>
+                        ?>
                             <option value="<?= $favicon ?>" <?= Wcms\Config::defaultfavicon() === $favicon ? 'selected' : '' ?>><?= $favicon ?></option>
                         <?php
                         }
@@ -234,37 +231,11 @@
                         <option value="">--no thumbnail--</option>
                         <?php
                         foreach ($thumbnaillist as $thumbnail) {
-                            ?>
-                            <option value="<?= $thumbnail ?>" <?= Wcms\Config::defaultthumbnail() === $thumbnail ? 'selected' : '' ?>><?= $thumbnail ?></option>
-                        <?php
-                        }
                         ?>
+                            <option value="<?= $thumbnail ?>" <?= Wcms\Config::defaultthumbnail() === $thumbnail ? 'selected' : '' ?>><?= $thumbnail ?></option>
+                        <?php } ?>
                     </select>
 
-
-
-                    <h2 id="databases">Databases</h2>
-
-                    <p>Manage databases</p>
-
-                    <p>
-                        <label for="database">Select database to use</label>
-
-                        <select name="database" id="database">
-                            <option value="01"><?= Wcms\Config::pagetable() ?></option>
-                        </select>
-                    </p>
-
-                    <p>
-                    <form action="" method="post">
-                        <label for="name">new name</label>
-                        <input type="text" name="name" id="name" value="<?= Wcms\Config::pagetable() ?>_1">
-                        <input type="submit" value="duplicate">
-                    </form>
-                    </p>
-                    
-
-
                     <h2 id="interface">Interface</h2>
 
                     <p>Set interface Style</p>
@@ -273,7 +244,7 @@
                         <option value="null">--default interface style---</option>
                         <?php
                         foreach ($interfacecsslist as $interfacecss) {
-                            ?>
+                        ?>
                             <option value="<?= $interfacecss ?>" <?= $interfacecss === Wcms\Config::interfacecss() ? 'selected' : '' ?>><?= $interfacecss ?></option>
                         <?php
                         }
@@ -291,12 +262,56 @@
 
 
                 </div>
-                
+
             </div>
 
 
         </section>
 
+        <section id="databases">
+            <div class="block">
+                <h1>Databases</h1>
+                <div class="scroll">
+
+                <form action="<?= $this->url('admindatabase') ?>" method="post">
+
+                    
+                    <table id="dirlsit">
+                        <tr><th>using</th><th>databases</th><th>pages</th></tr>
+                        
+                        <?php basictree($pagesdbtree, 'pages', 0, '', DIRECTORY_SEPARATOR . Wcms\Config::pagetable()); ?>
+                    </table>
+
+                    <input type="hidden" name="action" value="select">
+                    <input type="submit" value="select" name="change database">
+
+                </form>
+
+                <h4>Duplicate Database</h4>
+
+                <form action="<?= $this->url('admindatabase') ?>" method="post">
+
+                    <label for="dbsrc">Database to duplicate</label>
+                    <select name="dbsrc" id="dbsrc">
+                        <?php
+                        foreach ($pagesdblist as $db) {
+                            ?>
+                            <option value="<?= $db ?>" <?= $db === Wcms\Config::pagetable() ? 'selected' : '' ?>><?= $db ?></option>
+                            <?php
+                        }
+                        ?>
+                    </select>
+
+                    <label for="duplicate">New name</label>
+                    <input type="text" name="dbtarget" id="duplicate" value="" required>
+                    <input type="submit" name="action" value="duplicate">
+                </form>
+
+
+                </div>
+            </div>
+        </section>
+
     </main>
 </body>
 
diff --git a/app/view/templates/backtopbar.php b/app/view/templates/backtopbar.php
index c632d66..c1dd361 100644
--- a/app/view/templates/backtopbar.php
+++ b/app/view/templates/backtopbar.php
@@ -30,10 +30,6 @@
     <img src="<?= Wcms\Model::iconpath() ?>media.png" alt="" class="icon">
     <span class="hidephone">media</span>
 </a>
-<a href="<?= $this->url('font') ?>" <?= $tab == 'font' ? 'class="actualpage"' : '' ?>>
-    <img src="<?= Wcms\Model::iconpath() ?>font.png" alt="" class="icon">
-    <span class="hidephone">font</span>
-</a>
 <?php
 if($user->isadmin()) {
 ?>
@@ -74,10 +70,7 @@ if($user->isadmin()) {
 <?php } else { ?>  
 
 <span>
-<a href="<?= $this->url('timeline') ?>" <?= $tab == 'timeline' ? 'class="actualpage"' : '' ?>>
-    <img src="<?= Wcms\Model::iconpath() ?>timeline.png" alt="" class="icon">
-    <span class="hidephone">timeline</span>
-</a>
+
 <a href="<?= $this->url('user') ?>" <?= $tab == 'user' ? 'class="actualpage"' : '' ?>>
     <img src="<?= Wcms\Model::iconpath() ?>user.png" alt="" class="icon">
     <span class="hidephone"><?= $user->id() ?></span>
-- 
cgit v1.2.3