ADD: Модальное окно на странице ответов
+ Изменен дизайн Тем, исправление всех известных ошибок.
This commit is contained in:
parent
5ac0f636d0
commit
c9c906fa3b
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
namespace App\Controllers\Answer;
|
namespace App\Controllers\Answer;
|
||||||
|
|
||||||
|
use Hleb\Constructor\Handlers\Request;
|
||||||
use App\Controllers\Controller;
|
use App\Controllers\Controller;
|
||||||
use App\Models\AnswerModel;
|
use App\Models\AnswerModel;
|
||||||
use Meta;
|
use Meta;
|
||||||
|
@ -17,6 +18,8 @@ class AnswerController extends Controller
|
||||||
$pagesCount = AnswerModel::getAnswersCount($sheet);
|
$pagesCount = AnswerModel::getAnswersCount($sheet);
|
||||||
$answers = AnswerModel::getAnswers($this->pageNumber, $this->limit, $this->user, $sheet);
|
$answers = AnswerModel::getAnswers($this->pageNumber, $this->limit, $this->user, $sheet);
|
||||||
|
|
||||||
|
Request::getResources()->addBottomScript('/assets/js/zoom/medium-zoom.min.js');
|
||||||
|
|
||||||
$m = [
|
$m = [
|
||||||
'og' => false,
|
'og' => false,
|
||||||
'url' => url('answers'),
|
'url' => url('answers'),
|
||||||
|
|
|
@ -90,6 +90,8 @@ class ProfileController extends Controller
|
||||||
$answers = AnswerModel::userAnswers($this->pageNumber, $this->limit, $profile['id'], $this->user['id']);
|
$answers = AnswerModel::userAnswers($this->pageNumber, $this->limit, $profile['id'], $this->user['id']);
|
||||||
$pagesCount = AnswerModel::userAnswersCount($profile['id']);
|
$pagesCount = AnswerModel::userAnswersCount($profile['id']);
|
||||||
|
|
||||||
|
Request::getResources()->addBottomScript('/assets/js/zoom/medium-zoom.min.js');
|
||||||
|
|
||||||
return $this->render(
|
return $this->render(
|
||||||
'/user/profile/answer',
|
'/user/profile/answer',
|
||||||
'base',
|
'base',
|
||||||
|
|
|
@ -276,13 +276,13 @@ return [
|
||||||
'posts' => 'Посты',
|
'posts' => 'Посты',
|
||||||
|
|
||||||
'language' => 'Локализация',
|
'language' => 'Локализация',
|
||||||
'ru_language' => 'Русский(RU)',
|
'ru_language' => 'Русский (RU)',
|
||||||
'en_language' => 'Английский(EN)',
|
'en_language' => 'Английский (EN)',
|
||||||
'de_language' => 'Немецкий(DE)',
|
'de_language' => 'Немецкий (DE)',
|
||||||
'fr_language' => 'Французский(FR)',
|
'fr_language' => 'Французский (FR)',
|
||||||
'zh_TW_language' => 'Традиционный китайский (ZH_TW)',
|
'zh_TW_language' => 'Традиционный китайский (ZH_TW)',
|
||||||
'zh_CN_language' => 'Упрощенный китайский (ZH_CN)',
|
'zh_CN_language' => 'Упрощенный китайский (ZH_CN)',
|
||||||
'ro_language' => 'Румынский(RO)',
|
'ro_language' => 'Румынский (RO)',
|
||||||
|
|
||||||
'type' => 'Тип',
|
'type' => 'Тип',
|
||||||
'logo' => 'Логотип',
|
'logo' => 'Логотип',
|
||||||
|
|
|
@ -63,7 +63,7 @@ class FacetModel extends \Hleb\Scheme\App\Models\MainModel
|
||||||
$signet = "WHERE facet_type = '$type' ORDER BY facet_id DESC";
|
$signet = "WHERE facet_type = '$type' ORDER BY facet_id DESC";
|
||||||
break;
|
break;
|
||||||
case 'all':
|
case 'all':
|
||||||
$signet = "WHERE facet_type = '$type' ORDER BY facet_id DESC";
|
$signet = "WHERE facet_type = '$type' ORDER BY facet_count DESC";
|
||||||
break;
|
break;
|
||||||
case 'ban':
|
case 'ban':
|
||||||
$signet = "WHERE facet_type = '$type' AND facet_is_deleted = 1 ORDER BY facet_id DESC";
|
$signet = "WHERE facet_type = '$type' AND facet_is_deleted = 1 ORDER BY facet_id DESC";
|
||||||
|
|
|
@ -4,7 +4,7 @@ namespace Modules\Admin\App;
|
||||||
|
|
||||||
use Hleb\Constructor\Handlers\Request;
|
use Hleb\Constructor\Handlers\Request;
|
||||||
use Modules\Admin\App\Models\ConsoleModel;
|
use Modules\Admin\App\Models\ConsoleModel;
|
||||||
use SendEmail, Html;
|
use SendEmail, Msg;
|
||||||
|
|
||||||
class Console
|
class Console
|
||||||
{
|
{
|
||||||
|
@ -55,7 +55,7 @@ class Console
|
||||||
$email = Request::getPost('mail');
|
$email = Request::getPost('mail');
|
||||||
SendEmail::mailText(1, 'admin.test', ['email' => $email]);
|
SendEmail::mailText(1, 'admin.test', ['email' => $email]);
|
||||||
|
|
||||||
Html::addMsg(__('admin.completed'), 'success');
|
Msg::add(__('admin.completed'), 'success');
|
||||||
|
|
||||||
redirect(url('admin.tools'));
|
redirect(url('admin.tools'));
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ class Console
|
||||||
public static function consoleRedirect()
|
public static function consoleRedirect()
|
||||||
{
|
{
|
||||||
if (PHP_SAPI != 'cli') {
|
if (PHP_SAPI != 'cli') {
|
||||||
Html::addMsg(__('admin.completed'), 'success');
|
Msg::add(__('admin.completed'), 'success');
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
||||||
<?php if ($focus_users) : ?>
|
<?php if ($focus_users) : ?>
|
||||||
<span class="text-sm mt20 gray-600">
|
<span class="text-sm mt20">
|
||||||
<div class="uppercase inline mr5"><?= __('app.reads'); ?>:</div>
|
<div class="uppercase inline gray-600 mr5"><?= __('app.reads'); ?>:</div>
|
||||||
<?php $n = 0;
|
<?php $n = 0;
|
||||||
foreach ($focus_users as $user) :
|
foreach ($focus_users as $user) :
|
||||||
$n++; ?>
|
$n++; ?>
|
||||||
|
@ -9,8 +9,10 @@
|
||||||
</a>
|
</a>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
<?php if ($n > 5) : ?><span class="ml10">...</span><?php endif; ?>
|
<?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; ?>
|
<?= $topic_focus_count; ?>
|
||||||
</span>
|
</span>
|
||||||
|
<?php endif; ?>
|
||||||
</span>
|
</span>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
|
@ -25,4 +25,9 @@
|
||||||
<?= __('meta.answers_desc'); ?>
|
<?= __('meta.answers_desc'); ?>
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
</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>
|
|
@ -14,9 +14,8 @@ if ($blog['facet_is_deleted'] == 0) : ?>
|
||||||
</a>
|
</a>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</h1>
|
</h1>
|
||||||
<div class="text-sm"><?= $blog['facet_short_description']; ?></div>
|
<div class="text-sm mt10"><?= $blog['facet_short_description']; ?></div>
|
||||||
|
<div class="right">
|
||||||
<div class="mt15 right">
|
|
||||||
<?= Html::signed([
|
<?= Html::signed([
|
||||||
'type' => 'facet',
|
'type' => 'facet',
|
||||||
'id' => $blog['facet_id'],
|
'id' => $blog['facet_id'],
|
||||||
|
@ -24,14 +23,6 @@ if ($blog['facet_is_deleted'] == 0) : ?>
|
||||||
'state' => is_array($data['facet_signed']),
|
'state' => is_array($data['facet_signed']),
|
||||||
]); ?>
|
]); ?>
|
||||||
</div>
|
</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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -52,6 +43,13 @@ if ($blog['facet_is_deleted'] == 0) : ?>
|
||||||
<i class="bi-calendar-week mr5 ml5 middle"></i>
|
<i class="bi-calendar-week mr5 ml5 middle"></i>
|
||||||
<span class="middle lowercase"><?= Html::langDate($blog['facet_add_date']); ?></span>
|
<span class="middle lowercase"><?= Html::langDate($blog['facet_add_date']); ?></span>
|
||||||
</div>
|
</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>
|
</div>
|
||||||
<?php if ($data['info']) : ?>
|
<?php if ($data['info']) : ?>
|
||||||
<div class="box text-sm shown_post">
|
<div class="box text-sm shown_post">
|
||||||
|
|
|
@ -11,9 +11,9 @@
|
||||||
</a>
|
</a>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</h1>
|
</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([
|
<?= Html::signed([
|
||||||
'type' => 'facet',
|
'type' => 'facet',
|
||||||
'id' => $topic['facet_id'],
|
'id' => $topic['facet_id'],
|
||||||
|
@ -21,11 +21,6 @@
|
||||||
'state' => is_array($data['facet_signed']),
|
'state' => is_array($data['facet_signed']),
|
||||||
]); ?>
|
]); ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?= insert('/_block/facet/focus-users', [
|
|
||||||
'topic_focus_count' => $topic['facet_focus_count'],
|
|
||||||
'focus_users' => $data['focus_users'] ?? '',
|
|
||||||
]); ?>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -19,4 +19,9 @@
|
||||||
</aside>
|
</aside>
|
||||||
</div>
|
</div>
|
||||||
</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>
|
|
@ -83,8 +83,7 @@ body.item.dark .box {
|
||||||
.dropdown { min-width: 220px; }
|
.dropdown { min-width: 220px; }
|
||||||
|
|
||||||
@media (max-width: 890px) {
|
@media (max-width: 890px) {
|
||||||
aside,
|
.item.logo {
|
||||||
.logo {
|
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -152,7 +152,10 @@ code {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
pre { white-space: pre-wrap; }
|
pre {
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-wrap: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
blockquote {
|
blockquote {
|
||||||
margin-left: 15px;
|
margin-left: 15px;
|
||||||
|
|
|
@ -20,8 +20,8 @@ main { width: calc(100% - 390px); }
|
||||||
}
|
}
|
||||||
|
|
||||||
iframe {
|
iframe {
|
||||||
max-width: 300px;
|
max-width: 270px;
|
||||||
max-height: 180px;
|
max-height: 170px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu__left { min-width: 160px; }
|
.menu__left { min-width: 160px; }
|
||||||
|
|
|
@ -14,9 +14,9 @@ if ($blog['facet_is_deleted'] == 0) : ?>
|
||||||
</a>
|
</a>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</h1>
|
</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([
|
<?= Html::signed([
|
||||||
'type' => 'facet',
|
'type' => 'facet',
|
||||||
'id' => $blog['facet_id'],
|
'id' => $blog['facet_id'],
|
||||||
|
@ -24,14 +24,6 @@ if ($blog['facet_is_deleted'] == 0) : ?>
|
||||||
'state' => is_array($data['facet_signed']),
|
'state' => is_array($data['facet_signed']),
|
||||||
]); ?>
|
]); ?>
|
||||||
</div>
|
</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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -52,6 +44,13 @@ if ($blog['facet_is_deleted'] == 0) : ?>
|
||||||
<i class="bi-calendar-week mr5 ml5 middle"></i>
|
<i class="bi-calendar-week mr5 ml5 middle"></i>
|
||||||
<span class="middle lowercase"><?= Html::langDate($blog['facet_add_date']); ?></span>
|
<span class="middle lowercase"><?= Html::langDate($blog['facet_add_date']); ?></span>
|
||||||
</div>
|
</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>
|
</div>
|
||||||
<?php if ($data['info']) : ?>
|
<?php if ($data['info']) : ?>
|
||||||
<div class="bg-violet box text-sm shown_post">
|
<div class="bg-violet box text-sm shown_post">
|
||||||
|
|
|
@ -11,9 +11,9 @@
|
||||||
</a>
|
</a>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</h1>
|
</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([
|
<?= Html::signed([
|
||||||
'type' => 'facet',
|
'type' => 'facet',
|
||||||
'id' => $topic['facet_id'],
|
'id' => $topic['facet_id'],
|
||||||
|
@ -21,11 +21,6 @@
|
||||||
'state' => is_array($data['facet_signed']),
|
'state' => is_array($data['facet_signed']),
|
||||||
]); ?>
|
]); ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?= insert('/_block/facet/focus-users', [
|
|
||||||
'topic_focus_count' => $topic['facet_focus_count'],
|
|
||||||
'focus_users' => $data['focus_users'] ?? '',
|
|
||||||
]); ?>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue