From 8ccc4ac00c974ba3659762e6c67f75ed82020e37 Mon Sep 17 00:00:00 2001 From: vincent-peugnet Date: Tue, 14 Apr 2020 16:36:45 +0200 Subject: finish flashmessages implementation + clean css --- app/view/templates/admin.php | 395 ++++++++++++++++++++-------------------- app/view/templates/edit.php | 2 - app/view/templates/home.php | 392 ++++++++++++++++++++------------------- app/view/templates/homemenu.php | 33 ++-- app/view/templates/info.php | 2 - app/view/templates/layout.php | 14 +- app/view/templates/media.php | 6 +- app/view/templates/timeline.php | 4 +- app/view/templates/user.php | 36 ++-- 9 files changed, 431 insertions(+), 453 deletions(-) (limited to 'app/view') diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php index 3ae8036..ab35bd0 100644 --- a/app/view/templates/admin.php +++ b/app/view/templates/admin.php @@ -3,298 +3,295 @@ start('page') ?> - +insert('backtopbar', ['user' => $user, 'tab' => 'admin', 'pagelist' => $pagelist]) ?> - insert('backtopbar', ['user' => $user, 'tab' => 'admin', 'pagelist' => $pagelist]) ?> +
-
+ -
+
-
+
-

configuration

+

configuration

-
+
-

Home page

+

Home page

-

Here you can set the home-page view for visitors.

+

Here you can set the home-page view for visitors.

-
- form="admin"> - -
+
+ form="admin"> + +
-
- form="admin"> - -
+
+ form="admin"> + +
- + - - - + + - + ?> + -

Page creation

+

Page creation

-

What really happend when you create a new page

+

What really happend when you create a new page

- - + + - - + + -

Alert pages

+

Alert pages

-

Set the style and text to show when a page does not exist, or when a visitor don't have access to it.

+

Set the style and text to show when a page does not exist, or when a visitor don't have access to it.

-

Common options

+

Common options

- - + + - - - + + - - + + -

Un-existing

- - This will also be shown as a tooltip over links. - +

Un-existing

-
- - form="admin"> - -
+ + This will also be shown as a tooltip over links. + -

Private

+
+ + form="admin"> + +
- - +

Private

-
- - form="admin"> - -
+ + -

Not published

+
+ + form="admin"> + +
- - +

Not published

-
- - form="admin"> - -
+ + -

CSS

+
+ + form="admin"> + +
-
- - form="admin"> - -
+

CSS

-

- You can use body.alert class to specify style. -

+
+ + form="admin"> + +
+

+ You can use body.alert class to specify style. +

-

Render

-
- - form="admin"> - -
+

Render

+
+ + form="admin"> + +
-

Links

-
- - form="admin"> - -
+

Links

-
- - form="admin"> - -
+
+ + form="admin"> + +
- (This modifications need re-rendering) +
+ + form="admin"> + +
+ (This modifications need re-rendering) -

CSS

- - +

CSS

- - + + - - + + -

Interface

+ + -

Set interface Style

+

Interface

- +

Set interface Style

+ -

Tracking

- - +

Tracking

- (Need rendering to work) + + + (Need rendering to work) -
+
-
-
-
-

Databases

-
+
-
+
+
+

Databases

+
+ + + + + -
usingdatabasespages
- - - -
usingdatabasespages
+ + - - + + - + -

Duplicate Database

+

Duplicate Database

