From f8e9844a6fa4b3bf1906bd19871d6e34d36c1de6 Mon Sep 17 00:00:00 2001
From: Akbar Abdrakhmanov <kz.akbar@gmail.com>
Date: Tue, 20 Aug 2024 12:38:26 +0500
Subject: [PATCH] use an issue form instead of an issue template for reporting
 a new issue on GH

---
 .github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md      | 36 -------------------
 ...SSUE_TEMPLATE.yaml => ISSUE_TEMPLATE.yaml} |  9 ++---
 .../_footer-copyright-and-legal.html          |  8 ++---
 templates/templates/footer.html               |  2 +-
 4 files changed, 9 insertions(+), 46 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md
 rename .github/ISSUE_TEMPLATE/{ALTERNATIVE_ISSUE_TEMPLATE.yaml => ISSUE_TEMPLATE.yaml} (60%)

diff --git a/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md
deleted file mode 100644
index 100047c50e3..00000000000
--- a/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-name: Default issue
-about: Issue from anywhere, perhaps from the footer of the site
-title: ''
-labels: ''
-assignees: ''
----
-
-*Note - filling in this form will file an issue against the www.ubuntu.com website, not against Ubuntu itself, for Ubuntu OS related bugs please [go here](https://help.ubuntu.com/community/ReportingBugs)*.
-*Please provide as many details as possible in order to provide maintainers more context about the issue. Don't skip/remove any of the sections below. If there is no data to provide in one of the sections, please specify it by typing "N/A" or similar. That will help maintainers reproduce the issue and be able to help quickly. Thanks.*
-
-## Summary
-
-[Please describe the issue.]
-
-## Steps to reproduce the behavior
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-## Expected behavior
-
-[A clear and concise description of what you expected to happen.]
-
-## Screenshot
-
-[Please include a screenshot.]
-
-## Browser/device details
-
-- Device: [e.g. iPhone6]
-- OS: [e.g. iOS8.1]
-- Browser [e.g. stock browser, safari]
-- Version [e.g. 22]
diff --git a/.github/ISSUE_TEMPLATE/ALTERNATIVE_ISSUE_TEMPLATE.yaml b/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.yaml
similarity index 60%
rename from .github/ISSUE_TEMPLATE/ALTERNATIVE_ISSUE_TEMPLATE.yaml
rename to .github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.yaml
index 3cb3a88c4f2..3af0c1029fa 100644
--- a/.github/ISSUE_TEMPLATE/ALTERNATIVE_ISSUE_TEMPLATE.yaml
+++ b/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.yaml
@@ -1,14 +1,14 @@
-name: Alternative issue template
+name: Default issue
 description: Issue from anywhere, perhaps from the footer of the site
 body:
 - type: markdown
   attributes:
     value: |
-      Note - filling in this form will file an issue against the www.ubuntu.com website, not against Ubuntu itself, for Ubuntu OS related bugs please [go here](https://help.ubuntu.com/community/ReportingBugs).
+      *Note - filling in this form will file an issue against the www.ubuntu.com website, not against Ubuntu itself, for Ubuntu OS related bugs please [go here](https://help.ubuntu.com/community/ReportingBugs).*
 - type: markdown
   attributes:
     value: |
-      Please provide as many details as possible in order to provide maintainers more context about the issue. Don't skip/remove any of the sections below. If there is no data to provide in one of the sections, please specify it by typing "N/A" or similar. That will help maintainers reproduce the issue and be able to help quickly. Thanks.
+      *Please provide as many details as possible in order to provide maintainers more context about the issue. Don't skip/remove any of the sections below. If there is no data to provide in one of the sections, please specify it by typing "N/A" or similar. That will help maintainers reproduce the issue and be able to help quickly. Thanks.*
 - type: textarea
   id: summary
   attributes:
@@ -47,7 +47,8 @@ body:
     required: true
 - type: markdown
   attributes:
-    value: Please provide a screenshot in the comments after you have created an issue to help the maintainers debug the issue quicker.
+    value: |
+      *Please provide a screenshot in the comments after you have created an issue to help the maintainers debug the issue quicker.*
 - type: input
   id: reported_from
   attributes:
diff --git a/templates/templates/_footer-copyright-and-legal.html b/templates/templates/_footer-copyright-and-legal.html
index f23b5ddfe4a..37d0242b714 100644
--- a/templates/templates/_footer-copyright-and-legal.html
+++ b/templates/templates/_footer-copyright-and-legal.html
@@ -1,7 +1,7 @@
 <div class="row">
   <hr class="is-muted" />
   <div class="col-3 col-medium-2">
-    <p class="p-footer--secondary__content">&copy; {{ current_year() }} Canonical Ltd. </p>
+    <p class="p-footer--secondary__content">&copy; {{ current_year() }} Canonical Ltd.</p>
   </div>
   <div class="col-9 col-medium-4">
     <p>Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
@@ -18,12 +18,10 @@
           <a href="" class="js-revoke-cookie-manager">Manage your tracker settings</a>
         </li>
         <li class="p-inline-list__item">
-          <a href="https://github.com/canonical/ubuntu.com/issues/new" id="report-a-bug">
-            Report a bug on this site
-          </a>
+          <a href="https://github.com/canonical/ubuntu.com/issues/new?template=ISSUE_TEMPLATE.yaml"
+             id="report-a-bug">Report a bug on this site</a>
         </li>
       </ul>
     </nav>
   </div>
 </div>
-
diff --git a/templates/templates/footer.html b/templates/templates/footer.html
index f29851b1646..59988622cf5 100755
--- a/templates/templates/footer.html
+++ b/templates/templates/footer.html
@@ -291,7 +291,7 @@ <h2 class="p-heading--5">
       <script>
         /* Add the page to the report a bug link */
         var bugLink = document.querySelector('#report-a-bug');
-        bugLink.href += '?body=%0a%0a%0a---%0a*Reported%20from:%20' + location.href + '*';
+        bugLink.href += '&reported_from=' + location.href;
       </script>
       <span class="u-off-screen"><a href="#">Go to the top of the page</a></span>
     </div>