Make app,localization in url optional+tld+subdomain

This commit is contained in:
Dennis Eichhorn 2019-03-09 23:21:29 +01:00
parent 801d73ead6
commit 5dec2ec0a1
5 changed files with 20 additions and 20 deletions

View File

@ -1,11 +1,11 @@
[ [
{ {
"id": 1005901001, "id": 1005901001,
"pid": "/backend", "pid": "/",
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "Wiki", "name": "Wiki",
"uri": "{/lang}/backend/wiki/dashboard?{?}", "uri": "{/prefix}wiki/dashboard?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 50, "order": 50,
@ -15,11 +15,11 @@
"children": [ "children": [
{ {
"id": 1005902001, "id": 1005902001,
"pid": "/backend/wiki", "pid": "/wiki",
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Wiki", "name": "Wiki",
"uri": "{/lang}/backend/wiki/dashboard?{?}", "uri": "{/prefix}wiki/dashboard?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -30,11 +30,11 @@
}, },
{ {
"id": 1005903001, "id": 1005903001,
"pid": "/backend/wiki", "pid": "/wiki",
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Create", "name": "Create",
"uri": "{/lang}/backend/wiki/doc/create?{?}", "uri": "{/prefix}wiki/doc/create?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 5, "order": 5,
@ -45,11 +45,11 @@
}, },
{ {
"id": 1005904001, "id": 1005904001,
"pid": "/backend/wiki", "pid": "/wiki",
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Categories", "name": "Categories",
"uri": "{/lang}/backend/wiki/category/list?{?}", "uri": "{/prefix}wiki/category/list?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 5, "order": 5,

View File

@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
return [ return [
'^.*/backend/wiki.*$' => [ '^.*/wiki.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:setUpBackend', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:setUpBackend',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -17,7 +17,7 @@ return [
], ],
], ],
], ],
'^.*/backend/wiki/dashboard.*$' => [ '^.*/wiki/dashboard.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDashboard', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -28,7 +28,7 @@ return [
], ],
], ],
], ],
'^.*/backend/wiki/category/list.*$' => [ '^.*/wiki/category/list.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryList', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -39,7 +39,7 @@ return [
], ],
], ],
], ],
'^.*/backend/wiki/category/single.*$' => [ '^.*/wiki/category/single.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategory', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategory',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -50,7 +50,7 @@ return [
], ],
], ],
], ],
'^.*/backend/wiki/category/create.*$' => [ '^.*/wiki/category/create.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryCreate', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -61,7 +61,7 @@ return [
], ],
], ],
], ],
'^.*/backend/wiki/doc/single.*$' => [ '^.*/wiki/doc/single.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDoc', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDoc',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -72,7 +72,7 @@ return [
], ],
], ],
], ],
'^.*/backend/wiki/doc/create.*$' => [ '^.*/wiki/doc/create.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocCreate', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -83,7 +83,7 @@ return [
], ],
], ],
], ],
'^.*/backend/wiki/doc/list.*$' => [ '^.*/wiki/doc/list.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocList', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,

View File

@ -32,7 +32,7 @@ echo $this->getData('nav')->render();
<tr><td colspan="2"> <tr><td colspan="2">
<tbody> <tbody>
<?php $c = 0; foreach ($categories as $key => $value) : $c++; <?php $c = 0; foreach ($categories as $key => $value) : $c++;
$url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/account/settings?{?}&id=' . $value->getId()); ?> $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId()); ?>
<tr data-href="<?= $url; ?>"> <tr data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('ID', 0, 0) ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a> <td data-label="<?= $this->getHtml('ID', 0, 0) ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
<td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a> <td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>

View File

@ -7,7 +7,7 @@ echo $this->getData('nav')->render(); ?>
<?php foreach ($categories as $category) : ?> <?php foreach ($categories as $category) : ?>
<section class="box wf-100 wiki-list"> <section class="box wf-100 wiki-list">
<div class="inner"> <div class="inner">
<a href="<?= \phpOMS\Uri\UriFactory::build('{/lang}/backend/wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getName()); ?></a> <a href="<?= \phpOMS\Uri\UriFactory::build('{/prefix}wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getName()); ?></a>
</div> </div>
</section> </section>
<?php endforeach; ?> <?php endforeach; ?>

View File

@ -27,7 +27,7 @@
"load": [ "load": [
{ {
"pid": [ "pid": [
"/backend/wiki" "/wiki"
], ],
"type": 4, "type": 4,
"for": 0, "for": 0,
@ -36,7 +36,7 @@
}, },
{ {
"pid": [ "pid": [
"/backend" "/"
], ],
"type": 5, "type": 5,
"from": "Knowledgebase", "from": "Knowledgebase",