Merge branch 'implement-better-ui'

1 files changed, 182 insertions, 173 deletions

diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php
index d8255ba..c201d90 100644
--- a/app/view/templates/admin.php
+++ b/app/view/templates/admin.php
@@ -12,277 +12,286 @@
 
         <section>
 
-            <form action="<?= $this->url('adminupdate') ?>" method="post">
+            <div class="block">
 
+                <h1>Administration</h1>
+                
+                <div class="scroll">
+                        
+                    <form action="<?= $this->url('adminupdate') ?>" method="post">
 
-                <article>
 
-                    <h1>Administration</h1>
+                        <article>
 
-                    <input type="submit" value="Update configuration">
-                </article>
 
-                <article>
+                            <input type="submit" value="Update configuration">
+                        </article>
 
-                    <h2>Home page</h2>
+                        <article>
 
-                    <p>Here you can set the home-page view for visitors.</p>
+                            <h2>Home page</h2>
 
-                    <div class="radio">
-                        <input type="radio" name="homepage" value="default" id="default" <?= Wcms\Config::homepage() === 'default' ? 'checked' : '' ?>>
-                        <label for="default">default</label>
-                    </div>
+                            <p>Here you can set the home-page view for visitors.</p>
 
-                    <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="default" id="default" <?= Wcms\Config::homepage() === 'default' ? 'checked' : '' ?>>
+                                <label for="default">default</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>
+                            <div class="radio">
+                                <input type="radio" name="homepage" value="search" id="searchbar" <?= Wcms\Config::homepage() === 'search' ? 'checked' : '' ?>>
+                                <label for="searchbar">search bar</label>
+                            </div>
 
-                    <select name="homeredirect" id="homeredirect">
-                        <option value="" <?= Wcms\Config::homeredirect() === null ? 'selected' : '' ?>>--select page to redirect--</option>
+                            <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>
 
-                        <?php
-                        foreach ($pagelist as $page) {
-                            ?>
-                            <option value="<?= $page ?>" <?= Wcms\Config::homeredirect() === $page ? 'selected' : '' ?>><?= $page ?></option>
-                        <?php
-                        }
+                            <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>
+                                ?>
+                            </select>
 
-                </article>
+                        </article>
 
-                <article>
+                        <article>
 
-                    <h2>Page creation</h2>
+                            <h2>Page creation</h2>
 
-                    <p>What really happend when you create a new page</p>
+                            <p>What really happend when you create a new page</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>
+                            <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>
 
 
 
 
 
-                    <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) {
+                            <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
+                            }
                             ?>
-                            <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
-                    }
-                    ?>
+                        </article>
 
-                </article>
+                        <article>
 
-                <article>
 
 
+                            <h2>Alert pages</h2>
 
-                    <h2>Alert pages</h2>
+                            <h4>Common options</h4>
 
-                    <h4>Common options</h4>
+                            <label for="alerttitle">H1 Title</label>
+                            <input type="text" name="alerttitle" id="alerttitle" value="<?= Wcms\Config::alerttitle() ?>">
 
-                    <label for="alerttitle">H1 Title</label>
-                    <input type="text" name="alerttitle" id="alerttitle" value="<?= Wcms\Config::alerttitle() ?>">
 
+                            <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>
 
-                    <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>
 
+                            <label for="alertlinktext">Link text</label>
+                            <input type="text" name="alertlinktext" id="alertlinktext" value="<?= Wcms\Config::alertlinktext() ?>">
 
-                    <label for="alertlinktext">Link text</label>
-                    <input type="text" name="alertlinktext" id="alertlinktext" value="<?= Wcms\Config::alertlinktext() ?>">
 
 
+                            <h4>Un-existing</h4>
 
-                    <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() ?>">
 
-                    <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>
 
-                    <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>
 
-                    <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() ?>">
 
-                    <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>
 
-                    <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>
+                            <h4>Not published</h4>
 
-                    <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() ?>">
 
-                    <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>
 
-                    <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>
+                            <h4>CSS</h4>
 
-                    <h4>CSS</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>
 
-                    <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>
+                            <p>
+                                <i>You can use <code>body.alert</code> class to specify style.</i>
+                            </p>
 
-                    <p>
-                        <i>You can use <code>body.alert</code> class to specify style.</i>
-                    </p>
+                        </article>
+                        
+                        
+                        <article>
+                            
 
-                </article>
-                
-                
-                <article>
-                    
+                            <h2>Render</h2>
 
-                    <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>
 
-                    <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>
 
+                            <h4>Links</h4>
 
-                    <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>
 
-                    <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>
+                            <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>
 
-                    <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>
+                            <i>(This modifications need re-rendering)</i>
 
-                    <i>(This modifications need re-rendering)</i>
 
+                        </article>
 
-                </article>
 
 
 
 
+                        <article>
 
-                <article>
+                            <h2>CSS</h2>
 
-                    <h2>CSS</h2>
+                            <label for="globalcss">Edit global css that will apply to every pages</label>
+                            <textarea name="globalcss" id="globalcss" cols="30" rows="10"><?= $globalcss ?></textarea>
 
-                    <label for="globalcss">Edit global css that will apply to every pages</label>
-                    <textarea name="globalcss" id="globalcss" cols="30" rows="10"><?= $globalcss ?></textarea>
+                            <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>
 
-                    <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>
 
-                </article>
 
 
 
 
 
 
+                        <article>
 
-                <article>
+                            <h2>Interface</h2>
 
-                    <h2>Interface</h2>
+                            <p>Set interface Style</p>
 
-                    <p>Set interface Style</p>
+                            <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>
 
-                    <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>
+                        </article>
 
-                </article>
 
 
 
 
+                        <article>
 
-                <article>
+                            <h2>Tracking</h2>
 
-                    <h2>Tracking</h2>
+                            <label for="analytics">Google analytics Tracking ID</label>
+                            <input type="text" name="analytics" id="analytics" value="<?= Wcms\Config::analytics() ?>">
 
-                    <label for="analytics">Google analytics Tracking ID</label>
-                    <input type="text" name="analytics" id="analytics" value="<?= Wcms\Config::analytics() ?>">
+                            <i>(Need rendering to work)</i>
 
-                    <i>(Need rendering to work)</i>
+                        </article>
 
-                </article>
 
 
 
 
+                        <article>
+                            <input type="submit" value="Update configuration">
+                        </article>
 
-                <article>
-                    <input type="submit" value="Update configuration">
-                </article>
 
 
+                    </form>
 
-            </form>
+                </div>
+                
+            </div>
 
 
         </section>