From d338a77e7e260e31cac3bf4af5fd0318eb3b0174 Mon Sep 17 00:00:00 2001
From: Evg <budo@narod.ru>
Date: Mon, 14 Aug 2023 16:47:55 +0300
Subject: [PATCH] =?UTF-8?q?DEV:=20=D0=9C=D0=BE=D0=B1=D0=B8=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20(2?=
 =?UTF-8?q?=20=D1=87=D0=B0=D1=81=D1=82=D1=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

См. https://libarea.ru/post/1507/nachal-peredelyvat-mobilnuyu-versiyu-libarea-i-dr
---
 public/assets/css/catalog.css                 |   6 +-
 .../views/default/content/facets/all.php      | 114 +++++++++---------
 resources/views/default/content/item/add.php  |  36 +++---
 resources/views/default/content/item/edit.php |   2 +-
 .../views/default/content/post/page-view.php  |  54 +++++----
 resources/views/default/content/user/all.php  |  88 +++++++-------
 6 files changed, 154 insertions(+), 146 deletions(-)

diff --git a/public/assets/css/catalog.css b/public/assets/css/catalog.css
index 776d1161..0d5b63cc 100644
--- a/public/assets/css/catalog.css
+++ b/public/assets/css/catalog.css
@@ -68,17 +68,17 @@ body.item.dark .box {
   .item-cat {
     padding: 20px 20px 20px 15px;
   }
-  
+
   .categories-telo,
   .item-categories > div {
     width: 99%;
     margin-bottom: 10px;
-  }  
+  }
 
   .wrap.wrap-max {
     padding-left: .5rem;
     padding-right: .5rem;
   }
 
-  .item main { margin: 0.5rem; } 
+  .list-items { padding: 0 5px 0 0; }
 }
\ No newline at end of file
diff --git a/resources/views/default/content/facets/all.php b/resources/views/default/content/facets/all.php
index 6ad1e9a7..15f33ca0 100644
--- a/resources/views/default/content/facets/all.php
+++ b/resources/views/default/content/facets/all.php
@@ -1,68 +1,70 @@
 <main class="w-100">
-  <div class="mb15">
-    <h1 class="text-xl mt5 m0"><?= __('meta.' . $data['sheet'] . '_' . $data['type'] . 's'); ?></h1>
-    <span class="gray-600 text-xs">
-      <?= __('meta.' . $data['sheet'] . '_' . $data['type'] . 's_info'); ?>.
-    </span>
-  </div>
+  <div class="indent-body">
+    <div class="mb15">
+      <h1 class="text-xl mt5 m0"><?= __('meta.' . $data['sheet'] . '_' . $data['type'] . 's'); ?></h1>
+      <span class="gray-600 text-xs">
+        <?= __('meta.' . $data['sheet'] . '_' . $data['type'] . 's_info'); ?>.
+      </span>
+    </div>
 
-  <div class="flex justify-between mb20">
-    <ul class="nav scroll-menu">
+    <div class="flex justify-between mb20">
+      <ul class="nav scroll-menu">
 
