minor performance improvements

This commit is contained in:
Dennis Eichhorn 2018-12-30 19:50:36 +01:00
parent 7061b8cb4f
commit 2154a13095
6 changed files with 11 additions and 11 deletions

View File

@ -106,19 +106,19 @@ final class BackendController extends Controller
public function loadLanguage(RequestAbstract $request, ResponseAbstract $response) : void
{
$languages = $this->app->moduleManager->getLanguageFiles($request);
$langCode = $response->getHeader()->getL11n()->getLanguage();
foreach ($languages as $path) {
if ($path[strlen($path) - 1] === '/') {
// Is not a navigation file
$path = __DIR__ . '/../../..' . $path . '.' . $langCode . '.lang.php';
if (!\file_exists($path)) {
continue;
}
$path = __DIR__ . '/../../..' . $path . '.' . $response->getHeader()->getL11n()->getLanguage() . '.lang.php';
/** @noinspection PhpIncludeInspection */
$lang = include $path;
$this->app->l11nManager->loadLanguage($response->getHeader()->getL11n()->getLanguage(), 'Navigation', $lang);
$this->app->l11nManager->loadLanguage($langCode, 'Navigation', $lang);
}
}

View File

@ -17,7 +17,7 @@
/* Looping through all links */
if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE])) {
echo '<div class="b b-5 c3-2 c3" id="i3-2-5">'
. '<h1>' . $this->getHtml('Navigation')
. '<h1>' . $this->getHtml('Navigation', 'Navigation')
. '<i class="fa fa-minus min"></i><i class="fa fa-plus max vh"></i>'
. '</h1>'
. '<div class="bc-1">'

View File

@ -23,7 +23,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT])
foreach ($parent as $link) {
if ($link['nav_parent'] === $this->parent) {
echo '<li><a href="' . \phpOMS\Uri\UriFactory::build($link['nav_uri']) . '">'
. $this->getHtml($link['nav_name']) . '</a>';
. $this->getHtml($link['nav_name'], 'Navigation') . '</a>';
}
}
}

View File

@ -22,13 +22,13 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::SIDE])) : ?>
<?php if (isset($parent['nav_icon'])) : ?>
<span class="centerText"><i class="<?= $this->printHtml($parent['nav_icon']); ?>"></i></span>
<?php endif; ?>
<?= $this->getHtml($parent['nav_name']) ?><label for="nav-<?= $this->printHtml($parent['nav_name']); ?>"><i class="fa fa-chevron-down min"></i>
<?= $this->getHtml($parent['nav_name'], 'Navigation') ?><label for="nav-<?= $this->printHtml($parent['nav_name']); ?>"><i class="fa fa-chevron-down min"></i>
<i class="fa fa-chevron-up max"></i></label>
<?php if (isset($this->nav[\Modules\Navigation\Models\NavigationType::SIDE][\Modules\Navigation\Models\LinkType::LINK])) :
foreach ($this->nav[\Modules\Navigation\Models\NavigationType::SIDE][\Modules\Navigation\Models\LinkType::LINK] as $key2 => $link) :
if ($link['nav_parent'] === $key) : ?>
<li>
<a href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>"><?= $this->getHtml($link['nav_name']) ?></a>
<a href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>"><?= $this->getHtml($link['nav_name'], 'Navigation') ?></a>
<?php endif;
endforeach; endif; ?>
</ul>

View File

@ -21,7 +21,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT])) :
<div class="inner centerText">
<a href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>">
<p><i class="fa-5x <?= $this->printHtml($link['nav_icon']); ?>"></i></p>
<p><?= $this->getHtml($link['nav_name']); ?></p>
<p><?= $this->getHtml($link['nav_name'], 'Navigation'); ?></p>
</a>
</div>
</section>

View File

@ -25,7 +25,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::TOP])): ?>
<i class="<?= $this->printHtml($link['nav_icon']); ?> infoIcon"><?php if (isset($unread[$link['nav_from']]) && $unread[$link['nav_from']] > 0) : ?><span class="badge"><?= $this->printHtml($unread[$link['nav_from']]); ?></span><?php endif; ?></i>
<?php endif; ?>
<?= $this->getHtml($link['nav_name']) ?></a>
<?= $this->getHtml($link['nav_name'], 'Navigation') ?></a>
<?php endforeach;
endforeach; ?>