Jingga/oms-Help
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Help.git synced 2026-01-11 12:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Karaka-Management/oms-Help into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 13:52:18 +00:00
commit 3d5c9b2101
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Controller/BackendController.php
View File

@ -78,8 +78,8 @@ final class BackendController extends Controller
$navigation = Markdown::parse($summary === false ? '' : $summary);
$view->setTemplate('/Modules/Help/Theme/Backend/help-general');
$view->setData('content', $content);
$view->setData('navigation', $navigation);
$view->data['content'] = $content;
$view->data['navigation'] = $navigation;
return $view;
}
@ -126,7 +126,7 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Help/Theme/Backend/help-module-list');
$view->setData('modules', $this->app->moduleManager->getInstalledModules());
$view->data['modules'] = $this->app->moduleManager->getInstalledModules();
/** @var \Model\Setting[] $exportTemplates */
$exportTemplates = $this->app->appSettings->get(
@ -155,7 +155,7 @@ final class BackendController extends Controller
$tableView->setFilterTemplate('/Web/Backend/Themes/popup-filter-table');
$tableView->setSortTemplate('/Web/Backend/Themes/sort-table');
$view->addData('tableView', $tableView);
$view->data['tableView'] = $tableView;
return $view;
}
@ -195,9 +195,9 @@ final class BackendController extends Controller
$devNavigation = empty($devSummary) ? null : Markdown::parse($devSummary);
$view->setTemplate('/Modules/Help/Theme/Backend/help-module');
$view->setData('content', $content);
$view->setData('navigation', $navigation);
$view->setData('devNavigation', $devNavigation);
$view->data['content'] = $content;
$view->data['navigation'] = $navigation;
$view->data['devNavigation'] = $devNavigation;
return $view;
}
@ -227,7 +227,7 @@ final class BackendController extends Controller
$type = \substr($decoded, 0, $typePos);
}
$basePath = __DIR__ . '/../../' . $request->getData('id') . '/Docs/' . $type . '/' . $request->getLanguage();
$basePath = __DIR__ . '/../../' . $request->getData('id') . '/Docs/' . $type . '/' . $request->header->l11n->language;
$path = \realpath($basePath . '/' . $page . '.md');
if ($path === false) {
@ -271,8 +271,8 @@ final class BackendController extends Controller
$navigation = Markdown::parse($summary === false ? '' : $summary);
$view->setTemplate('/Modules/Help/Theme/Backend/help-developer');
$view->setData('content', $content);
$view->setData('navigation', $navigation);
$view->data['content'] = $content;
$view->data['navigation'] = $navigation;
return $view;
}

4
Controller/SearchController.php
View File

@ -46,8 +46,8 @@ final class SearchController extends Controller
{
$lang = 'en';
if (\is_dir(__DIR__ . '/../Docs/Help/' . $request->getLanguage())) {
$lang = $request->getLanguage();
if (\is_dir(__DIR__ . '/../Docs/Help/' . $request->header->l11n->language)) {
$lang = $request->header->l11n->language;
} elseif (\is_dir(__DIR__ . '/../Docs/Help/' . $this->app->l11nServer->getLanguage())) {
$lang = $this->app->l11nServer->getLanguage();
}

4
Theme/Backend/help-developer.tpl.php
View File

@ -2,7 +2,7 @@
<div class="col-xs-12 col-md-8 col-lg-9">
<section class="portlet">
<article>
<?= $this->getData('content'); ?>
<?= $this->data['content']; ?>
</article>
</section>
</div>
@ -10,7 +10,7 @@
<div class="col-xs-12 col-md-4 col-lg-3">
<section class="portlet">
<article>
<?= $this->getData('navigation'); ?>
<?= $this->data['navigation']; ?>
</article>
</section>
</div>

4
Theme/Backend/help-general.tpl.php
View File

@ -2,7 +2,7 @@
<div class="col-xs-12 col-md-8 col-lg-9">
<section class="portlet">
<article>
<?= $this->getData('content'); ?>
<?= $this->data['content']; ?>
</article>
</section>
</div>
@ -10,7 +10,7 @@
<div class="col-xs-12 col-md-4 col-lg-3">
<section class="portlet">
<article>
<?= $this->getData('navigation'); ?>
<?= $this->data['navigation']; ?>
</article>
</section>
</div>

4
Theme/Backend/help-module-list.tpl.php
View File

@ -18,9 +18,9 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
* @var \phpOMS\Module\ModuleInfo[] $modules
*/
$modules = $this->getData('modules');
$modules = $this->data['modules'];
$tableView = $this->getData('tableView');
$tableView = $this->data['tableView'];
$tableView->id = 'helpModuleList';
$tableView->baseUri = 'help/module/list';
$tableView->exportUri = '{/api}admin/module/list/export';

6
Theme/Backend/help-module.tpl.php
View File

@ -2,7 +2,7 @@
<div class="col-xs-12 col-md-8 col-lg-9">
<section class="portlet">
<div class="portlet-body">
<article><?= $this->getData('content'); ?></article>
<article><?= $this->data['content']; ?></article>
</div>
</section>
</div>
@ -15,7 +15,7 @@
<?php if ($this->hasData('navigation')) : ?>
<section class="portlet">
<div class="portlet-body">
<article><?= $this->getData('navigation'); ?></article>
<article><?= $this->data['navigation']; ?></article>
</div>
</section>
<?php endif; ?>
@ -23,7 +23,7 @@
<?php if ($this->hasData('devNavigation')) : ?>
<section class="portlet">
<div class="portlet-body">
<article><?= $this->getData('devNavigation'); ?></article>
<article><?= $this->data['devNavigation']; ?></article>
</div>
</section>
<?php endif; ?>