-      <?= insert(
-        '/_block/navigation/nav',
-        [
-          'list' => [
-            [
-              'id'    => $data['type'] . '_all',
-              'url'   => url($data['type'] . 's.all'),
-              'title' => __('app.all'),
-            ],
-            [
-              'id'    => $data['type'] . '_new',
-              'url'   => url($data['type'] . 's.new'),
-              'title' => __('app.new_ones'),
-            ],
-            [
-              'tl'    => 1,
-              'id'    => $data['type'] . '_my',
-              'url'   => url($data['type'] . 's.my'),
-              'title' => __('app.reading'),
-            ],
+        <?= insert(
+          '/_block/navigation/nav',
+          [
+            'list' => [
+              [
+                'id'    => $data['type'] . '_all',
+                'url'   => url($data['type'] . 's.all'),
+                'title' => __('app.all'),
+              ],
+              [
+                'id'    => $data['type'] . '_new',
+                'url'   => url($data['type'] . 's.new'),
+                'title' => __('app.new_ones'),
+              ],
+              [
+                'tl'    => 1,
+                'id'    => $data['type'] . '_my',
+                'url'   => url($data['type'] . 's.my'),
+                'title' => __('app.reading'),
+              ],
+            ]
           ]
-        ]
-      );
-      ?>
+        );
+        ?>
 
-    </ul>
+      </ul>
 
-    <?php if (Access::trustLevels(config('trust-levels.tl_add_' . $data['type']))) : ?>
-      <?php if ($data['countUserFacet'] == 0 || UserData::checkAdmin()) : ?>
-        <p class="text-xl">
-          <a class="btn btn-outline-primary btn-small" href="<?= url('content.add', ['type' => $data['type']]); ?>">
-            <svg class="icons">
-              <use xlink:href="/assets/svg/icons.svg#plus"></use>
-            </svg>
-            <?= __('app.add'); ?>
-          </a>
-        </p>
+      <?php if (Access::trustLevels(config('trust-levels.tl_add_' . $data['type']))) : ?>
+        <?php if ($data['countUserFacet'] == 0 || UserData::checkAdmin()) : ?>
+          <p class="text-xl">
+            <a class="btn btn-outline-primary btn-small" href="<?= url('content.add', ['type' => $data['type']]); ?>">
+              <svg class="icons">
+                <use xlink:href="/assets/svg/icons.svg#plus"></use>
+              </svg>
+              <?= __('app.add'); ?>
+            </a>
+          </p>
+        <?php endif; ?>
       <?php endif; ?>
-    <?php endif; ?>
-  </div>
+    </div>
 
-  <?php if (!empty($data['facets'])) : ?>
-    <?php if ($data['type'] == 'blog') : ?>
-      <div class="mb20">
-        <?= insert('/_block/facet/blog-list-all', ['facets' => $data['facets']]); ?>
-      </div>
+    <?php if (!empty($data['facets'])) : ?>
+      <?php if ($data['type'] == 'blog') : ?>
+        <div class="mb20">
+          <?= insert('/_block/facet/blog-list-all', ['facets' => $data['facets']]); ?>
+        </div>
+      <?php else : ?>
+        <div class="flex justify-between gap-max flex-wrap mb20">
+          <?= insert('/_block/facet/topic-list-all', ['facets' => $data['facets']]); ?>
+        </div>
+      <?php endif; ?>
     <?php else : ?>
-      <div class="flex justify-between gap-max flex-wrap mb20">
-        <?= insert('/_block/facet/topic-list-all', ['facets' => $data['facets']]); ?>
-      </div>
+      <?= insert('/_block/no-content', ['type' => 'small', 'text' => __('app.no_content'), 'icon' => 'info']); ?>
     <?php endif; ?>
-  <?php else : ?>
-    <?= insert('/_block/no-content', ['type' => 'small', 'text' => __('app.no_content'), 'icon' => 'info']); ?>
-  <?php endif; ?>
 
-  <?= Html::pagination($data['pNum'], $data['pagesCount'], false, url($data['type'] . 's.' . $data['sheet'])); ?>
+    <?= Html::pagination($data['pNum'], $data['pagesCount'], false, url($data['type'] . 's.' . $data['sheet'])); ?>
+  </div>
 </main>
\ No newline at end of file
diff --git a/resources/views/default/content/item/add.php b/resources/views/default/content/item/add.php
index 8843c389..21197a21 100644
--- a/resources/views/default/content/item/add.php
+++ b/resources/views/default/content/item/add.php
@@ -1,24 +1,26 @@
 <?= insert('/_block/add-js-css'); ?>
 <div id="contentWrapper" class="wrap wrap-max justify-between">
   <main>
-    <?= insert('/_block/navigation/breadcrumbs', [
-      'list' => [
-        [
-          'name' => __('web.catalog'),
-          'link' => url('web')
-        ], [
-          'name' => __('web.add_website'),
-          'link' => 'red'
-        ],
-      ]
-    ]); ?>
+    <div class="indent-body">
+      <?= insert('/_block/navigation/breadcrumbs', [
+        'list' => [
+          [
+            'name' => __('web.catalog'),
+            'link' => url('web')
+          ], [
+            'name' => __('web.add_website'),
+            'link' => 'red'
+          ],
+        ]
+      ]); ?>
 
-    <form action="<?= url('content.create', ['type' => 'item']); ?>" class="max-w780" method="post">
-      <?= csrf_field() ?>
-      <?= insert('/_block/form/select/category', ['category' => $data['category'], 'action' => 'add']); ?>
-      <?= insert('/_block/form/add-website'); ?>
-      <?= Html::sumbit(__('web.add')); ?>
-    </form>
+      <form action="<?= url('content.create', ['type' => 'item']); ?>" class="max-w780" method="post">
+        <?= csrf_field() ?>
+        <?= insert('/_block/form/select/category', ['category' => $data['category'], 'action' => 'add']); ?>
+        <?= insert('/_block/form/add-website'); ?>
+        <?= Html::sumbit(__('web.add')); ?>
+      </form>
+    </div>
   </main>
   <aside>
     <div class="box box-shadow-all text-sm">
diff --git a/resources/views/default/content/item/edit.php b/resources/views/default/content/item/edit.php
index 1e27dcda..4d642029 100644
--- a/resources/views/default/content/item/edit.php
+++ b/resources/views/default/content/item/edit.php
@@ -3,7 +3,7 @@ $domain = $data['domain']; ?>
 
 <div id="contentWrapper" class="wrap wrap-max justify-between">
   <main>
-    <div class="max-w780">
+    <div class="indent-body max-w780">
 
       <?= insert('/_block/navigation/breadcrumbs', [
         'list' => [
diff --git a/resources/views/default/content/post/page-view.php b/resources/views/default/content/post/page-view.php
index a1e97266..07de0f3f 100644
--- a/resources/views/default/content/post/page-view.php
+++ b/resources/views/default/content/post/page-view.php
@@ -1,32 +1,34 @@
 <?php $page = $data['page']; ?>
 <main>
-  <article<?php if ($page['post_is_deleted'] == 1) : ?> class="bg-red-200" <?php endif; ?>>
-    <?php if ($page['post_is_deleted'] == 0 || UserData::checkAdmin()) : ?>
-      <h1>
-        <?= $page['post_title']; ?>
-      </h1>
-      <div class="max-w780 full">
-        <?= markdown($page['post_content'], 'text'); ?>
+  <div class="indent-body">
+    <article<?php if ($page['post_is_deleted'] == 1) : ?> class="bg-red-200" <?php endif; ?>>
+      <?php if ($page['post_is_deleted'] == 0 || UserData::checkAdmin()) : ?>
+        <h1>
+          <?= $page['post_title']; ?>
+        </h1>
+        <div class="max-w780 full">
+          <?= markdown($page['post_content'], 'text'); ?>
+        </div>
+      <?php else : ?>
+        <div class="bg-red-200 p15 center">
+          <?= __('app.content_deleted', ['name' => __('app.post')]); ?>...
+        </div>
+      <?php endif; ?>
+      </article>
+      <div class="flex justify-between">
+        <?= Html::votes($page, 'post'); ?>
+        <div class="gray-600 italic ml15">
+          <?= $page['post_modified']; ?>
+          <?php if (Access::author('post', $page) === true) : ?>
+            <a class="gray-600 ml5" title="<?= __('app.edit'); ?>" href="<?= url('content.edit', ['type' => $page['post_type'], 'id' => $page['post_id']]); ?>">
+              <svg class="icons">
+                <use xlink:href="/assets/svg/icons.svg#edit"></use>
+              </svg>
+            </a>
+          <?php endif; ?>
+        </div>
       </div>
-    <?php else : ?>
-      <div class="bg-red-200 p15 center">
-        <?= __('app.content_deleted', ['name' => __('app.post')]); ?>...
-      </div>
-    <?php endif; ?>
-    </article>
-    <div class="flex justify-between">
-      <?= Html::votes($page, 'post'); ?>
-      <div class="gray-600 italic ml15">
-        <?= $page['post_modified']; ?>
-        <?php if (Access::author('post', $page) === true) : ?>
-          <a class="gray-600 ml5" title="<?= __('app.edit'); ?>" href="<?= url('content.edit', ['type' => $page['post_type'], 'id' => $page['post_id']]); ?>">
-            <svg class="icons">
-              <use xlink:href="/assets/svg/icons.svg#edit"></use>
-            </svg>
-          </a>
-        <?php endif; ?>
-      </div>
-    </div>
+  </div>
 </main>
 <aside>
   <div class="box sticky top-sm bg-beige">
diff --git a/resources/views/default/content/user/all.php b/resources/views/default/content/user/all.php
index e275c8df..cef4885c 100644
--- a/resources/views/default/content/user/all.php
+++ b/resources/views/default/content/user/all.php
@@ -1,50 +1,52 @@
 <main class="w-100">
-  <div class="mb15">
-    <h1 class="text-xl mt5 m0"><?= __('meta.' . $data['sheet'] . '_users'); ?></h1>
-    <span class="gray-600 text-xs">
-      <?= __('meta.' . $data['sheet'] . '_users_info'); ?>.
-    </span>
-  </div>
+  <div class="indent-body">
+    <div class="mb15">
+      <h1 class="text-xl mt5 m0"><?= __('meta.' . $data['sheet'] . '_users'); ?></h1>
+      <span class="gray-600 text-xs">
+        <?= __('meta.' . $data['sheet'] . '_users_info'); ?>.
+      </span>
+    </div>
 
-  <div class="flex justify-between mb20">
-    <ul class="nav">
+    <div class="flex justify-between mb20">
+      <ul class="nav">
 
-      <?= insert(
-        '/_block/navigation/nav',
-        [
-          'list' => [
-            [
-              'id'    => $data['sheet'] . '_users_all',
-              'url'   => url('users.all'),
-              'title' => __('app.all'),
-            ], [
-              'id'    => $data['sheet'] . '_users_new',
-              'url'   => url('users.new'),
-              'title' => __('app.new_ones'),
-            ],
+        <?= insert(
+          '/_block/navigation/nav',
+          [
+            'list' => [
+              [
+                'id'    => $data['sheet'] . '_users_all',
+                'url'   => url('users.all'),
+                'title' => __('app.all'),
+              ], [
+                'id'    => $data['sheet'] . '_users_new',
+                'url'   => url('users.new'),
+                'title' => __('app.new_ones'),
+              ],
+            ]
           ]
-        ]
-      );
-      ?>
+        );
+        ?>
 
-    </ul>
+      </ul>
+    </div>
+
+    <div class="flex flex-wrap justify-between">
+      <?php foreach ($data['users'] as $user) : ?>
+        <div class="w160 mb-w100 mb20 center">
+          <a href="<?= url('profile', ['login' => $user['login']]); ?>">
+            <?= Img::avatar($user['avatar'], $user['login'], 'img-lg', 'max'); ?>
+            <div class="block mt5">
+              <?= $user['login']; ?>
+            </div>
+            <?php if ($user['name']) : ?>
+              <span class="gray text-sm"><?= $user['name']; ?></span>
+            <?php endif; ?>
+          </a>
+        </div>
+      <?php endforeach; ?>
+    </div>
+
+    <?= Html::pagination($data['pNum'], $data['pagesCount'], false, url('users.' . $data['sheet'])); ?>
   </div>
-
-  <div class="flex flex-wrap justify-between">
-    <?php foreach ($data['users'] as $user) : ?>
-      <div class="w160 mb-w100 mb20 center">
-        <a href="<?= url('profile', ['login' => $user['login']]); ?>">
-          <?= Img::avatar($user['avatar'], $user['login'], 'img-lg', 'max'); ?>
-          <div class="block mt5">
-            <?= $user['login']; ?>
-          </div>
-          <?php if ($user['name']) : ?>
-            <span class="gray text-sm"><?= $user['name']; ?></span>
-          <?php endif; ?>
-        </a>
-      </div>
-    <?php endforeach; ?>
-  </div>
-
-  <?= Html::pagination($data['pNum'], $data['pagesCount'], false, url('users.' . $data['sheet'])); ?>
 </main>
\ No newline at end of file