Skip to content

Commit 6bf7ed5

Browse files
sergeytolkachyovsergeytolkachyov
committed
Примечание и домен в списке ключей в админке. Close #121. Также рефакторинг подключения админского CSS в макетах
1 parent a2999e0 commit 6bf7ed5

File tree

10 files changed

+33
-22
lines changed

10 files changed

+33
-22
lines changed

‎com_swjprojects/admin/tmpl/categories/default.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
use Joomla\CMS\Router\Route;
2020
use Joomla\CMS\Session\Session;
2121

22-
HTMLHelper::stylesheet('com_swjprojects/admin-j4.min.css', array('version' => 'auto', 'relative' => true));
22+
$app = Factory::getApplication();
23+
$wa = $this->document->getWebAssetManager();
24+
$wa->registerAndUseStyle('com_swjprojects.admin.css','com_swjprojects/admin-j4.min.css', ['key' => 'auto', 'relative' => true]);
2325

24-
$user = Factory::getApplication()->getIdentity();
26+
$user = $app->getIdentity();
2527
$listOrder = $this->escape($this->state->get('list.ordering'));
2628
$listDirn = $this->escape($this->state->get('list.direction'));
2729
$saveOrder = ($listOrder == 'c.lft' && strtolower($listDirn) == 'asc');
@@ -39,7 +41,7 @@
3941
<div class="row">
4042
<div class="col-md-12">
4143
<div id="j-main-container" class="j-main-container">
42-
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
44+
<?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
4345
<?php if (empty($this->items)) : ?>
4446
<div class="alert alert-info">
4547
<span class="icon-info-circle" aria-hidden="true"></span><span

‎com_swjprojects/admin/tmpl/category/edit.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
$user = Factory::getApplication()->getIdentity();
2121
$this->document->getWebAssetManager()
2222
->useScript('keepalive')
23-
->useScript('form.validate');
24-
HTMLHelper::stylesheet('com_swjprojects/admin-j4.min.css', array('version' => 'auto', 'relative' => true));
23+
->useScript('form.validate')
24+
->registerAndUseStyle('com_swjprojects.admin.css','com_swjprojects/admin-j4.min.css', ['key' => 'auto', 'relative' => true]);
2525

2626
?>
2727
<form action="<?php echo Route::_('index.php?option=com_swjprojects&view=category&id=' . $this->item->id); ?>"

‎com_swjprojects/admin/tmpl/document/edit.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
$this->document->getWebAssetManager()
2323
->useScript('keepalive')
24-
->useScript('form.validate');
25-
HTMLHelper::stylesheet('com_swjprojects/admin-j4.min.css', array('version' => 'auto', 'relative' => true));
24+
->useScript('form.validate')
25+
->registerAndUseStyle('com_swjprojects.admin.css','com_swjprojects/admin-j4.min.css', ['key' => 'auto', 'relative' => true]);
2626

2727
?>
2828
<form action="<?php echo Route::_('index.php?option=com_swjprojects&view=document&id=' . $this->item->id); ?>"

‎com_swjprojects/admin/tmpl/documentation/default.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
use Joomla\CMS\Session\Session;
2222
use Joomla\Utilities\ArrayHelper;
2323

24-
HTMLHelper::stylesheet('com_swjprojects/admin-j4.min.css', array('version' => 'auto', 'relative' => true));
24+
$wa = $this->document->getWebAssetManager();
25+
$wa->registerAndUseStyle('com_swjprojects.admin.css','com_swjprojects/admin-j4.min.css', ['key' => 'auto', 'relative' => true]);
2526

2627
$user = Factory::getApplication()->getIdentity();
2728
$listOrder = $this->escape($this->state->get('list.ordering'));

‎com_swjprojects/admin/tmpl/key/edit.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
$user = Factory::getApplication()->getIdentity();
2121
$this->document->getWebAssetManager()
2222
->useScript('keepalive')
23-
->useScript('form.validate');
24-
HTMLHelper::stylesheet('com_swjprojects/admin-j4.min.css', array('version' => 'auto', 'relative' => true));
23+
->useScript('form.validate')
24+
->registerAndUseStyle('com_swjprojects.admin.css','com_swjprojects/admin-j4.min.css', ['key' => 'auto', 'relative' => true]);
2525
?>
2626
<form action="<?php echo Route::_('index.php?option=com_swjprojects&view=key&id=' . $this->item->id); ?>"
2727
method="post" name="adminForm" id="item-form" class="form-validate translate-tabs" enctype="multipart/form-data">

‎com_swjprojects/admin/tmpl/keys/default.php‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
use Joomla\CMS\Router\Route;
2020
use Joomla\Utilities\ArrayHelper;
2121

