tonyair/doc.silverstripe.org
1
0
Fork 0
mirror of https://github.com/silverstripe/doc.silverstripe.org synced 2024-10-22 15:05:50 +00:00
Code Issues Projects Releases Wiki Activity

Update docsviewer to include versioned "documentation index" page

Browse Source 
* Add rewrite rules for previous routes
* Add version to matched routing parameters
This commit is contained in:
Robbie Averill 2016-12-12 13:22:28 +13:00
parent 139a667f19
commit 55cd7c6fa0
No known key found for this signature in database
GPG Key ID: 99FDF145321F81D6
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.htaccess
View File

@ -51,6 +51,9 @@ ErrorDocument 500 /assets/error-500.html
# Redirect any version > 3.4 to 3 branch
RewriteRule ^en/3\.[5-9]/(.*)?$ /en/3/$1 [R=301,L]
# Redirect old index links to the current version (via another redirect rule)
RewriteRule ^en/all\/?$ / [R=301,L]
# DokuWiki rewrite rules: Need to happen before other rules in order to redirect /doku.php?id=<pagename>
# to /pagename, which can then be matched by the legacy rewrite rules further down
RewriteCond %{QUERY_STRING} ^(\bid\b=([^&]*)&?(.*)?)

2
app/_config/routes.yml
View File

@ -10,4 +10,4 @@ Director:
'dev/buildcache/$Action': 'RebuildStaticCacheTask'
'dev': 'DevelopmentAdmin'
'': '->en/'
'$Lang/$Action': 'DocumentationViewer'
'$Lang/$Version/$Action': 'DocumentationViewer'

10
composer.lock generated
View File

@ -554,16 +554,16 @@
},
{
"name": "silverstripe/docsviewer",
"version": "2.0.0-beta4",
"version": "2.0.0-beta5",
"source": {
"type": "git",
"url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
"reference": "40d70a0b32f1ea63594238ab25aba9d9397416b7"
"reference": "ded5432ec0d6e2183c395ef4a98e7695c89d5112"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/40d70a0b32f1ea63594238ab25aba9d9397416b7",
"reference": "40d70a0b32f1ea63594238ab25aba9d9397416b7",
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/ded5432ec0d6e2183c395ef4a98e7695c89d5112",
"reference": "ded5432ec0d6e2183c395ef4a98e7695c89d5112",
"shasum": ""
},
"require": {
@ -591,7 +591,7 @@
"documentation",
"silverstripe"
],
"time": "2016-12-04 21:22:45"
"time": "2016-12-12 00:54:31"
},
{
"name": "silverstripe/dynamodb",