-
+ - - + - + + + - - - -
+ + + + -
-
+ +
-
- +
stop('page') ?> \ No newline at end of file diff --git a/app/view/templates/edit.php b/app/view/templates/edit.php index a27171a..22dda20 100644 --- a/app/view/templates/edit.php +++ b/app/view/templates/edit.php @@ -7,7 +7,6 @@ -
insert('backtopbar', ['user' => $user, 'tab' => 'edit', 'pagelist' => $pagelist, 'pageid' => $page->id()]) ?> @@ -32,6 +31,5 @@ let pagetitle = 'title() ?>'; - stop('page') ?> \ No newline at end of file diff --git a/app/view/templates/home.php b/app/view/templates/home.php index d6d1f51..387ef0c 100644 --- a/app/view/templates/home.php +++ b/app/view/templates/home.php @@ -6,243 +6,239 @@ start('page') ?> - - insert('backtopbar', ['user' => $user, 'tab' => 'home', 'pagelist' => $pagelist]) ?> +insert('backtopbar', ['user' => $user, 'tab' => 'home', 'pagelist' => $pagelist]) ?> - iseditor()) { ?> +iseditor()) { ?> - insert('homemenu', ['user' => $user, 'opt' => $opt, 'optlist' => $optlist, 'pagelist' => $pagelist, 'faviconlist' => $faviconlist, 'thumbnaillist' => $thumbnaillist, 'editorlist' => $editorlist, 'colors' => $colors]); - ?> +insert('homemenu', ['user' => $user, 'opt' => $opt, 'optlist' => $optlist, 'pagelist' => $pagelist, 'faviconlist' => $faviconlist, 'thumbnaillist' => $thumbnaillist, 'editorlist' => $editorlist, 'colors' => $colors]); +?> -
+
- insert('homeopt', ['opt' => $opt, 'user' => $user, 'display' => $display]) ?> + insert('homeopt', ['opt' => $opt, 'user' => $user, 'display' => $display]) ?> -
+
-
+
-

Pages () >list / >map

+

Pages () >list / >map

- + - + -
-
- - > - - > - - - - -
-
- -
- - - - - - - - - -
-
- - > - - > - - > - - > - - > - - > - - -
-
- - - +
+
+ + > + + > + + + + +
+
+
+ + + + + + + + + +
+
+ + > + + > + + > + + > + + > + + > + + +
+
-
- - - - issupereditor()) { ?> - - - - - - - - issupereditor()) { ?> - - + + +
+ +
x icoideditseedeldl
+ + + issupereditor()) { ?> + + + + + + + + issupereditor()) { ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + issupereditor()) { ?> + + + + + + + + issupereditor()) { ?> + + - - taglinks($item->tag('array')) ?> + - - title() ?>"> + - - description() ?>">description('short') ?> + - - linktolink($item->linkto('array')) ?> + - - datemodif('dmy') ?> datemodif('ptime') ?>> + - - datecreation('dmy') ?> datecreation('ptime') ?>> + - - date('dmy') ?> date('ptime') ?>> + - - securelink($item->secure('int') , $item->secure('string')) ?> + - - authorlinks($item->authors('array')) ?> + - - visitcount() ?> + - - editcount() ?> + - - - - - - - - issupereditor()) { ?> - - - - - - - - issupereditor()) { ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
x icoideditseedeldltagtitlesummarylinktolast modificationdate of creationdateprivacyauthorsvisiteditaff
<?= $item->favicon() ?>issupereditor() || in_array($user->id(), $item->authors())) { ?>issupereditor() || $item->authors() === [$user->id()]) { ?>✖tagtitlesummarylinktolast modificationdate of creationdateprivacyauthorsvisiteditaff
<?= $item->favicon() ?>issupereditor() || in_array($user->id(), $item->authors())) { ?>issupereditor() || $item->authors() === [$user->id()]) { ?>✖taglinks($item->tag('array')) ?>description('short') ?>linktolink($item->linkto('array')) ?>datemodif('dmy') ?> datemodif('ptime') ?>>datecreation('dmy') ?> datecreation('ptime') ?>>date('dmy') ?> date('ptime') ?>>securelink($item->secure('int') , $item->secure('string')) ?>authorlinks($item->authors('array')) ?>visitcount() ?>editcount() ?>affcount() ?>
-
- - - -
+ affcount() ?> + + -
- - - display()['bookmark'] && (!empty(Wcms\Config::bookmark()) || !empty($user->bookmark()))) { ?> - -
-
-

Bookmarks

-
- Public -
    - $query) { ?> -
  • - -
    • - -
- id() ?> -
    - bookmark() as $id => $query) { ?> -
  • - -
    • - -
-
+ + + - - + + + + +
+ + + display()['bookmark'] && (!empty(Wcms\Config::bookmark()) || !empty($user->bookmark()))) { ?> + +
+
+

Bookmarks

+
+ Public +
    + $query) { ?> +
  • + +
    • + +
+ id() ?> +
    + bookmark() as $id => $query) { ?> +
  • + +
    • + +
+
+ + -
- - insert('footer', ['footer' => $footer]) ?> + - +
- +insert('footer', ['footer' => $footer]) ?> - + + stop() ?> \ No newline at end of file diff --git a/app/view/templates/homemenu.php b/app/view/templates/homemenu.php index 9d28ffa..ff39f1c 100644 --- a/app/view/templates/homemenu.php +++ b/app/view/templates/homemenu.php @@ -7,7 +7,7 @@

Import page as file

- + @@ -38,13 +38,7 @@
Edit selected pages -

Render

- -

Delete

- - - - +

Edit Meta infos

@@ -181,6 +175,15 @@
+

Render

+ + +

Delete

+ + + + +
@@ -195,7 +198,7 @@
> - Filters + Filter

Get LIST code

Generate code to display a list of pages @@ -309,18 +312,6 @@
Display
-

Worksapce

-
-
    - display() as $id => $setting) { ?> -
  • - > - -
    • - -
- -

Columns

    diff --git a/app/view/templates/info.php b/app/view/templates/info.php index 0e722a6..e77fbe3 100644 --- a/app/view/templates/info.php +++ b/app/view/templates/info.php @@ -3,7 +3,6 @@ start('page') ?> - insert('backtopbar', ['user' => $user, 'tab' => 'info', 'pagelist' => $pagelist]) ?> @@ -76,6 +75,5 @@
- stop('page') ?> \ No newline at end of file diff --git a/app/view/templates/layout.php b/app/view/templates/layout.php index c96c61f..7b8ef13 100644 --- a/app/view/templates/layout.php +++ b/app/view/templates/layout.php @@ -38,19 +38,23 @@ -
+ +
    • - -
-
+ + +
+ + + section('page') ?> + -section('page') ?> \ No newline at end of file diff --git a/app/view/templates/media.php b/app/view/templates/media.php index 9f56116..9901b8e 100644 --- a/app/view/templates/media.php +++ b/app/view/templates/media.php @@ -7,11 +7,10 @@ $this->layout('layout', ['title' => 'media', 'stylesheets' => [$css . 'home.css' start('page') ?> - - insert('backtopbar', ['user' => $user, 'tab' => 'media', 'pagelist' => $pagelist]) ?> +insert('backtopbar', ['user' => $user, 'tab' => 'media', 'pagelist' => $pagelist]) ?> - insert('mediamenu', ['user' => $user, 'pathlist' => $pathlist, 'mediaopt' => $mediaopt]) ?> +insert('mediamenu', ['user' => $user, 'pathlist' => $pathlist, 'mediaopt' => $mediaopt]) ?>
@@ -116,6 +115,5 @@ $this->layout('layout', ['title' => 'media', 'stylesheets' => [$css . 'home.css' - stop('page') ?> \ No newline at end of file diff --git a/app/view/templates/timeline.php b/app/view/templates/timeline.php index f06180e..e3c6438 100644 --- a/app/view/templates/timeline.php +++ b/app/view/templates/timeline.php @@ -6,9 +6,8 @@ start('page') ?> - - insert('backtopbar', ['user' => $user, 'tab' => 'timeline', 'pagelist' => $pagelist]) ?> +insert('backtopbar', ['user' => $user, 'tab' => 'timeline', 'pagelist' => $pagelist]) ?> iseditor()) { ?> @@ -97,7 +96,6 @@ foreach ($groupedeventlist as $eventuser) { - diff --git a/app/view/templates/user.php b/app/view/templates/user.php index f77699d..faa44aa 100644 --- a/app/view/templates/user.php +++ b/app/view/templates/user.php @@ -7,14 +7,12 @@ $this->layout('layout', ['title' => 'user', 'stylesheets' => [$css . 'home.css'] start('page') ?> - - - insert('backtopbar', ['user' => $user, 'tab' => 'user', 'pagelist' => $pagelist]) ?> +insert('backtopbar', ['user' => $user, 'tab' => 'user', 'pagelist' => $pagelist]) ?>
-
+
@@ -34,25 +32,26 @@ $this->layout('layout', ['title' => 'user', 'stylesheets' => [$css . 'home.css']

Preferences

+
- + -

- - -

When you tick the remember-me checkbox during login, you can choose how much time W will remember you.

+ + +

When you tick the remember-me checkbox during login, you can choose how much time W will remember you.

- - - - + + + + -
- -

- - +

Password have to be between and characters long.

+ + + + +
@@ -215,6 +214,5 @@ $this->layout('layout', ['title' => 'user', 'stylesheets' => [$css . 'home.css']
- stop('page') ?> \ No newline at end of file -- cgit v1.2.3