Merge branch 'refactor/wiki-links' into 'dev'

Replace wiki names with docs.

See merge request crafty-controller/crafty-4!583
This commit is contained in:
Iain Powrie 2023-05-14 21:58:37 +00:00
commit c52a52cb56
5 changed files with 8 additions and 6 deletions

View File

@ -4,6 +4,7 @@
- Mobile PWA App (beta) | Ability to add a Crafty icon to your mobile's home screen ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/576))
### Refactor
- Frontend Ajax Refactor | Start using API to send Remote Comms to Server ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/565))
- MKDocs Release | Replace wiki names with docs ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/583))
### Bug fixes
- Fix pipelines failing to build from gitlab pre-defined variable deprecation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/582))
- Fix incompatible buildx provenance meta, causing digest issues on GL/DH container registries ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/582))

View File

@ -257,7 +257,7 @@
const sendWssError = () => wsOpen || warn(
'WebSockets are required for Crafty to work. This websocket connection has been closed. Are you using a reverse proxy?',
'https://wiki.craftycontrol.com/en/4/docs/Reverse%20Proxy%20Examples',
'https://docs.craftycontrol.com/pages/getting-started/proxies/',
'wssError'
)

View File

@ -100,7 +100,7 @@
</li>
<li class="nav-item">
<a class="nav-link" href="https://wiki.craftycontrol.com" target="_blank">
<a class="nav-link" href="https://docs.craftycontrol.com" target="_blank">
<i class="fas fa-book"></i> &nbsp;
<span class="menu-title">{{ translate('sidebar', 'documentation', data['lang']) }}</span>
</a>
@ -109,7 +109,7 @@
<li class="nav-item">
<a class="nav-link" href="/panel/wiki">
<i class="fa fa-info-circle"></i> &nbsp;
<span class="menu-title">Wiki</span>
<span class="menu-title">{{ translate('sidebar', 'inApp', data['lang']) }}</span>
</a>
</li>

View File

@ -13,14 +13,14 @@
<div class="row page-title-header">
<div class="col-12">
<div class="page-header">
<h4 class="page-title">Wiki</h4>
<h4 class="page-title">{{ translate('sidebar', 'documentation', data['lang']) }}</h4>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 grid-margin">
<iframe src="https://wiki.craftycontrol.com" width=100% height=2200px title="crafty's wiki"></iframe>
<iframe src="https://docs.craftycontrol.com/" width=100% height=1100px title="crafty's docs"></iframe>
</div>

View File

@ -580,7 +580,8 @@
"documentation": "Documentation",
"navigation": "Navigation",
"newServer": "Create New Server",
"servers": "Servers"
"servers": "Servers",
"inApp": "In App Docs"
},
"userConfig": {
"apiKey": "API Keys",