From 701c4637294fc9b63d53a8eeb26d46ef94af1941 Mon Sep 17 00:00:00 2001 From: vincent-peugnet Date: Fri, 21 Sep 2018 00:17:11 +0200 Subject: 2.6 media update + new skin + lot of bugs fixies --- .gitignore | 2 +- README.md | 11 ++- class/class.w.aff.php | 194 +++++++++++++++++++++++++++++----------------- class/class.w.app.php | 93 ++++++++++++---------- class/class.w.art.php | 28 ++++--- class/class.w.media.php | 51 ++++++++++++ class/class.w.opt.php | 49 ++++++------ config.sample.json | 0 fn/fn.php | 66 +++++++++++++--- public/css/style.css | 0 public/css/styleadmin.css | 68 ++++++++++++++++ public/css/stylebase.css | 7 +- public/css/stylehome.css | 55 ++++++++----- public/css/styleinfo.css | 80 +++++++++++++++++++ public/css/stylemedia.css | 99 ++++++++++++++--------- public/w/home.php | 19 +++-- public/w/index.php | 87 +++++++++++++++++---- public/w/menu.php | 17 ++-- 18 files changed, 678 insertions(+), 248 deletions(-) delete mode 100644 config.sample.json delete mode 100644 public/css/style.css create mode 100644 public/css/styleinfo.css diff --git a/.gitignore b/.gitignore index 74c3183..115d1b9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ config.json error_log public/media/* public/ACRRecordings/* -public/css/lecture/* +public/css/read/* diff --git a/README.md b/README.md index 8aab688..1a58eca 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,15 @@ The project is ispired by the *web publishing function* in *google docs* that cr There is 3 levels of privacy : 0. public -1. resctricted by reader code (read only) -2. non published : admin only +1. reader : resctricted by reader code (read only) +2. non published : editor and admin only + +And 4 levels of users : + +1. Reader +2. Invite +3. Editor +4. Administrator [Webpage of the project (in french)](http://vincent.club1.fr/w/?id=w) diff --git a/class/class.w.aff.php b/class/class.w.aff.php index 198f61e..d47ca7a 100644 --- a/class/class.w.aff.php +++ b/class/class.w.aff.php @@ -79,7 +79,7 @@ class Aff color: couleurlien() ?>; } - section a[target="_blank"] { + section a.external { color: couleurlienblank() ?>; } csstemplate($app) ?> @@ -161,8 +161,10 @@ class Aff
+ β†– + πŸ‘
@@ -221,7 +223,7 @@ public function head($title, $tool) } -public function arthead(Art $art, $cssread = '', $edit = 0) +public function arthead(Art $art, $cssdir, $cssread = '', $edit = 0) { ?> @@ -230,7 +232,7 @@ public function arthead(Art $art, $cssread = '', $edit = 0) - ' : '' ?> + ' : '' ?> <?= $edit == 1 ? '✏' : '' ?> <?= $art->titre() ?> @@ -311,30 +313,50 @@ public function header() } -public function home2table(App $app, $getlist) +public function home2table(App $app, $getlist, $masslist) { + echo '
'; + echo '

Articles

'; echo '
'; ?>
+

Mass Edit

- + + + + + + + + + +
session() >= $app::EDITOR) { echo ''; - echo ''; + echo ''; foreach ($getlist as $item) { echo ''; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -342,19 +364,21 @@ public function home2table(App $app, $getlist) echo ''; echo ''; echo ''; - echo ''; + echo ''; echo ''; } echo '
xtitletagsummaryβ†˜ toβ†— fromlast modificationdate of creationprivacyβš™ edit
xtitletagsummaryβ†˜ toβ†— fromlast modificationdate of creationprivacydisplay
' . $item->titre() . '' . $item->titre() . '' . $item->tag('sort') . '' . $item->intro() . '' . $item->liento('sort') . '' . $item->datemodif('hrdi') . '' . $item->datecreation('hrdi') . '' . $item->secure('string') . 'editπŸ‘
'; echo '
'; + echo '
'; } } public function option(App $app, Opt $opt) { if ($app->session() >= $app::EDITOR) { - echo '
'; - + echo '
'; + echo '

Options

'; + echo ''; echo ''; echo 'β¬…'; @@ -363,7 +387,12 @@ public function option(App $app, Opt $opt) $this->optionprivacy($opt); $this->optiontag($opt); - + if ($opt->invert() == 1) { + echo ''; + } else { + echo ''; + } + echo '