Make app,localization in url optional+tld+subdomain

This commit is contained in:
Dennis Eichhorn 2019-03-09 23:21:29 +01:00
parent 40488903b0
commit 63bd01ad40
8 changed files with 21 additions and 21 deletions

View File

@ -1,11 +1,11 @@
[
{
"id": 1000701001,
"pid": "/backend",
"pid": "/",
"type": 2,
"subtype": 1,
"name": "News",
"uri": "{/lang}/backend/news/dashboard?{?}",
"uri": "{/prefix}news/dashboard?{?}",
"target": "self",
"icon": null,
"order": 40,
@ -15,11 +15,11 @@
"children": [
{
"id": 1000702001,
"pid": "/backend/news",
"pid": "/news",
"type": 3,
"subtype": 1,
"name": "News",
"uri": "{/lang}/backend/news/dashboard?{?}",
"uri": "{/prefix}news/dashboard?{?}",
"target": "self",
"icon": null,
"order": 1,
@ -30,11 +30,11 @@
},
{
"id": 1000703001,
"pid": "/backend/news",
"pid": "/news",
"type": 3,
"subtype": 1,
"name": "Archive",
"uri": "{/lang}/backend/news/archive?{?}",
"uri": "{/prefix}news/archive?{?}",
"target": "self",
"icon": null,
"order": 5,
@ -45,11 +45,11 @@
},
{
"id": 1000704001,
"pid": "/backend/news",
"pid": "/news",
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/lang}/backend/news/create?{?}",
"uri": "{/prefix}news/create?{?}",
"target": "self",
"icon": null,
"order": 10,
@ -60,11 +60,11 @@
},
{
"id": 1000705001,
"pid": "/backend/news",
"pid": "/news",
"type": 3,
"subtype": 1,
"name": "Draft",
"uri": "{/lang}/backend/news/draft/list?{?}",
"uri": "{/prefix}news/draft/list?{?}",
"target": "self",
"icon": null,
"order": 15,

View File

@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
return [
'^.*/api/news.*$' => [
'^.*/news.*$' => [
[
'dest' => '\Modules\News\Controller\ApiController:apiNewsCreate',
'verb' => RouteVerb::PUT,

View File

@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
return [
'^.*/backend/news/dashboard.*$' => [
'^.*/news/dashboard.*$' => [
[
'dest' => '\Modules\News\Controller\BackendController:viewNewsDashboard',
'verb' => RouteVerb::GET,
@ -17,7 +17,7 @@ return [
],
],
],
'^.*/backend/news/article.*$' => [
'^.*/news/article.*$' => [
[
'dest' => '\Modules\News\Controller\BackendController:viewNewsArticle',
'verb' => RouteVerb::GET,
@ -28,7 +28,7 @@ return [
],
],
],
'^.*/backend/news/archive.*$' => [
'^.*/news/archive.*$' => [
[
'dest' => '\Modules\News\Controller\BackendController:viewNewsArchive',
'verb' => RouteVerb::GET,
@ -39,7 +39,7 @@ return [
],
],
],
'^.*/backend/news/create.*$' => [
'^.*/news/create.*$' => [
[
'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor',
'verb' => RouteVerb::GET,

View File

@ -27,7 +27,7 @@ $newsList = $this->getData('news');
<td class="wf-100"><?= $this->getHtml('Title', 'News') ?>
<tbody>
<?php $count = 0; foreach ($newsList as $key => $news) : ++$count;
$url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/news/article?{?}&id=' . $news->getId());
$url = \phpOMS\Uri\UriFactory::build('{/prefix}news/article?{?}&id=' . $news->getId());
$color = 'darkred';
if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }

View File

@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
<tr>
<td colspan="4">
<tbody>
<?php $count = 0; foreach ($articles as $key => $news) : ++$count; $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/news/article?{?}&id=' . $news->getId());
<?php $count = 0; foreach ($articles as $key => $news) : ++$count; $url = \phpOMS\Uri\UriFactory::build('{/prefix}news/article?{?}&id=' . $news->getId());
$color = 'darkred';
if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }

View File

@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
<div class="col-xs-12 col-md-3">
<section class="box wf-100">
<div class="inner">
<form id="docForm" method="PUT" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/news?{?}&csrf={$CSRF}'); ?>">
<form id="docForm" method="PUT" action="<?= \phpOMS\Uri\UriFactory::build('{/api}news?{?}&csrf={$CSRF}'); ?>">
<table class="layout wf-100">
<tr><td colspan="2"><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
<tr><td colspan="2"><select name="status" id="iStatus">

View File

@ -32,7 +32,7 @@ echo $this->getData('nav')->render(); ?>
<td><?= $this->getHtml('Date') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
<tbody>
<?php $count = 0; foreach ($newsList as $key => $news) : ++$count;
$url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/news/article?{?}&id=' . $news->getId());
$url = \phpOMS\Uri\UriFactory::build('{/prefix}news/article?{?}&id=' . $news->getId());
$color = 'darkred';
if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }

View File

@ -26,7 +26,7 @@
"load": [
{
"pid": [
"/backend/news"
"/news"
],
"type": 4,
"for": 0,
@ -35,7 +35,7 @@
},
{
"pid": [
"/backend"
"/"
],
"type": 5,
"from": "News",