V 0.2.4 Page

- PageController:
  - Mehrspaltendarstellung
  - Trennung Layout Frontend/Backend
  - edit: neu: reference_id

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a7039d4dafcf92b84b6dc6e1c2e30b613c37233..9babd71883310358f3c61edf060780e66f4199d7 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
+# V 0.2.4 Page
+
+## Changed
+- PageController: 
+  - Mehrspaltendarstellung
+  - Trennung Layout Frontend/Backend
+  - edit: neu: reference_id
+
 # V 0.2.3 MediaWiki
 
+## Changed
+
 - Mediawiki: Korrekturen bei %date()% und %dateTime()%, %color()% umbenannt in %mark()%
 
 # V 0.2.2 MediaWiki Page

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 5b507af6ac6f7c0d6c0a3ab6139554a479234f25..4a608221410f04829681a77923fa1da3871062da 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -22,7 +22,7 @@ use Illuminate\Support\Facades\Validator;
 
 class PageController extends Controller
 {
-    private function asPreview(Page &$page, ?string $contents = null): string
+    private function asHtml(Page &$page, ?string $contents = null): string
     {
         $contents ??= $page->contents;
         $type = $page->markup_scope;
@@ -111,7 +111,7 @@ class PageController extends Controller
             $optionsPagetype = SProperty::optionsByScope('pagetype', $page->pagetype_scope, '');
             $optionsMarkup = SProperty::optionsByScope('markup', $page->markup_scope, '');
             $optionsLanguage = SProperty::optionsByScope('localization', $page->language_scope, '');
-            $preview = $this->asPreview($page);
+            $preview = $this->asHtml($page);
             $fields = $request->btnSubmit !== 'btnPreview' ? null : ['preview' => $preview];
             $context = new ContextLaraKnife($request, $fields, $page);
             $rc = view('page.edit', [
@@ -255,12 +255,38 @@ LEFT JOIN sproperties t4 ON t4.id=t0.owner_id
         if ($request->btnSubmit === 'btnCancel') {
             $rc = redirect('/page-index')->middleware('auth');
         } else {
-            $text = $this->asPreview($page);
-            $link = $page->audio_id == null ? null : File::relativeFileLink($page->audio_id);
-            $context = new ContextLaraKnife($request, ['text' => $text, 'link' => $link], $page);
-            $rc = view('page.showcol1', [
-                'context' => $context,
-            ]);
+            $textRaw = $page->contents;
+            $view = 'page.show-col1';
+            $audio = $page->audio_id == null ? null : File::relativeFileLink($page->audio_id);
+            $params = ['audio' => $audio];
+            if ($page->pagetype_scope != 2031/* chapter */) {
+                $columns = 1 + substr_count($textRaw, "\n---- %col%");
+                if ($columns <= 1) {
+                    $params["text1"] = $this->asHtml($page);
+                } else {
+                    $wiki = new MediaWiki();
+                    $parts = explode("\n---- %col%", $textRaw, 4);
+                    for ($no = 1; $no <= $columns; $no++) {
+                        $params["text$no"] = $wiki->toHtml($parts[$no - 1]);
+                    }
+                    $view = "page.show-col$columns";
+                }
+            } else {
+                /* Chapter: */
+                $text1 = $this->asHtml($page);
+                $params['text1'] = $text1;
+                $text2 = null;
+                $lang = SProperty::idOfLocalization(auth()->user()->localization);
+                if (($page2 = Page::where(['reference_id' => $page->id, 'language_scope' => $lang])->first()) != null) {
+                    $text2 = $this->asHtml($page2);
+                }
+                if ($text2 != null) {
+                    $params['text2'] = $text2;
+                    $view = 'page.text-col2';
+                }
+            }
+            $context = new ContextLaraKnife($request, $params, $page);
+            $rc = view($view, ['context' => $context]);
         }
         return $rc;
     }
@@ -273,20 +299,7 @@ LEFT JOIN sproperties t4 ON t4.id=t0.owner_id
                 'context' => $context,
             ]);
         } else {
-            $params = [];
-            $columns = $page->columns;
-            if ($columns <= 1) {
-                $params['text'] = $this->asPreview($page);
-            } else {
-                $cols = explode('----', $page->contents);
-                for ($no = 1; $no <= $columns; $no++) {
-                    $params["text$no"] = $this->asPreview($page, $cols[$no - 1]);
-                }
-            }
-            $context = new ContextLaraKnife($request, $params, $page);
-            $rc = view("page.showcol$columns", [
-                'context' => $context,
-            ]);
+            $rc = $this->showPretty($page, $request);
         }
         return $rc;
     }