22-
HTMLHelper::stylesheet('com_swjprojects/admin-j4.min.css', array('key' => 'auto', 'relative' => true));
23-
24-
$user = Factory::getApplication()->getIdentity();
22+
$app = Factory::getApplication();
23+
$wa = $this->document->getWebAssetManager();
24+
$wa->registerAndUseStyle('com_swjprojects.admin.css','com_swjprojects/admin-j4.min.css', ['key' => 'auto', 'relative' => true]);
25+
$user = $app->getIdentity();
2526
$listOrder = $this->escape($this->state->get('list.ordering'));
2627
$listDirn = $this->escape($this->state->get('list.direction'));
2728

@@ -32,11 +33,10 @@
3233
<div class="row">
3334
<div class="col-md-12">
3435
<div id="j-main-container" class="j-main-container">
35-
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
36+
<?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
3637
<?php if (empty($this->items)) : ?>
3738
<div class="alert alert-info">
38-
<span class="icon-info-circle" aria-hidden="true"></span><span
39-
class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
39+
<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
4040
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
4141
</div>
4242
<?php else : ?>
@@ -106,6 +106,12 @@ class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
106106
<a <?php echo ($link) ? 'href="' . $link . '"' : 'disable'; ?>>
107107
<strong><?php echo $this->escape($item->key); ?></strong>
108108
</a>
109+
<?php if(!empty($item->domain)):?>
110+
<p><code><?php echo $this->escape($item->domain); ?></code></p>
111+
<?php endif; ?>
112+
<?php if(!empty($item->note)):?>
113+
<p class="m-0 border p-1"><small><?php echo $this->escape($item->note); ?></small></p>
114+
<?php endif; ?>
109115
</td>
110116
<td class="d-none d-md-table-cell">
111117
<?php echo $item->order; ?>

‎com_swjprojects/admin/tmpl/project/edit.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
$this->document->getWebAssetManager()
2323
->useScript('keepalive')
24-
->useScript('form.validate');
25-
HTMLHelper::stylesheet('com_swjprojects/admin-j4.min.css', array('version' => 'auto', 'relative' => true));
24+
->useScript('form.validate')
25+
->registerAndUseStyle('com_swjprojects.admin.css','com_swjprojects/admin-j4.min.css', ['key' => 'auto', 'relative' => true]);
2626
?>
2727
<form action="<?php echo Route::_('index.php?option=com_swjprojects&view=project&id=' . $this->item->id); ?>"
2828
method="post" name="adminForm" id="item-form" class="form-validate translate-tabs" enctype="multipart/form-data">

‎com_swjprojects/admin/tmpl/projects/default.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
use Joomla\CMS\Session\Session;
2323
use Joomla\Utilities\ArrayHelper;
2424

25-
HTMLHelper::stylesheet('com_swjprojects/admin_j4.min.css', array('version' => 'auto', 'relative' => true));
25+
$wa = $this->document->getWebAssetManager();
26+
$wa->registerAndUseStyle('com_swjprojects.admin.css','com_swjprojects/admin-j4.min.css', ['key' => 'auto', 'relative' => true]);
2627

2728
$user = Factory::getApplication()->getIdentity();
2829
$listOrder = $this->escape($this->state->get('list.ordering'));

‎com_swjprojects/admin/tmpl/version/edit.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
$user = Factory::getApplication()->getIdentity();
2121
$this->document->getWebAssetManager()
2222
->useScript('keepalive')
23-
->useScript('form.validate');
24-
HTMLHelper::stylesheet('com_swjprojects/admin-j4.min.css', array('version' => 'auto', 'relative' => true));
23+
->useScript('form.validate')
24+
->registerAndUseStyle('com_swjprojects.admin.css','com_swjprojects/admin-j4.min.css', ['key' => 'auto', 'relative' => true]);
2525

2626
?>
2727
<form action="<?php echo Route::_('index.php?option=com_swjprojects&view=version&id=' . $this->item->id); ?>"

‎com_swjprojects/admin/tmpl/versions/default.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
use Joomla\CMS\Session\Session;
2222
use Joomla\Utilities\ArrayHelper;
2323

24-
HTMLHelper::stylesheet('com_swjprojects/admin-j4.min.css', array('version' => 'auto', 'relative' => true));
24+
$wa = $this->document->getWebAssetManager();
25+
$wa->registerAndUseStyle('com_swjprojects.admin.css','com_swjprojects/admin-j4.min.css', ['key' => 'auto', 'relative' => true]);
2526

2627
$user = Factory::getApplication()->getIdentity();
2728
$listOrder = $this->escape($this->state->get('list.ordering'));

0 commit comments

Comments
 (0)