LoweBowe/libarea
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ADD: Модальное окно на странице ответов

Browse source 
+ Изменен дизайн Тем, исправление всех известных ошибок.
This commit is contained in:
Evg 2022-05-29 18:07:43 +03:00
parent 5ac0f636d0
commit c9c906fa3b
16 changed files with 61 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Controllers/Answer/AnswerController.php
View file

@ -2,6 +2,7 @@
namespace App\Controllers\Answer;
use Hleb\Constructor\Handlers\Request;
use App\Controllers\Controller;
use App\Models\AnswerModel;
use Meta;
@ -17,6 +18,8 @@ class AnswerController extends Controller
$pagesCount = AnswerModel::getAnswersCount($sheet);
$answers = AnswerModel::getAnswers($this->pageNumber, $this->limit, $this->user, $sheet);
Request::getResources()->addBottomScript('/assets/js/zoom/medium-zoom.min.js');
$m = [
'og' => false,
'url' => url('answers'),

2
app/Controllers/User/ProfileController.php
View file

@ -90,6 +90,8 @@ class ProfileController extends Controller
$answers = AnswerModel::userAnswers($this->pageNumber, $this->limit, $profile['id'], $this->user['id']);
$pagesCount = AnswerModel::userAnswersCount($profile['id']);
Request::getResources()->addBottomScript('/assets/js/zoom/medium-zoom.min.js');
return $this->render(
'/user/profile/answer',
'base',

10
app/Languages/ru/app.php
View file

@ -276,13 +276,13 @@ return [
'posts' => 'Посты',
'language' => 'Локализация',
'ru_language' => 'Русский(RU)',
'en_language' => 'Английский(EN)',
'de_language' => 'Немецкий(DE)',
'fr_language' => 'Французский(FR)',
'ru_language' => 'Русский (RU)',
'en_language' => 'Английский (EN)',
'de_language' => 'Немецкий (DE)',
'fr_language' => 'Французский (FR)',
'zh_TW_language' => 'Традиционный китайский (ZH_TW)',
'zh_CN_language' => 'Упрощенный китайский (ZH_CN)',
'ro_language' => 'Румынский(RO)',
'ro_language' => 'Румынский (RO)',
'type' => 'Тип',
'logo' => 'Логотип',

2
app/Models/FacetModel.php
View file

@ -63,7 +63,7 @@ class FacetModel extends \Hleb\Scheme\App\Models\MainModel
$signet = "WHERE facet_type = '$type' ORDER BY facet_id DESC";
break;
case 'all':
$signet = "WHERE facet_type = '$type' ORDER BY facet_id DESC";
$signet = "WHERE facet_type = '$type' ORDER BY facet_count DESC";
break;
case 'ban':
$signet = "WHERE facet_type = '$type' AND facet_is_deleted = 1 ORDER BY facet_id DESC";

6
modules/admin/App/Console.php
View file

@ -4,7 +4,7 @@ namespace Modules\Admin\App;
use Hleb\Constructor\Handlers\Request;
use Modules\Admin\App\Models\ConsoleModel;
use SendEmail, Html;
use SendEmail, Msg;
class Console
{
@ -55,7 +55,7 @@ class Console
$email = Request::getPost('mail');
SendEmail::mailText(1, 'admin.test', ['email' => $email]);
Html::addMsg(__('admin.completed'), 'success');
Msg::add(__('admin.completed'), 'success');
redirect(url('admin.tools'));
}
@ -70,7 +70,7 @@ class Console
public static function consoleRedirect()
{
if (PHP_SAPI != 'cli') {
Html::addMsg(__('admin.completed'), 'success');
Msg::add(__('admin.completed'), 'success');
}
return true;
}

2
public/assets/css/style.css
View file

File diff suppressed because one or more lines are too long

8
resources/views/default/_block/facet/focus-users.php
View file

@ -1,6 +1,6 @@
<?php if ($focus_users) : ?>
<span class="text-sm mt20 gray-600">
<div class="uppercase inline mr5"><?= __('app.reads'); ?>:</div>
<span class="text-sm mt20">
<div class="uppercase inline gray-600 mr5"><?= __('app.reads'); ?>:</div>
<?php $n = 0;
foreach ($focus_users as $user) :
$n++; ?>
@ -9,8 +9,10 @@
</a>
<?php endforeach; ?>
<?php if ($n > 5) : ?><span class="ml10">...</span><?php endif; ?>
<span class="focus-user gray-600 ml10">
<?php if (!empty($topic_focus_count)) : ?>
<span class="focus-user ml10 sky">
<?= $topic_focus_count; ?>
</span>
<?php endif; ?>
</span>
<?php endif; ?>

7
resources/views/default/content/answer/answers.php
View file

@ -25,4 +25,9 @@
<?= __('meta.answers_desc'); ?>
</div>
</aside>
<?= insert('/_block/js-msg-flag'); ?>
<?= insert('/_block/js-msg-flag'); ?>
<script nonce="<?= $_SERVER['nonce']; ?>">
document.addEventListener('DOMContentLoaded', () => {
mediumZoom(document.querySelectorAll('.content-body p img:not(.emoji)'));
});
</script>

20
resources/views/default/content/facets/blog.php
View file

@ -14,9 +14,8 @@ if ($blog['facet_is_deleted'] == 0) : ?>
</a>
<?php endif; ?>
</h1>
<div class="text-sm"><?= $blog['facet_short_description']; ?></div>
<div class="mt15 right">
<div class="text-sm mt10"><?= $blog['facet_short_description']; ?></div>
<div class="right">
<?= Html::signed([
'type' => 'facet',
'id' => $blog['facet_id'],
@ -24,14 +23,6 @@ if ($blog['facet_is_deleted'] == 0) : ?>
'state' => is_array($data['facet_signed']),
]); ?>
</div>
<div class="relative max-w300">
<?= insert('/_block/facet/focus-users', [
'topic_focus_count' => $blog['facet_focus_count'],
'focus_users' => $data['focus_users'] ?? '',
]); ?>
<div class="content_<?= $blog['facet_id']; ?> absolute bg-white box-shadow-all z-10 right0"></div>
</div>
</div>
</div>
@ -52,6 +43,13 @@ if ($blog['facet_is_deleted'] == 0) : ?>
<i class="bi-calendar-week mr5 ml5 middle"></i>
<span class="middle lowercase"><?= Html::langDate($blog['facet_add_date']); ?></span>
</div>
<div class="relative max-w300 mt15">
<?= insert('/_block/facet/focus-users', [
'topic_focus_count' => $blog['facet_focus_count'],
'focus_users' => $data['focus_users'] ?? '',
]); ?>
<div class="content_<?= $blog['facet_id']; ?> absolute bg-white box-shadow-all z-10 right0"></div>
</div>
</div>
<?php if ($data['info']) : ?>
<div class="box text-sm shown_post">

9
resources/views/default/content/facets/topic-header.php
View file

@ -11,9 +11,9 @@
</a>
<?php endif; ?>
</h1>
<div class="text-sm gray-600"><?= $topic['facet_short_description']; ?></div>
<div class="text-sm gray-600 mt10"><?= $topic['facet_short_description']; ?></div>
<div class="mt15 right">
<div class="mt10 right">
<?= Html::signed([
'type' => 'facet',
'id' => $topic['facet_id'],
@ -21,11 +21,6 @@
'state' => is_array($data['facet_signed']),
]); ?>
</div>
<?= insert('/_block/facet/focus-users', [
'topic_focus_count' => $topic['facet_focus_count'],
'focus_users' => $data['focus_users'] ?? '',
]); ?>
</div>
</div>

7
resources/views/default/content/user/profile/answer.php
View file

@ -19,4 +19,9 @@
</aside>
</div>
</div>
<?= insert('/_block/js-msg-flag'); ?>
<?= insert('/_block/js-msg-flag'); ?>
<script nonce="<?= $_SERVER['nonce']; ?>">
document.addEventListener('DOMContentLoaded', () => {
mediumZoom(document.querySelectorAll('.content-body p img:not(.emoji)'));
});
</script>

3
resources/views/default/scss/components/catalog.scss
View file

@ -83,8 +83,7 @@ body.item.dark .box {
.dropdown { min-width: 220px; }
@media (max-width: 890px) {
aside,
.logo {
.item.logo {
display: none;
}

5
resources/views/default/scss/components/components.scss
View file

@ -152,7 +152,10 @@ code {
font-size: 14px;
}
pre { white-space: pre-wrap; }
pre {
white-space: pre-wrap;
word-wrap: break-word;
}
blockquote {
margin-left: 15px;

4
resources/views/default/scss/components/media.scss
View file

@ -20,8 +20,8 @@ main { width: calc(100% - 390px); }
}
iframe {
max-width: 300px;
max-height: 180px;
max-width: 270px;
max-height: 170px;
}
.menu__left { min-width: 160px; }

19
resources/views/qa/content/facets/blog.php
View file

@ -14,9 +14,9 @@ if ($blog['facet_is_deleted'] == 0) : ?>
</a>
<?php endif; ?>
</h1>
<div class="text-sm"><?= $blog['facet_short_description']; ?></div>
<div class="text-sm mt10"><?= $blog['facet_short_description']; ?></div>
<div class="mt15 right">
<div class="mt10 right">
<?= Html::signed([
'type' => 'facet',
'id' => $blog['facet_id'],
@ -24,14 +24,6 @@ if ($blog['facet_is_deleted'] == 0) : ?>
'state' => is_array($data['facet_signed']),
]); ?>
</div>
<div class="relative max-w300">
<?= insert('/_block/facet/focus-users', [
'topic_focus_count' => $blog['facet_focus_count'],
'focus_users' => $data['focus_users'] ?? '',
]); ?>
<div class="content_<?= $blog['facet_id']; ?> absolute bg-white box-shadow-all z-10 right0"></div>
</div>
</div>
</div>
@ -52,6 +44,13 @@ if ($blog['facet_is_deleted'] == 0) : ?>
<i class="bi-calendar-week mr5 ml5 middle"></i>
<span class="middle lowercase"><?= Html::langDate($blog['facet_add_date']); ?></span>
</div>
<div class="relative max-w300 mt15">
<?= insert('/_block/facet/focus-users', [
'topic_focus_count' => $blog['facet_focus_count'],
'focus_users' => $data['focus_users'] ?? '',
]); ?>
<div class="content_<?= $blog['facet_id']; ?> absolute bg-white box-shadow-all z-10 right0"></div>
</div>
</div>
<?php if ($data['info']) : ?>
<div class="bg-violet box text-sm shown_post">

9
resources/views/qa/content/facets/topic-header.php
View file

@ -11,9 +11,9 @@
</a>
<?php endif; ?>
</h1>
<div class="help"><?= $topic['facet_short_description']; ?></div>
<div class="help mt10"><?= $topic['facet_short_description']; ?></div>
<div class="mt15 right">
<div class="mt10 right">
<?= Html::signed([
'type' => 'facet',
'id' => $topic['facet_id'],
@ -21,11 +21,6 @@
'state' => is_array($data['facet_signed']),
]); ?>
</div>
<?= insert('/_block/facet/focus-users', [
'topic_focus_count' => $topic['facet_focus_count'],
'focus_users' => $data['focus_users'] ?? '',
]); ?>
</div>
</div>