Make app,localization in url optional+tld+subdomain

This commit is contained in:
Dennis Eichhorn 2019-03-09 23:21:29 +01:00
parent 6962474ce2
commit d81c5928c1
6 changed files with 17 additions and 17 deletions

View File

@ -1,11 +1,11 @@
[ [
{ {
"id": 1006001001, "id": 1006001001,
"pid": "/backend", "pid": "/",
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "QA", "name": "QA",
"uri": "{/lang}/backend/qa/dashboard?{?}", "uri": "{/prefix}qa/dashboard?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 50, "order": 50,
@ -15,11 +15,11 @@
"children": [ "children": [
{ {
"id": 1006002001, "id": 1006002001,
"pid": "/backend/qa", "pid": "/qa",
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "QA", "name": "QA",
"uri": "{/lang}/backend/qa/dashboard?{?}", "uri": "{/prefix}qa/dashboard?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -30,11 +30,11 @@
}, },
{ {
"id": 1006003001, "id": 1006003001,
"pid": "/backend/qa", "pid": "/qa",
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Create", "name": "Create",
"uri": "{/lang}/backend/qa/question/create?{?}", "uri": "{/prefix}qa/question/create?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 5, "order": 5,
@ -45,11 +45,11 @@
}, },
{ {
"id": 1006004001, "id": 1006004001,
"pid": "/backend/qa", "pid": "/qa",
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Badges", "name": "Badges",
"uri": "{/lang}/backend/qa/badge/list?{?}", "uri": "{/prefix}qa/badge/list?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 10, "order": 10,

View File

@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
return [ return [
'^.*/backend/qa.*$' => [ '^.*/qa.*$' => [
[ [
'dest' => '\Modules\QA\Controller\BackendController:setUpBackend', 'dest' => '\Modules\QA\Controller\BackendController:setUpBackend',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -17,7 +17,7 @@ return [
], ],
], ],
], ],
'^.*/backend/qa/dashboard.*$' => [ '^.*/qa/dashboard.*$' => [
[ [
'dest' => '\Modules\QA\Controller\BackendController:viewQADashboard', 'dest' => '\Modules\QA\Controller\BackendController:viewQADashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -28,7 +28,7 @@ return [
], ],
], ],
], ],
'^.*/backend/qa/question.*$' => [ '^.*/qa/question.*$' => [
[ [
'dest' => '\Modules\QA\Controller\BackendController:viewQADoc', 'dest' => '\Modules\QA\Controller\BackendController:viewQADoc',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -39,7 +39,7 @@ return [
], ],
], ],
], ],
'^.*/backend/qa/question/create.*$' => [ '^.*/qa/question/create.*$' => [
[ [
'dest' => '\Modules\QA\Controller\BackendController:viewQAQuestionCreate', 'dest' => '\Modules\QA\Controller\BackendController:viewQAQuestionCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,

View File

@ -12,7 +12,7 @@ echo $this->getData('nav')->render(); ?>
<span class="score<?= $this->printHtml($question->hasAccepted() ? ' done' : ''); ?>"><?= $this->printHtml(count($question->getAnswers())); ?></span> <span class="score<?= $this->printHtml($question->hasAccepted() ? ' done' : ''); ?>"><?= $this->printHtml(count($question->getAnswers())); ?></span>
</div> </div>
<div class="title col-xs-11"> <div class="title col-xs-11">
<a href="<?= \phpOMS\Uri\UriFactory::build('{/lang}/backend/qa/question?{?}&id=' . $question->getId()); ?>"><?= $this->printHtml($question->getName()); ?></a> <a href="<?= \phpOMS\Uri\UriFactory::build('{/prefix}qa/question?{?}&id=' . $question->getId()); ?>"><?= $this->printHtml($question->getName()); ?></a>
</div> </div>
</div> </div>
<div class="tags"> <div class="tags">

View File

@ -13,7 +13,7 @@ echo $this->getData('nav')->render();
<?= $this->printHtml($question->getQuestion()); ?> <?= $this->printHtml($question->getQuestion()); ?>
</div> </div>
<div class="inner"> <div class="inner">
<img alt="<?= $this->getHtml('AccountImage', 0, 0); ?>" data-lazyload="<?= UriFactory::build('' . $question->getCreatedBy()->getImage()->getPath()); ?>"> <img alt="<?= $this->getHtml('AccountImage', 0, 0); ?>" data-lazyload="<?= UriFactory::build('{/prefix}' . $question->getCreatedBy()->getImage()->getPath()); ?>">
</div> </div>
</section> </section>
</div> </div>

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 ($tags as $key => $value) : $c++; <?php $c = 0; foreach ($tags 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><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>

View File

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