From 67b20c49ec4e5efb4526fc64ef679dfb6dd41e30 Mon Sep 17 00:00:00 2001 From: vincent-peugnet Date: Thu, 4 Oct 2018 05:10:51 +0200 Subject: 2.8 auto-tag-update + help + tabs --- class/class.w.aff.php | 232 +++++++++++++++++++++++++++++++++++------------ class/class.w.app.php | 54 ++++++----- class/class.w.art.php | 48 +++++++++- class/class.w.config.php | 14 +++ public/css/stylebase.css | 22 ++++- public/css/styleedit.css | 150 ++++++++++++++++++++++++------ public/test/index.php | 24 +++++ public/w/article.php | 9 +- public/w/index.php | 36 +++++++- 9 files changed, 466 insertions(+), 123 deletions(-) create mode 100644 public/test/index.php diff --git a/class/class.w.aff.php b/class/class.w.aff.php index 0c7aa24..d14e682 100644 --- a/class/class.w.aff.php +++ b/class/class.w.aff.php @@ -94,80 +94,171 @@ class Aff } } - public function edit(Art $art, App $app, $list) + public function edit(Art $art, App $app, $list, $fontsize, $imagelist) { + if ($app->session() >= self::$edit) { ?>
- - - -
- Infos -
- - - - - - - - - - -
-
-
- CSS -
- - + + + + 👁 + + id() ?> + + + + +
+
+ Infos +
+ + + + + + + + + + + + +
+
+
+ Advanced +
+

Template options

+

NOT WORKING

+
    template() == 'NULL') { - echo ''; - } else { - echo ''; - } - foreach ($list as $item) { - if ($item->id() == $art->template()) { - echo ''; + $templatelist = ['header' => 0, 'section' => 0, 'nav' => 0, 'aside' => 0, 'footer' => 0, 'quickcss' => 1, 'css' => 1]; + + foreach ($templatelist as $template => $check) { + if($check == 1) { + echo '
    • '; } else { - echo ''; + echo '
    • '; } } - ?> - - - - - - - - - - - -
-
- - - - -
- ↖ - - - 👁 + ?> + +
+
+
+ Quick CSS +
+ + $art->couleurtext(), 'lien' => $art->couleurlien(), 'lienblank' => $art->couleurlienblank(), 'bkg' => $art->couleurbkg()]; + foreach ($colorlist as $element => $color) { + echo ''; + } + + + + ?> + + + + +
+
+
+ Help +
+

Help !

+

To save your article, clic on the HOME, UPDATE, or DISPLAY buttons. You can use the keyboard shortcuts as well.

+ 
ALT + W : home
+ 
ALT + X : update
+ 
ALT + C : display
+

Markdown

+

The html section use Markdown encoding : synthax. But the following strategies are specific to W.

+

Links

+ 
[text](=article_id)
+

where article_id is the article's id you want to point to.

+

Images

+ 
[altimage](/img_id.extension)
+

Where img_id is the id of your image and its extension.

+

Tricks

+ 
%TITLE%
+

Show the title of your article.

+ 
%DESCRIPTION%
+

Show the description (intro) of your article.

+ 
%%tag_name%%
+

Generate a list of links to all articles under this tag.

+

vv

+

vv

+

vv

+

+
+
+ + + + + + + + '; + foreach ($tablist as $key => $value) { + echo '
'; + if ($key == $opentab) { + echo ''; + } else { + echo ''; + } + echo ''; + echo '
'; + echo ''; + echo '
'; + echo '
'; + } + + echo ''; +} + + public function copy(Art $art, $list) { diff --git a/class/class.w.app.php b/class/class.w.app.php index 82e2bef..d8751ab 100644 --- a/class/class.w.app.php +++ b/class/class.w.app.php @@ -11,6 +11,7 @@ class App const SQL_READ_DIR = '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR; const MEDIA_DIR = '..' . DIRECTORY_SEPARATOR . 'media' . DIRECTORY_SEPARATOR; const MEDIA_EXTENSIONS = array('jpeg', 'jpg', 'JPG', 'png', 'gif', 'mp3', 'mp4', 'mov', 'wav', 'flac', 'pdf'); + const MEDIA_TYPES = ['image', 'video', 'sound', 'other']; const ADMIN = 10; @@ -176,7 +177,6 @@ class App public function update(Art $art) { $now = new DateTimeImmutable(null, timezone_open("Europe/Paris")); - $art->updatelien(); $q = $this->bdd->prepare('UPDATE ' . $this->arttable . ' SET titre = :titre, soustitre = :soustitre, intro = :intro, tag = :tag, datecreation = :datecreation, datemodif = :datemodif, css = :css, html = :html, secure = :secure, couleurtext = :couleurtext, couleurbkg = :couleurbkg, couleurlien = :couleurlien, couleurlienblank = :couleurlienblank, lien = :lien, template = :template WHERE id = :id'); @@ -326,7 +326,26 @@ class App $req->closeCursor(); return $donnees; + } + public function tag(array $artlist, $tagchecked) + { + $artcheckedlist = []; + foreach($artlist as $art) { + if (in_array($tagchecked, $art->tag('array'))) { + $artcheckedlist[] = $art; + } + } + return $artcheckedlist; + } + + public function taglist(array $artlist, array $tagcheckedlist) + { + $taglist = []; + foreach ($tagcheckedlist as $tag) { + $taglist[$tag] = $this->tag($artlist, $tag); + } + return $taglist; } public function count() @@ -497,39 +516,26 @@ class App } - public function getlistermedia($dir) + public function getlistermedia($dir, $type="all") { if ($handle = opendir($dir)) { $list = []; while (false !== ($entry = readdir($handle))) { if ($entry != "." && $entry != "..") { - - // var_dump($entry); - - // $fileinfo = pathinfo($entry); - - // var_dump($fileinfo); - - - // $filepath = $dir . $fileinfo['filename'] . '.' . $fileinfo['extension']; - - // list($width, $height, $type, $attr) = getimagesize($filepath); - // $filesize = filesize($filepath); - - // $donnees = array( - // 'id' => str_replace('.' . $fileinfo['extension'], '', $fileinfo['filename']), - // 'path' => dirname($entry), - // 'extension' => $fileinfo['extension'] - // ); - - // $media = new Media($donnees); - $media = $this->getmedia($entry, $dir); $media->analyse(); - $list[] = $media; + + if(in_array($type, self::MEDIA_TYPES)) { + if($media->type() == $type) { + $list[] = $media; + } + } else { + $list[] = $media; + } + } } diff --git a/class/class.w.art.php b/class/class.w.art.php index 2238f71..12ff1e3 100644 --- a/class/class.w.art.php +++ b/class/class.w.art.php @@ -73,7 +73,9 @@ class Art public function updatelien() { - $this->lien = search($this->md(true), self::DEBUT, self::FIN); + $this->lien = []; + $this->lien = array_unique(search($this->md(true), self::DEBUT, self::FIN)); + } public static function classvarlist() @@ -100,6 +102,38 @@ class Art } + public function autotaglist() + { + $pattern = "/%%(\w*)%%/"; + preg_match_all($pattern, $this->md(), $out); + return $out[1]; + + } + + public function autotaglistupdate($taglist) + { + foreach ($taglist as $tag => $artlist) { + $replace = ''; + $this->html = str_replace('%%' . $tag . '%%', $replace, $this->html); + } + } + + public function autotaglistcalc($taglist) + { + foreach ($taglist as $tag => $artlist) { + foreach ($artlist as $art) { + if(!in_array($art->id(), $this->lien('array')) && $art->id() != $this->id()) { + $this->lien[] = $art->id(); + } + } + } + } + + // _____________________________________________________ G E T ____________________________________________________ public function id($type = 'string') @@ -181,7 +215,7 @@ class Art public function md($expand = false) { - if($expand == true) { + if ($expand == true) { $md = str_replace('](=', '](?id=', $this->html); } else { $md = $this->html; @@ -192,6 +226,7 @@ class Art public function html(App $app) { $html = Markdown::defaultTransform($this->html); + $html = str_replace('href="=', 'href="?id=', $html); foreach ($this->lien('array') as $id) { $title = "Cet article n'existe pas encore"; @@ -205,7 +240,10 @@ class Art $html = str_replace($lien, $titlelien, $html); } - $html = str_replace('href="=', 'href="?id=', $html); + + + $html = str_replace('%TITLE%', $this->titre(), $html); + $html = str_replace('%DESCRIPTION%', $this->intro(), $html); $html = str_replace('href="../media/', ' class="file" target="_blank" href="../media/', $html); $html = str_replace('href="http', ' class="external" target="_blank" href="http', $html); $html = str_replace('tag = $taglist; diff --git a/class/class.w.config.php b/class/class.w.config.php index 1d5f7b5..68b0987 100644 --- a/class/class.w.config.php +++ b/class/class.w.config.php @@ -16,6 +16,7 @@ class Config private $read; private $cssread; private $color4; + private $fontsize = 6; // _______________________________________ F U N _______________________________________ @@ -105,6 +106,11 @@ class Config return $this->color4; } + public function fontsize() + { + return $this->fontsize; + } + // __________________________________________ S E T ______________________________________ @@ -171,6 +177,14 @@ class Config } } + public function setfontsize($fontsize) + { + $fontsize = intval($fontsize); + if($fontsize > 1) { + $this->fontsize = $fontsize; + } + } + } diff --git a/public/css/stylebase.css b/public/css/stylebase.css index c733e79..017b075 100644 --- a/public/css/stylebase.css +++ b/public/css/stylebase.css @@ -5,14 +5,32 @@ --color4: grey; } + +@keyframes alert { + from {top: 30px;} + to {top: -50px;} +} + body { margin: 0; - font-family: monospace; + font-family: sans-serif; background-color: var(--color4); } - +span.alert { + position: fixed; + background-color: var(--color1); + z-index: 100; + border: ridge red; + width: 200px; + text-align: center; + padding: 5px; + top: 30px; + font-weight: bold; + left: calc(50% - 100px); + animation: alert 1s linear 2s forwards; +} form{ diff --git a/public/css/styleedit.css b/public/css/styleedit.css index 3a868c3..fe6745f 100644 --- a/public/css/styleedit.css +++ b/public/css/styleedit.css @@ -25,37 +25,25 @@ details { - - - -details#editinfo { - position: fixed; - top: 0; - left: 10%; - width: 40%; -} - -details#editcss { - position: fixed; - top: 0; - left: 50%; - width: 40%; +.sidebar { + position: fixed; + width: 250px; + height: 100%; + overflow: scroll; + overflow-x: hidden; } div#submit { - position: fixed; - top: 0; - width: 10%; + position: relative; } -textarea#html { - width: 100%; +textarea { + position: fixed; + width: calc(100% - 250px); + right: 0px; height: 100%; font-size: 1em; - padding-top: 40px; - padding-bottom: 40px; - font-family: serif; - padding-left: 2%; + padding: 2%; padding-right: calc(50% - 500px); resize: none; @@ -96,19 +84,25 @@ div#roll ul { details label { - display: block; margin-top: 4px; } -textarea#css { - width: 100%; - height: 200px; -} details select, details input, details label, details textarea#css { width: 100%; } +details input[type="checkbox"] +{ + width: auto; +} + +ul { + list-style: none; + padding: 0; + margin: 2px; +} + fieldset { margin: 0; padding: 0; @@ -120,6 +114,104 @@ summary, div#linklist, div#copy, div#submit { } +span#headid { + font-weight: bold; + padding-left: 1%; + padding-right: 1%; + border: ridge; + background-color: var(--color3); + +} + +input#fontsize { + width: 40px; +} + +summary { + background-color: var(--color1); + border: outset; + font-weight: bold; +} + +summary:focus { + outline: none; +} + +div#help { + padding: 2px; +} + +div#help pre { + background-color: white; + margin-bottom: 2px; +} + +div#help p { + background-color: var(--color3); + margin-top: 4px; +} + +div#help h3 {margin-bottom: 8px;} + +span.i { + background-color: var(--color2); + color: white; +} + + + +/* ------------------------------ TABS ----------------------------- */ + + + +.tabs +{ + position: absolute; + left: 250px; + top: 28px; +} + +.tabs .tab +{ + float: left; +} + +.tabs .tab .content +{ + position: absolute; + background-color: white; + left: 0px; + width: 100%; + border: 1px #000 solid; +} + +.checkboxtab +{ + display: none; +} + +.tab label +{ + margin-right: 10px; + border: outset; + background-color: var(--color1); +} + +.checkboxtab:checked ~ label +{ + border: inset; +} + +.checkboxtab:checked ~ .content +{ + z-index: 1; +} + + + + + + @media (max-width: 600px) { details#editinfo, details#editcss, div#copy, div#linklist { diff --git a/public/test/index.php b/public/test/index.php new file mode 100644 index 0000000..5b778ee --- /dev/null +++ b/public/test/index.php @@ -0,0 +1,24 @@ + + + $value) { + $replace = '^^ÔHYEAH BB££___'.$out[1][$key]. '_____§§§§§§'; + $string = str_replace($value, $replace, $string); + +} + + +var_dump($out); + +var_dump($string); + +?> \ No newline at end of file diff --git a/public/w/article.php b/public/w/article.php index e5cfff7..307caa4 100644 --- a/public/w/article.php +++ b/public/w/article.php @@ -6,12 +6,17 @@ if ($app->exist($_GET['id'])) { if (isset($_GET['edit']) and $_GET['edit'] == 1 and $app->session() >= $app::EDITOR) { echo '
'; - $aff->edit($art, $app, $app->getlister(['id', 'titre'])); - $aff->copy($art, $app->getlister(['id', 'titre'])); + $aff->edit($art, $app, $app->getlister(['id', 'titre']), $config->fontsize(), $app->getlistermedia($app::MEDIA_DIR, 'image')); + //$aff->copy($art, $app->getlister(['id', 'titre'])); $aff->aside($app); echo '
'; } else { echo '
'; + + + $art->autotaglistupdate($app->taglist($app->getlister(['id', 'titre', 'intro', 'tag']), $art->autotaglist())); + + $aff->lecture($art, $app); echo '
'; diff --git a/public/w/index.php b/public/w/index.php index 1f3e967..887cc9a 100644 --- a/public/w/index.php +++ b/public/w/index.php @@ -118,8 +118,42 @@ if (isset($_POST['action'])) { case 'update': if ($app->exist($_GET['id'])) { $art = new Art($_POST); + $art->updatelien(); + $art->autotaglistcalc($app->taglist($app->getlister(['id', 'titre', 'tag']), $art->autotaglist())); $app->update($art); - header('Location: ?id=' . $art->id() . '&edit=1'); + if($config->fontsize() != $_POST['fontsize']) { + $config->setfontsize($_POST['fontsize']); + $app->savejson($config->tojson()); + } + header('Location: ?id=' . $art->id() . '&edit=1&message='.$art->id().'_saved'); + } + break; + + case 'display': + if ($app->exist($_GET['id'])) { + $art = new Art($_POST); + $art->updatelien(); + $art->autotaglistcalc($app->taglist($app->getlister(['id', 'titre', 'tag']), $art->autotaglist())); + $app->update($art); + if($config->fontsize() != $_POST['fontsize']) { + $config->setfontsize($_POST['fontsize']); + $app->savejson($config->tojson()); + } + header('Location: ?id=' . $art->id().'&message='.$art->id().'_saved'); + } + break; + + case 'home': + if ($app->exist($_GET['id'])) { + $art = new Art($_POST); + $art->updatelien(); + $art->autotaglistcalc($app->taglist($app->getlister(['id', 'titre', 'tag']), $art->autotaglist())); + $app->update($art); + if($config->fontsize() != $_POST['fontsize']) { + $config->setfontsize($_POST['fontsize']); + $app->savejson($config->tojson()); + } + header('Location: ./?message='.$art->id().'_saved'); } break; -- cgit v1.2.3