From a8bba9a9399b6ba58c24c8c782605d95679e6206 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 14 May 2023 16:31:19 -0400 Subject: [PATCH 1/3] Replace wiki names with docs. --- app/frontend/templates/base.html | 2 +- app/frontend/templates/main_menu.html | 4 ++-- app/frontend/templates/panel/wiki.html | 4 ++-- app/translations/en_EN.json | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index a7bbf16a..58d49c53 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -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' ) diff --git a/app/frontend/templates/main_menu.html b/app/frontend/templates/main_menu.html index 09c2dc79..5bbcfbad 100644 --- a/app/frontend/templates/main_menu.html +++ b/app/frontend/templates/main_menu.html @@ -100,7 +100,7 @@
  • - +   {{ translate('sidebar', 'documentation', data['lang']) }} @@ -109,7 +109,7 @@
  •   - Wiki + {{ translate('sidebar', 'inApp', data['lang']) }}
    • diff --git a/app/frontend/templates/panel/wiki.html b/app/frontend/templates/panel/wiki.html index d6123cb6..ea28998d 100644 --- a/app/frontend/templates/panel/wiki.html +++ b/app/frontend/templates/panel/wiki.html @@ -13,14 +13,14 @@
    -

    Wiki

    +

    {{ translate('sidebar', 'documentation', data['lang']) }}

    - +
    diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index b841cdf6..9389e775 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -577,7 +577,8 @@ "documentation": "Documentation", "navigation": "Navigation", "newServer": "Create New Server", - "servers": "Servers" + "servers": "Servers", + "inApp": "In App Docs" }, "userConfig": { "apiKey": "API Keys", From bcc4c3a14210b4ac8531b7d7f66b8c1fee6cf6ee Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 14 May 2023 16:36:04 -0400 Subject: [PATCH 2/3] Adjust docs url --- app/frontend/templates/panel/wiki.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/frontend/templates/panel/wiki.html b/app/frontend/templates/panel/wiki.html index ea28998d..3550cba4 100644 --- a/app/frontend/templates/panel/wiki.html +++ b/app/frontend/templates/panel/wiki.html @@ -20,7 +20,7 @@
    - +
    From ccba1586fee39bdb200da0adf3ba273054ac0925 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sun, 14 May 2023 22:51:15 +0100 Subject: [PATCH 3/3] Update changelog !583 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cb87465..bed29e14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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))