From d8b02407afd7ce933d1a9935f5c723a5d47ae368 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Thu, 28 Mar 2019 22:03:52 +0100
Subject: graphic update

---
 app/class/modelhome.php         |  2 +-
 app/view/templates/admin.php    | 40 ++++++++++++++++++++++----
 app/view/templates/font.php     | 16 ++++++++++-
 app/view/templates/info.php     | 59 ++++++++++++++++++++------------------
 app/view/templates/media.php    |  2 +-
 app/view/templates/timeline.php | 14 +++++++++
 app/view/templates/user.php     | 13 +++++++++
 assets/css/home.css             | 63 ++++++++++++++++++++++++++++++++++-------
 composer.json                   |  2 +-
 9 files changed, 164 insertions(+), 47 deletions(-)

diff --git a/app/class/modelhome.php b/app/class/modelhome.php
index fb5989c..5b3b5a5 100644
--- a/app/class/modelhome.php
+++ b/app/class/modelhome.php
@@ -55,7 +55,7 @@ class Modelhome extends Modelart
     }
 
     /**
-     * @var array array of the columns to show from the user
+     * @param array array of the columns to show from the user
      * 
      * @return array assoc each key columns to a boolean value to show or not
      */
diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php
index bd37464..08126a7 100644
--- a/app/view/templates/admin.php
+++ b/app/view/templates/admin.php
@@ -10,11 +10,19 @@
 
 <main class="admin">
 
-    <h1>Administration</h1>
+    <section>
 
     <form action="<?= $this->url('adminupdate') ?>" method="post">
 
+
+    <article>
+
+    <h1>Administration</h1>
+
     <input type="submit" value="Update configuration">
+    </article>
+
+    <article>
 
     <h2>Home page</h2>
 
@@ -49,6 +57,10 @@
         ?>
     </select>
 
+    </article>
+
+    <article>
+
     <h2>Page creation</h2>
 
     <label for="defaultprivacy">Default privacy</label>
@@ -82,6 +94,10 @@
     }
     ?>
 
+    </article>
+
+    <article>
+
 
 
     <h2>Editing</h2>
@@ -89,7 +105,8 @@
     <label for="existnot">Text to show when a page does not exist yet</label>
     <input type="text" name="existnot" id="existnot" value="<?= Config::existnot() ?>">
 
-    <h2>Render</h2>
+
+    <h4>Render</h4>
 
     <div class="checkbox">
     <input type="hidden" name="reccursiverender" value="0">
@@ -97,7 +114,8 @@
     <label for="reccursiverender">Reccursive render</label>
     </div>
 
-    <h3>Links</h3>
+
+    <h4>Links</h4>
     
     <div class="checkbox">
     <input type="hidden" name="externallinkblank" value="0">
@@ -113,7 +131,7 @@
 
     <i>(This modifications need re-rendering)</i>
 
-    <h3>Edit quick menu</h3>
+    <h4>Edit quick menu</h4>
 
     <div class="checkbox">
     <input type="checkbox" name="showeditmenu" id="showeditmenu" <?= Config::showeditmenu() === true ? 'checked' : '' ?>>
@@ -137,6 +155,10 @@
     }
     ?>
 
+    </article>
+
+    <article>
+
     <h2>CSS</h2>
 
     <label for="globalcss">Edit global css that will apply to every pages</label>
@@ -154,6 +176,9 @@
     ?>
     </select>
 
+    </article>
+
+    <article>
 
     <h2>Tracking</h2>
 
@@ -162,13 +187,18 @@
 
     <i>(Need rendering to work)</i>
 
+    </article>
 
+    <article>
     <input type="submit" value="Update configuration">
+    </article>
+
+
 
     </form>
 
 
-    
+    </section>
 
 </main>
 </body>
diff --git a/app/view/templates/font.php b/app/view/templates/font.php
index 3de0dce..6c53023 100644
--- a/app/view/templates/font.php
+++ b/app/view/templates/font.php
@@ -10,8 +10,11 @@
 
 <main class="font">
 
+<section>
 
-<h1>Fonts</h1>
+<article>
+
+<h1>Fonts manager</h1>
 
 
 <div>
