From 2a64c7b773b6edf2f795c094e5a3e660aa2d33d0 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 3 Feb 2024 13:15:23 -0500
Subject: [PATCH] Rework issue templates

---
 .gitlab/issue_templates/Bug.md         | 20 +++++++++-----------
 .gitlab/issue_templates/Improvement.md | 10 ++++++++++
 .gitlab/issue_templates/New Feature.md | 13 -------------
 README.md                              |  5 ++---
 4 files changed, 21 insertions(+), 27 deletions(-)
 create mode 100644 .gitlab/issue_templates/Improvement.md
 delete mode 100644 .gitlab/issue_templates/New Feature.md

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index bc3cde3d0ec..18f929f2ffc 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,22 +1,20 @@
+## Environment
+```
+(Please open `Help->About Alchemy` and click Copy to Clipboard then paste the About information here.)
+```
+
 ## Summary
-(Summarize the bug encountered concisely)
+(Summarize the bug encountered concisely.)
 
 ## Steps to reproduce
 (How one can reproduce the issue - this is very important)
 
 ## What is the expected correct behavior?
-(What you should see instead)
+(What you should see or what should happen instead)
 
-## Environment
+## Relevant logs and/or screenshots
 ```
-
-(Please open `Help->About Alchemy` and click Copy to Clipboard then paste its contents here)
-
-
+(Attach or paste any relevant logs)
 ```
-## Relevant logs and/or screenshots
-(Attach or paste any relevant logs - please use code blocks (```) to format console output,
-logs, and code as it's very hard to read otherwise.)
-
 
 /label ~Type::Bug ~Status::Awaiting-Investigation
diff --git a/.gitlab/issue_templates/Improvement.md b/.gitlab/issue_templates/Improvement.md
new file mode 100644
index 00000000000..25d9fd68a57
--- /dev/null
+++ b/.gitlab/issue_templates/Improvement.md
@@ -0,0 +1,10 @@
+## Summary
+(Summarize the requested improvement concisely.)
+
+## Why is this improvement important to you? How would it benefit the community?
+(Provide reasoning as to why the improvement is important to you, and ways it could benefit the larger Alchemy Viewer community.)
+
+## Screenshots, Mockups, etc
+(Attach or paste any relevant screenshots or mockups.)
+
+/label ~Type::Improvement ~Status::Awaiting-Investigation
\ No newline at end of file
diff --git a/.gitlab/issue_templates/New Feature.md b/.gitlab/issue_templates/New Feature.md
deleted file mode 100644
index 726ccd99ef9..00000000000
--- a/.gitlab/issue_templates/New Feature.md	
+++ /dev/null
@@ -1,13 +0,0 @@
-## Summary
-(Summarize the requested feature concisely.)
-
-## How would you like the feature to work?
-(Describe how the feature should function in as much detail as possible.)
-
-## Why is this feature important to you? How would it benefit the community?
-(Provide reasoning as to why the feature is important to you, and ways it could benefit the larger Alchemy Viewer community.)
-
-## Screenshots, Mockups, etc
-(Attach or paste any relevant screenshots or mockups.)
-
-/label ~Type::New Feature ~Status::Awaiting-Investigation
\ No newline at end of file
diff --git a/README.md b/README.md
index 749345ab587..d0792530da4 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,5 @@
 
 ## Resources
 * [Alchemy Website](http://www.alchemyviewer.org)
-* [Downloads](https://alchemyviewer.org/pages/downloads.html)
-* [Issue Tracker](https://git.alchemyviewer.org/alchemy/alchemy/issues)
-* [Wiki](https://git.alchemyviewer.org/alchemy/alchemy/wikis/home)
+* [Downloads](https://alchemyviewer.org/downloads)
+* [Issue Tracker](https://git.alchemyviewer.org/alchemy/viewer/issues)
-- 
GitLab