new feature : admin database manager fix #12

2 files changed, 81 insertions, 73 deletions

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>
 
@@ -52,11 +52,6 @@
                     </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>
@@ -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>