@@ -338,8 +351,13 @@ LEFT JOIN sproperties t4 ON t4.id=t0.owner_id
      */
     public function update(Page $page, Request $request, array &$fields)
     {
-        $validator = Validator::make($fields, $this->rules(false));
+        $rules = $this->rules(false);
+        if ($fields['reference_id'] != null){
+            $rules['reference_id'] = 'exists:pages,id';
+        }
+        $validator = Validator::make($fields, $rules);
         if ($validator->fails()) {
+            $errors = $validator->errors();
             $rc = back()->withErrors($validator)->withInput();
         } else {
             $validated = $validator->validated();

diff --git a/app/Models/Page.php b/app/Models/Page.php
index f747dfa71d543c010795157805d9d38aaf855d5b..39cdb7e503cf5a72c2a8753038a5b5a88f516e76 100644 (file)
--- a/app/Models/Page.php
+++ b/app/Models/Page.php
@@ -23,7 +23,7 @@ class Page extends Model
         'order',
         'columns',
         'audio_id',
-        'cacheof_id',
+        'reference_id',
         'owner_id'
     ];
 }

diff --git a/composer.lock b/composer.lock
index 82125d244bdc4fd9f61de9ee37cb70c3fe407249..de67f3b74b753aa7f5777fdc9079b2e0f4096674 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -8,25 +8,25 @@
     "packages": [
         {
             "name": "brick/math",
-            "version": "0.11.0",
+            "version": "0.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478"
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478",
-                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478",
+                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^9.0",
-                "vimeo/psalm": "5.0.0"
+                "phpunit/phpunit": "^10.1",
+                "vimeo/psalm": "5.16.0"
             },
             "type": "library",
             "autoload": {
@@ -46,12 +46,17 @@
                 "arithmetic",
                 "bigdecimal",
                 "bignum",
+                "bignumber",
                 "brick",
-                "math"
+                "decimal",
+                "integer",
+                "math",
+                "mathematics",
+                "rational"
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.11.0"
+                "source": "https://github.com/brick/math/tree/0.12.1"
             },
             "funding": [
                 {
@@ -59,7 +64,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-15T23:15:59+00:00"
+            "time": "2023-11-29T23:19:16+00:00"
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -1051,7 +1056,7 @@
             "dist": {
                 "type": "path",
                 "url": "../laraknife",
-                "reference": "1947415cf873aba097bffffacc911a0c50c554bb"
+                "reference": "b903164d1c0f98b70657238210a55b05769cff3c"
             },
             "require-dev": {
                 "phpunit/phpunit": "11.0.x-dev"
@@ -3126,20 +3131,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.7.5",
+            "version": "4.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e"
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e",
-                "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
                 "ext-json": "*",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
@@ -3202,7 +3207,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.7.5"
+                "source": "https://github.com/ramsey/uuid/tree/4.7.6"
             },
             "funding": [
                 {
@@ -3214,7 +3219,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-08T05:53:05+00:00"
+            "time": "2024-04-27T21:32:50+00:00"
         },
         {
             "name": "spatie/laravel-permission",

diff --git a/database/migrations/2024_04_21_092103_create_pages_table.php b/database/migrations/2024_04_21_092103_create_pages_table.php
index bfd2c13ed95ba664712254638bb1a938c4b79021..3e361ca0d00ee3129ea12e7e81005f067fb647f7 100644 (file)
--- a/database/migrations/2024_04_21_092103_create_pages_table.php
+++ b/database/migrations/2024_04_21_092103_create_pages_table.php
@@ -24,7 +24,7 @@ return new class extends Migration
             $table->integer('language_scope');
             $table->integer('columns')->default(1);
             $table->foreignId('audio_id')->nullable()->references('id')->on('files');
-            $table->foreignId('cacheof_id')->nullable()->references('id')->on('pages');
+            $table->foreignId('reference_id')->nullable()->references('id')->on('pages');
             $table->foreignId('owner_id')->references('id')->on('users');
         });
     }

diff --git a/lang/de_DE.json b/lang/de_DE.json
index 7f38a41604863ba7bdf91fde66305d2a1d26e3c1..c64904de3ac26c8e3d76bdca6a803f199e3e280a 100644 (file)
--- a/lang/de_DE.json
+++ b/lang/de_DE.json
@@ -20,6 +20,7 @@
     "Change of a Menu Item": "\u00c4ndern einer Men\u00fceintrags",
     "Change of a Note": "\u00c4ndern einer Notiz",
     "Change of a Noun": "\u00c4nderung eines Nomens",
+    "Change of a Page": "\u00c4ndern einer Seite",
     "Change of a Phrase": "\u00c4nderung eines Satzes",
     "Change of a Role": "\u00c4ndern einer Rolle",
     "Change of a Scoped Property": "\u00c4ndern einer bereichsbasierten Eigenschaft",
@@ -29,6 +30,7 @@
     "Change of an User": "\u00c4ndern eines Benutzers",
     "Chapter": "Kapitel",
     "Chapters": "Kapitel",
+    "Columns": "Spalten",
     "Confirmation": "Best\u00e4tigung",
     "Contents": "Inhalt",
     "Creation of a Chapter": "Neues Kapitel",
@@ -36,7 +38,7 @@
     "Creation of a File": "Hochladen einer Datei",
     "Creation of a Menu Item": "Erstellen eine Men\u00fceintrags",
     "Creation of a Note": "Erstellen einer Notiz",
-    "Creation of a Page": "Neue Seite",
+    "Creation of a Page": "Erstellen einer Seite",
     "Creation of a Role": "Erstellen eine Rolle",
     "Creation of a Scoped Property": "Erzeugen einer bereichsbasierten Eigenschaft",
     "Creation of a Term": "Erstellen eines Termins",
@@ -109,6 +111,7 @@
     "Preview": "Vorschau",
     "Privacy": "Datenschutz",
     "Properties": "Eigenschaften",
+    "Reference": "Referenz",
     "Remain signed in": "Angemeldet bleiben",
     "Repetition": "Wiederholung",
     "Role": "Rolle",

diff --git a/resources/views/layouts/backend.blade.php b/resources/views/layouts/backend.blade.php
deleted file mode 120000 (symlink)
index 64b957d247234dcdb0f86320cf033caa53d67090..0000000000000000000000000000000000000000
--- a/resources/views/layouts/backend.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-gadeku.blade.php
\ No newline at end of file

diff --git a/resources/views/layouts/backend.blade.php b/resources/views/layouts/backend.blade.php
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..77546c2192dab7873f53b9285f3d9f842c559209
--- /dev/null
+++ b/resources/views/layouts/backend.blade.php
@@ -0,0 +1,54 @@
+<!doctype html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- CSRF Token -->
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+    <title>{{ config('app.name', 'Laravel') }}</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css">
+    <link href="/css/laraknife.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet">
+    @vite(['resources/sass/app.scss', 'resources/js/app.js'])
+    <link href="/css/laraknife.css" rel="stylesheet">
+    <link href="/css/gadeku.css" rel="stylesheet">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="/js/laraknife.js"></script>
+</head>
+<body>
+    <header>
+        <nav class="navbar navbar-expand-md bg-primary ">
+            <a class="navbar-brand" href="/menuitem-menu_main"><img id="img-logo" alt="Logo" src="img/logo_64.png"></a>
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+              <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="navbarTop">
+                <ul class="navbar-nav mr-auto">
+                    <li class="nav-item active">
+                        <a class="nav-link" href="/page-showmenu/main">Start</a>
+                    </li>
+                    <li class="nav-item active">
+                        <a class="nav-link" href="/menuitem-menu_main">Verwaltung</a>
+                    </li>
+                    <li>
+                        <a class="nav-link" href="/public/doc/Impressum.pdf" target="_blank">{{ __('Imprint') }}</a>
+                    </li>
+                    <li>
+                        <a class="nav-link" href="/public/doc/Datenschutz.pdf" target="_blank">{{ __('Privacy') }}</a>
+                    </li>
+                </ul>
+                <ul class="navbar-nav mr-auto lkn-logout">
+                    @auth
+                    <li class="nav-item border rounded-3">
+                        <a class="nav-link" href="/user-edit-current">{{ session('userName') }}</a>
+                    </li>
+                    @endauth
+                    <li><a href="/user-logout" class="btn btn-success">{{ __('Logout') }}</a></li>
+                </ul>
+           </div>                
+        </nav>
+    </header>
+        @yield('content')
+</body>
+</html>
+

diff --git a/resources/views/layouts/frontend.blade.php b/resources/views/layouts/frontend.blade.php
new file mode 100644 (file)
index 0000000..e79dee2
--- /dev/null
+++ b/resources/views/layouts/frontend.blade.php
@@ -0,0 +1,54 @@
+<!doctype html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- CSRF Token -->
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+    <title>{{ config('app.name', 'Laravel') }}</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css">
+    <link href="/css/laraknife.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet">
+    @vite(['resources/sass/app.scss', 'resources/js/app.js'])
+    <link href="/css/laraknife.css" rel="stylesheet">
+    <link href="/css/gadeku.css" rel="stylesheet">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="/js/laraknife.js"></script>
+</head>
+<body class="lkn-text-frame-background">
+    <header>
+        <nav class="navbar navbar-expand-md bg-primary ">
+            <a class="navbar-brand" href="/menuitem-menu_main"><img id="img-logo" alt="Logo" src="img/logo_64.png"></a>
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+              <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="navbarTop">
+                <ul class="navbar-nav mr-auto">
+                    <li class="nav-item active">
+                        <a class="nav-link" href="/page-showmenu/main">Start</a>
+                    </li>
+                    <li class="nav-item active">
+                        <a class="nav-link" href="/menuitem-menu_main">Verwaltung</a>
+                    </li>
+                    <li>
+                        <a class="nav-link" href="/public/doc/Impressum.pdf" target="_blank">{{ __('Imprint') }}</a>
+                    </li>
+                    <li>
+                        <a class="nav-link" href="/public/doc/Datenschutz.pdf" target="_blank">{{ __('Privacy') }}</a>
+                    </li>
+                </ul>
+                <ul class="navbar-nav mr-auto lkn-logout">
+                    @auth
+                    <li class="nav-item border rounded-3">
+                        <a class="nav-link" href="/user-edit-current">{{ session('userName') }}</a>
+                    </li>
+                    @endauth
+                    <li><a href="/user-logout" class="btn btn-success">{{ __('Logout') }}</a></li>
+                </ul>
+           </div>                
+        </nav>
+    </header>
+        @yield('content')
+</body>
+</html>
+

diff --git a/resources/views/layouts/gadeku.blade.php b/resources/views/layouts/gadeku.blade.php
deleted file mode 100644 (file)
index 77546c2..0000000
--- a/resources/views/layouts/gadeku.blade.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<!doctype html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <!-- CSRF Token -->
-    <meta name="csrf-token" content="{{ csrf_token() }}">
-    <title>{{ config('app.name', 'Laravel') }}</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css">
-    <link href="/css/laraknife.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet">
-    @vite(['resources/sass/app.scss', 'resources/js/app.js'])
-    <link href="/css/laraknife.css" rel="stylesheet">
-    <link href="/css/gadeku.css" rel="stylesheet">
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="/js/laraknife.js"></script>
-</head>
-<body>
-    <header>
-        <nav class="navbar navbar-expand-md bg-primary ">
-            <a class="navbar-brand" href="/menuitem-menu_main"><img id="img-logo" alt="Logo" src="img/logo_64.png"></a>
-            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
-              <span class="navbar-toggler-icon"></span>
-            </button>
-            <div class="collapse navbar-collapse" id="navbarTop">
-                <ul class="navbar-nav mr-auto">
-                    <li class="nav-item active">
-                        <a class="nav-link" href="/page-showmenu/main">Start</a>
-                    </li>
-                    <li class="nav-item active">
-                        <a class="nav-link" href="/menuitem-menu_main">Verwaltung</a>
-                    </li>
-                    <li>
-                        <a class="nav-link" href="/public/doc/Impressum.pdf" target="_blank">{{ __('Imprint') }}</a>
-                    </li>
-                    <li>
-                        <a class="nav-link" href="/public/doc/Datenschutz.pdf" target="_blank">{{ __('Privacy') }}</a>
-                    </li>
-                </ul>
-                <ul class="navbar-nav mr-auto lkn-logout">
-                    @auth
-                    <li class="nav-item border rounded-3">
-                        <a class="nav-link" href="/user-edit-current">{{ session('userName') }}</a>
-                    </li>
-                    @endauth
-                    <li><a href="/user-logout" class="btn btn-success">{{ __('Logout') }}</a></li>
-                </ul>
-           </div>                
-        </nav>
-    </header>
-        @yield('content')
-</body>
-</html>
-

diff --git a/resources/views/page/edit.blade.php b/resources/views/page/edit.blade.php
index 5014df31f405e8e96bd9db7e2994e5ce7d81c1c3..72f19ac3b55eb238219a624840460d6e2a657c4b 100644 (file)
--- a/resources/views/page/edit.blade.php
+++ b/resources/views/page/edit.blade.php
@@ -12,8 +12,10 @@
                 value="{{ $context->valueOf('columns') }}" width2="4" />
             <x-laraknife.forms.string type="number" position="last" name="order" label="Order"
                 value="{{ $context->valueOf('order') }}" width2="4" />
-            <x-laraknife.forms.combobox position="alone" name="language_scope" label="Language" :options="$optionsLanguage"
+            <x-laraknife.forms.combobox position="first" name="language_scope" label="Language" :options="$optionsLanguage"
                 width2="4" attribute="readonly" />
+            <x-laraknife.forms.string type="number" position="last" name="reference_id" label="Reference"
+                value="{{ $context->valueOf('reference_id') }}" width2="4" />
             <x-laraknife.forms.string position="first" name="title" label="Title"
                 value="{{ $context->valueOf('title') }}" width2="4" />
             <x-laraknife.forms.string position="last" name="name" label="Name (URL)"

diff --git a/resources/views/page/index.blade.php b/resources/views/page/index.blade.php
index 61318f2e06511a1494e6d57385b105233ca5bc95..f81fdb2c21116be101663754c1c48b148dd81e5b 100644 (file)
--- a/resources/views/page/index.blade.php
+++ b/resources/views/page/index.blade.php
@@ -17,6 +17,7 @@
         <thead>
           <tr>
             <th></th>
+            <th sortId="id">{{__('Id')}}</th>
             <th sortId="title">{{__('Title')}}</th>
             <th sortId="pagetype">{{__('Pagetype')}}</th>
             <th sortId="markup">{{__('Markup')}}</th>
@@ -29,6 +30,7 @@
 @foreach ($records as $page)
         <tr>
             <td><x-laraknife.icons.change-record module="page" no="{{ $page->id }}" /></td>
+              <td> {{ __($page->id) }}</td>
               <td><a href="/page-showpretty/{{ $page->id }}">{{$page->title}}</a></td>
               <td> {{ __($page->pagetype) }}</td>
               <td> {{ __($page->markup) }}</td>

diff --git a/resources/views/page/show-col1.blade.php b/resources/views/page/show-col1.blade.php
new file mode 100644 (file)
index 0000000..e4d966f
--- /dev/null
+++ b/resources/views/page/show-col1.blade.php
@@ -0,0 +1,17 @@
+@extends('layouts.frontend')
+
+@section('content')
+    <form id="page-show" action="/page-show/{{ $context->model->id }}" method="POST">
+        @csrf
+        <x-laraknife.panels.text-area title="{{ $context->valueof('title') }}">
+            <div class="lkn-text">
+                {!! $context->valueOf('text') !!}
+            </div>
+        </x-laraknife.panels.text-area>
+        @if ($context->valueof('link') != null)
+            <div class="row">
+                <x-laraknife.forms.audio width1="5" width2="2" fileLink="{{ $context->valueof('link') }}" />
+            </div>
+        @endif
+    </form>
+@endsection

diff --git a/resources/views/page/show-col2.blade.php b/resources/views/page/show-col2.blade.php
new file mode 100644 (file)
index 0000000..045327b
--- /dev/null
+++ b/resources/views/page/show-col2.blade.php
@@ -0,0 +1,24 @@
+@extends('layouts.frontend')
+
+@section('content')
+    <form id="page-show" action="/page-show/{{ $context->model->id }}" method="POST">
+        @csrf
+        <x-laraknife.panels.text-area title="{{ $context->valueof('title') }}">
+            <div class="lkn-text">
+            <div class="row">
+                <div class="col-md-6">
+                {!! $context->valueOf('text1') !!}
+                </div>
+                <div class="col-md-6">
+                {!! $context->valueOf('text2') !!}
+                </div>
+            </div>
+            </div>
+        </x-laraknife.panels.text-area>
+        @if ($context->valueof('audio') != null)
+            <div class="row">
+                <x-laraknife.forms.audio width1="5" width2="2" fileLink="{{ $context->valueof('audio') }}" />
+            </div>
+        @endif
+    </form>
+@endsection

diff --git a/resources/views/page/show-col3.blade.php b/resources/views/page/show-col3.blade.php
new file mode 100644 (file)
index 0000000..e798954
--- /dev/null
+++ b/resources/views/page/show-col3.blade.php
@@ -0,0 +1,27 @@
+@extends('layouts.frontend')
+
+@section('content')
+    <form id="page-show" action="/page-show/{{ $context->model->id }}" method="POST">
+        @csrf
+        <x-laraknife.panels.text-area title="{{ $context->valueof('title') }}">
+            <div class="lkn-text">
+                <div class="row">
+                    <div class="col-md-4">
+                        {!! $context->valueOf('text1') !!}
+                    </div>
+                    <div class="col-md-4">
+                        {!! $context->valueOf('text2') !!}
+                    </div>
+                    <div class="col-md-4">
+                        {!! $context->valueOf('text3') !!}
+                    </div>
+                </div>
+            </div>
+        </x-laraknife.panels.text-area>
+        @if ($context->valueof('audio') != null)
+            <div class="row">
+                <x-laraknife.forms.audio width1="5" width2="2" fileLink="{{ $context->valueof('audio') }}" />
+            </div>
+        @endif
+    </form>
+@endsection

diff --git a/resources/views/page/show-col4.blade.php b/resources/views/page/show-col4.blade.php
new file mode 100644 (file)
index 0000000..89446d0
--- /dev/null
+++ b/resources/views/page/show-col4.blade.php
@@ -0,0 +1,30 @@
+@extends('layouts.frontend')
+
+@section('content')
+    <form id="page-show" action="/page-show/{{ $context->model->id }}" method="POST">
+        @csrf
+        <x-laraknife.panels.text-area title="{{ $context->valueof('title') }}">
+            <div class="lkn-text">
+                <div class="row">
+                    <div class="col-md-3">
+                        {!! $context->valueOf('text1') !!}
+                    </div>
+                    <div class="col-md-3">
+                        {!! $context->valueOf('text2') !!}
+                    </div>
+                    <div class="col-md-3">
+                        {!! $context->valueOf('text3') !!}
+                    </div>
+                    <div class="col-md-3">
+                        {!! $context->valueOf('text4') !!}
+                    </div>
+                </div>
+            </div>
+        </x-laraknife.panels.text-area>
+        @if ($context->valueof('link') != null)
+            <div class="row">
+                <x-laraknife.forms.audio width1="5" width2="2" fileLink="{{ $context->valueof('link') }}" />
+            </div>
+        @endif
+    </form>
+@endsection

diff --git a/resources/views/page/showcol1.blade.php b/resources/views/page/showcol1.blade.php
deleted file mode 100644 (file)
index f853209..0000000
--- a/resources/views/page/showcol1.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-@extends('layouts.backend')
-
-@section('content')
-    <form id="page-show" action="/page-show/{{ $context->model->id }}" method="POST">
-        @csrf
-        <x-laraknife.panels.noform-text title="{{ $context->valueof('title') }}">
-            <div class="row">
-                {!! $context->valueOf('text') !!}
-            </div>
-        </x-laraknife.panels.noform-text>
-        @if ($context->valueof('link') != null)
-            <div class="row">
-                <x-laraknife.forms.audio width1="5" width2="2" fileLink="{{ $context->valueof('link') }}" />
-            </div>
-        @endif
-    </form>
-@endsection

diff --git a/resources/views/page/showcol2.blade.php b/resources/views/page/showcol2.blade.php
deleted file mode 100644 (file)
index 5cae863..0000000
--- a/resources/views/page/showcol2.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-@extends('layouts.backend')
-
-@section('content')
-    <form id="page-show" action="/page-show/{{ $context->model->id }}" method="POST">
-        @csrf
-        <x-laraknife.panels.noform-text title="{{ $context->valueof('title') }}">
-            <div class="row">
-                <div class="col-md-6">
-                {!! $context->valueOf('text1') !!}
-                </div>
-                <div class="col-md-6">
-                {!! $context->valueOf('text2') !!}
-                </div>
-            </div>
-        </x-laraknife.panels.noform-text>
-        @if ($context->valueof('link') != null)
-            <div class="row">
-                <x-laraknife.forms.audio width1="5" width2="2" fileLink="{{ $context->valueof('link') }}" />
-            </div>
-        @endif
-    </form>
-@endsection

diff --git a/resources/views/page/showcol3.blade.php b/resources/views/page/showcol3.blade.php
deleted file mode 100644 (file)
index ad334e3..0000000
--- a/resources/views/page/showcol3.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-@extends('layouts.backend')
-
-@section('content')
-    <form id="page-show" action="/page-show/{{ $context->model->id }}" method="POST">
-        @csrf
-        <x-laraknife.panels.noform-text title="{{ $context->valueof('title') }}">
-            <div class="row">
-                <div class="col-md-4">
-                {!! $context->valueOf('text1') !!}
-                </div>
-                <div class="col-md-4">
-                {!! $context->valueOf('text2') !!}
-                </div>
-               <div class="col-md-4">
-                {!! $context->valueOf('text3') !!}
-                </div>
-            </div>
-        </x-laraknife.panels.noform-text>
-        @if ($context->valueof('link') != null)
-            <div class="row">
-                <x-laraknife.forms.audio width1="5" width2="2" fileLink="{{ $context->valueof('link') }}" />
-            </div>
-        @endif
-    </form>
-@endsection

diff --git a/resources/views/page/showcol4.blade.php b/resources/views/page/showcol4.blade.php
deleted file mode 100644 (file)
index 6c1ccef..0000000
--- a/resources/views/page/showcol4.blade.php
+++ /dev/null
@@ -1,28 +0,0 @@
-@extends('layouts.backend')
-
-@section('content')
-    <form id="page-show" action="/page-show/{{ $context->model->id }}" method="POST">
-        @csrf
-        <x-laraknife.panels.noform-text title="{{ $context->valueof('title') }}">
-            <div class="row">
-                <div class="col-md-3">
-                {!! $context->valueOf('text1') !!}
-                </div>
-                <div class="col-md-3">
-                {!! $context->valueOf('text2') !!}
-                </div>
-               <div class="col-md-3">
-                {!! $context->valueOf('text3') !!}
-                </div>
-               <div class="col-md-3">
-                {!! $context->valueOf('text4') !!}
-                </div>
-            </div>
-        </x-laraknife.panels.noform-text>
-        @if ($context->valueof('link') != null)
-            <div class="row">
-                <x-laraknife.forms.audio width1="5" width2="2" fileLink="{{ $context->valueof('link') }}" />
-            </div>
-        @endif
-    </form>
-@endsection

diff --git a/resources/views/page/text-col2.blade.php b/resources/views/page/text-col2.blade.php
new file mode 100644 (file)
index 0000000..194c509
--- /dev/null
+++ b/resources/views/page/text-col2.blade.php
@@ -0,0 +1,26 @@
+@extends('layouts.frontend')
+
+@section('content')
+    <form id="page-show" action="/page-show/{{ $context->model->id }}" method="POST">
+        @csrf
+        <x-laraknife.panels.text-area title="{{ $context->valueof('title') }}">
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="lkn-text">
+                        {!! $context->valueOf('text1') !!}
+                    </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="lkn-text">
+                        {!! $context->valueOf('text2') !!}
+                    </div>
+                </div>
+            </div>
+        </x-laraknife.panels.text-area>
+        @if ($context->valueof('audio') != null)
+            <div class="row">
+                <x-laraknife.forms.audio width1="5" width2="2" fileLink="{{ $context->valueof('audio') }}" />
+            </div>
+        @endif
+    </form>
+@endsection