Review GitHub issues/pull requests templates (#732)

3 files changed, 22 insertions, 23 deletions

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e206b128f..efad9f6a2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,12 +8,11 @@ Please fill our form below, this way we can analyse and fix the problem as fast
 Please keep in mind that any text inside "<!--" and "--\>" are comments from us and won't be
 visible in your bug report, so please don't put any text in them.
 -->
-**Describe the bug**
+**Bug description:**
 <!-- Add a clear and concise description of what the bug is -->
 
-**To Reproduce**
+**Steps to reproduce:**
 <!-- Explain to us how we can reproduce your bug on our computer -->
-Steps to reproduce the behavior:
 
 1. Go to '...'
 2. Click on '....'
@@ -27,27 +26,18 @@ Steps to reproduce the behavior:
 <!-- If applicable, add screenshots to help explain your problem. -->
 <!-- You can simply drag and drop any image file into the editor to add it to the report -->
 
-**Desktop:**
+**Environment:**
 
-- OS: [e.g. macOS, Windows 10 etc.]
-- Ferdi Version [e.g. 5.4.3]
-<!-- ℹ You can find Ferdi's version by opening File > About Ferdi or Help > About Ferdi, depending on your Operating System -->
-- Server Used: [e.g. https://api.getferdi.com]
-<!-- ℹ You can find Ferdi's server in Ferdi's settings under "Server". If you self-host or use Ferdi without an account please say so. -->
+- Operating System: <!-- e.g. macOS Catalina, Windows 10, etc. -->
+- Ferdi Version: <!-- e.g. 5.4.3 -->
+- Server: <!-- e.g. Ferdi, Franz, Using without an account -->
 
+- Debug information:
 <!-- 
-If you are using Ferdi >= 5.4.4-beta.2 please publish your debugging information and share them in your bug report.
-To publish a bug report, inside Ferdi's menu bar click on "Help" > "Publish debug information", accept our terms
-and copy the link given to you.
+Get your debug information via Ferdi "Help" menu ("Copy/Publish Debug Information") then
+share a debug information file or your published link with us.
 -->
-Debug information: https://debug.getferdi.com/...
 
-**Additional context**
-<!-- Add any other context about the problem here. -->
-
-<!-- 
-Love Ferdi? Please consider supporting our open-collective:
-👉  https://opencollective.com/getferdi/donate
-or following us on Twitter:
-👉  https://twitter.com/getferdi
--->
+<!-- Please consider supporting Ferdi!
+👉  https://github.com/sponsors/getferdi
+👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 5535496d2..61353797c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -15,5 +15,6 @@ A clear and concise description of any alternative solutions or features you've
 **Additional context**
 Add any other context or screenshots about the feature request here.
 
-<!-- Love Ferdi? Please consider supporting our collective:
+<!-- Please consider supporting Ferdi!
+👉  https://github.com/sponsors/getferdi
 👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/ISSUE_TEMPLATE/open_issue.md b/.github/ISSUE_TEMPLATE/open_issue.md
new file mode 100644
index 000000000..c7c279643
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/open_issue.md
@@ -0,0 +1,8 @@
+---
+name: Open issue
+about: For everything that's neither a feature request, nor a bug
+---
+
+<!-- Please consider supporting Ferdi!
+👉  https://github.com/sponsors/getferdi
+👉  https://opencollective.com/getferdi/donate -->