@@ -21,6 +24,10 @@
 <a href="<?= $fontfile ?>" target="_blank">👓 View font CSS file</a>
 </div>
 
+</article>
+
+<article>
+
 <h2>Add Font</h2>
 
 <form action="<?= $this->url('fontadd') ?>" method="post" enctype="multipart/form-data">
@@ -31,6 +38,9 @@
 <input type="submit" value="upload font(s)">
 </form>
 
+</article>
+
+<article>
 
 <h2>Font stock</h2>
 
@@ -55,6 +65,10 @@ foreach ($fontlist as $font ) {
 ?>
 </table>
 
+</article>
+
+</section>
+
 </main>
 </body>
 
diff --git a/app/view/templates/info.php b/app/view/templates/info.php
index 3203ce6..6e971fb 100644
--- a/app/view/templates/info.php
+++ b/app/view/templates/info.php
@@ -10,6 +10,34 @@
 
 <main class="info">
 
+
+<section>
+
+
+<nav>
+<h2>Manual Summary</h2>
+<ul>
+    <li><a href="#startup">Startup</a></li>
+    <ul>
+
+    </ul>
+    <li><a href="#structure">Structure</a></li>
+    <ul>
+        <li><a href="#attributes">Page attributes</a></li>
+        <li><a href="#database">Database</a></li>
+    </ul>
+    <li><a href="#editor">Editor</a></li>
+    <ul>
+        <li><a href="#elementsyntax">Elements syntax</a></li>
+        <li><a href="#bodysyntax">Body syntax</a></li>
+    </ul>
+</ul>
+
+</nav>
+
+
+<article>
+
 <h1>Info</h1>
 
 <h2>Version</h2>
@@ -39,34 +67,9 @@
 
 <a href="https://nicolas.club1.fr" target="_blank">🚲 Nicolas Peugnet</a>
 
+</article>
 
-
-
-<nav>
-<h2>Manual Summary</h2>
-<ul>
-    <li><a href="#startup">Startup</a></li>
-    <ul>
-
-    </ul>
-    <li><a href="#structure">Structure</a></li>
-    <ul>
-        <li><a href="#attributes">Page attributes</a></li>
-        <li><a href="#database">Database</a></li>
-    </ul>
-    <li><a href="#editor">Editor</a></li>
-    <ul>
-        <li><a href="#elementsyntax">Elements syntax</a></li>
-        <li><a href="#bodysyntax">Body syntax</a></li>
-    </ul>
-</ul>
-
-</nav>
-
-
-
-
-<article>
+<article id="manual">
 
 <h2 id="manual">Manual</h2>
 
@@ -362,6 +365,8 @@ __content of this page html element__
 
 </article>
 
+</section>
+
 </main>
 </body>
 
diff --git a/app/view/templates/media.php b/app/view/templates/media.php
index 1b63b16..cf02ebb 100644
--- a/app/view/templates/media.php
+++ b/app/view/templates/media.php
@@ -12,7 +12,7 @@
 
 
 <div id="tree">
-<h1>Explorer</h1>
+<h2>Explorer</h2>
 
 
 <table id="dirlsit">
diff --git a/app/view/templates/timeline.php b/app/view/templates/timeline.php
index fcf8afd..874b953 100644
--- a/app/view/templates/timeline.php
+++ b/app/view/templates/timeline.php
@@ -14,6 +14,10 @@
 
 <main class="timeline">
 
+<section>
+
+<article id="live">
+
 <h1>Timeline</h1>
 
 <ul>
@@ -68,6 +72,12 @@ foreach ($groupedeventlist as $eventuser) {
 
 </ul>
 
+</article>
+
+<article id="message">
+
+<h2>Message</h2>
+
 <form action="<?= $this->url('timelineadd') ?>" method="post">
 
 <input type="hidden" name="type" value="message">
@@ -83,6 +93,10 @@ foreach ($groupedeventlist as $eventuser) {
 
 <?php } ?>
 
+</article>
+
+</section>
+
 </body>
 
 
diff --git a/app/view/templates/user.php b/app/view/templates/user.php
index 0f9ac7b..7512267 100644
--- a/app/view/templates/user.php
+++ b/app/view/templates/user.php
@@ -10,6 +10,9 @@
 
 <main class="user">
 
+<section>
+
+<article>
 
 <h1>User : <?= $user->id() ?></h1>
 
@@ -26,8 +29,13 @@
 
 </form>
 
+</article>
+
+
 <?php if($user->isadmin()) { ?>
 
+<article>
+
 <h1>Admin panel</h1>
 
 <table>
@@ -110,9 +118,14 @@ foreach ($userlist as $user ) {
 
 </table>
 
+</article>
+
 <?php } ?>
 
 
+</section>
+
+
 </main>
 </body>
 
diff --git a/assets/css/home.css b/assets/css/home.css
index 5bfb6d0..72192ee 100644
--- a/assets/css/home.css
+++ b/assets/css/home.css
@@ -15,13 +15,12 @@ div#options {
 
 div#main {
     overflow: auto;
-    width: 100%;
 }
 
 body {
     margin: 0;
     height: 100%;
-    background-color: lightgrey;
+    background-color: grey;
     font-family: monospace;
     font-size: 15px;
     position: fixed;
@@ -39,6 +38,24 @@ body {
 
 
 
+h1, h2 {
+    margin: 0;
+    background-color: #7b97b9;
+    color: white;
+    padding: 0.1% 0.5%;
+    font-size: larger;
+}
+
+
+
+main.media div, main.home div#options, main.home div#main, main.info nav, main article {
+    border: ridge 1px dimgrey;
+    margin: 1%;
+    background-color: lightgrey;
+}
+
+
+
 tr:hover {
     background-color: grey;
     color: white;
@@ -48,6 +65,7 @@ tr:hover {
     background-color: #7b97b9;
     width: 100%;
     padding: 3px 0.5%;
+    border-bottom: solid 1px dimgrey;
 }
 
 #topbar form {
@@ -81,7 +99,11 @@ main {
 main.admin input, select, textarea {
     display: block;
     width: 100%;
-    max-width: 400px;
+}
+
+main section {
+    max-width: 800px;
+    margin: 1%;
 }
 
 
@@ -155,11 +177,11 @@ main.info code, main.info blockquote {
 }
 
 main.info article {
-    max-width: 800px;
-    text-align: justify;
-    background-color: #e2e1e1;
-    margin: 1%;
-    padding: 1%;
+    /* max-width: 800px; */
+    /* text-align: justify; */
+    /* background-color: #e2e1e1; */
+    /* margin: 1%; */
+    /* padding: 1%; */
 }
 
 main.info blockquote i {
@@ -173,7 +195,7 @@ main.info article h2#manual {
     font-size: 40px;
 }
 
-main.info article h3 {
+main.info article#manual h3 {
     border-bottom: solid 1px grey;
     margin-top: 100px;
     padding-top: 15px;
@@ -208,8 +230,6 @@ main.info nav {
     left: 850px;
     top: 0px;
     margin-top: 50px;
-    border-left: solid 2px grey;
-    padding: 0 10px;
 }
 
 main.info article code i {
@@ -301,6 +321,24 @@ main.timeline textarea#message {
 
 
 
+main.timeline article#live {
+    overflow-y: scroll;
+}
+
+main.timeline section {
+    display: flex;
+    flex-direction: column;
+}
+
+main.timeline {
+    display: flex;
+    height: 100%;
+    flex-direction: row;
+}
+
+
+
+
 li.event:hover span.details {
     display: inline;
 }
@@ -328,6 +366,7 @@ main.timeline li.event {
     main.info nav {
         position: relative;
         left: 0;
+        margin-top: 1%;
     }
 
     main.home div#options {
@@ -338,3 +377,5 @@ main.timeline li.event {
 
 
 
+
+
diff --git a/composer.json b/composer.json
index b08ccac..d369040 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "w-cms",
     "description": "point'n think",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "require": {
         "michelf/php-markdown": "^1.8",
         "league/plates": "3.*",
-- 
cgit v1.2.3