From 7b75ad051482ee4588ea4c26062a1510cc8eaa34 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Tue, 21 Mar 2023 17:15:55 -0500 Subject: [PATCH] Use GitHub issue form syntax (#2095) --- .../ISSUE_TEMPLATE/1_Content_Correction.md | 8 -- .../ISSUE_TEMPLATE/1_Content_Correction.yml | 46 +++++++++++ .github/ISSUE_TEMPLATE/2_Website_Issues.md | 15 ---- .github/ISSUE_TEMPLATE/2_Website_Issues.yml | 81 +++++++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 5 +- .github/PULL_REQUEST_TEMPLATE.md | 20 ++--- 6 files changed, 136 insertions(+), 39 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/1_Content_Correction.md create mode 100644 .github/ISSUE_TEMPLATE/1_Content_Correction.yml delete mode 100644 .github/ISSUE_TEMPLATE/2_Website_Issues.md create mode 100644 .github/ISSUE_TEMPLATE/2_Website_Issues.yml diff --git a/.github/ISSUE_TEMPLATE/1_Content_Correction.md b/.github/ISSUE_TEMPLATE/1_Content_Correction.md deleted file mode 100644 index ca699fae..00000000 --- a/.github/ISSUE_TEMPLATE/1_Content_Correction.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: "Content Correction" -about: Report any inaccurate, incorrect, or outdated information on the website. ---- - -## Description - -**URL of affected page:** diff --git a/.github/ISSUE_TEMPLATE/1_Content_Correction.yml b/.github/ISSUE_TEMPLATE/1_Content_Correction.yml new file mode 100644 index 00000000..78413766 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/1_Content_Correction.yml @@ -0,0 +1,46 @@ +name: "Content Correction" +description: Report any inaccurate, incorrect, or outdated information on the website. +labels: ["t:correction"] +body: + + - type: markdown + attributes: + value: | + This form is for reporting verifiable issues with our website. + If you simply disagree with an opinion on the website, please open a discussion [on our forum](https://discuss.privacyguides.net/) instead. + + - type: input + attributes: + label: Affected page + description: Please let us know which page the incorrect information can be found on. + placeholder: "https://www.privacyguides.org/en/data-redaction/" + validations: + required: true + + - type: textarea + id: description + attributes: + label: Description + description: Please let us know what should be fixed. + placeholder: The Google Play Store link for ExifEraser is broken... + validations: + required: true + + - type: textarea + id: source + attributes: + label: Sources + description: Please provide reliable sources that support the change you are requesting. + validations: + required: true + + - type: checkboxes + id: checklist + attributes: + label: Before submitting + description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it. + options: + - label: I am reporting something that is verifiably incorrect, not a suggestion or opinion. + required: true + - label: I agree to the [Community Code of Conduct](https://www.privacyguides.org/en/code_of_conduct/). + required: true diff --git a/.github/ISSUE_TEMPLATE/2_Website_Issues.md b/.github/ISSUE_TEMPLATE/2_Website_Issues.md deleted file mode 100644 index 31483d86..00000000 --- a/.github/ISSUE_TEMPLATE/2_Website_Issues.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -name: "Website Issue" -about: Report a bug with the website. (NO CONTENT ISSUES) ---- - - diff --git a/.github/ISSUE_TEMPLATE/2_Website_Issues.yml b/.github/ISSUE_TEMPLATE/2_Website_Issues.yml new file mode 100644 index 00000000..adde9590 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/2_Website_Issues.yml @@ -0,0 +1,81 @@ +name: "Website Issue" +description: Report a bug with the website. +labels: ["t:bug"] +assignees: + - jonaharagon +body: + + - type: markdown + attributes: + value: | + This form is only for reporting a technical bug __with our website__, like broken images, broken CSS, issues with search or themes, etc. + This is not the place to report an issue with Matrix, Discourse, or our other hosted services. + + If you want us to fix inaccurate information on the website, go back and use the content correction form. + If you want to make another suggestion, please [use our discussion forum](https://discuss.privacyguides.net/) instead. + + - type: textarea + id: description + attributes: + label: Bug description + description: | + Please give a detailed description of the bug. + Explain how the website does not behave as you would expect it to, and be as specific as possible. + If you have found a workaround or a fix for the problem too, please let us know. + validations: + required: true + + - type: textarea + id: affected-pages + attributes: + label: Affected pages + description: | + Please list all pages where you've noticed this issue, or let us know if it affects every page on the site. + value: | + - + + - type: dropdown + id: browser + attributes: + label: Browser + description: | + Please select the browser(s) you have noticed this issue with. + If your browser is not listed or the version is relevant, you may select _Other_ and provide more details in the description above. + multiple: true + options: + - Firefox + - Tor Browser + - Chrome + - Safari + - Edge + - Other + + - type: dropdown + id: os + attributes: + label: Operating System + description: | + Please select the operating system(s) you have noticed this issue with. + multiple: true + options: + - Linux + - macOS + - Windows + - Android + - iOS + - Other + + - type: checkboxes + id: checklist + attributes: + label: Before submitting + description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it. + options: + - label: I am reporting something that is broken on the website, not making a suggestion. + required: true + - label: I agree to the [Community Code of Conduct](https://www.privacyguides.org/en/code_of_conduct/). + required: true + + - type: markdown + attributes: + value: Thank you for letting us know about this! diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 44ebaf48..cf841fdd 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,8 +1,9 @@ +blank_issues_enabled: false contact_links: - - name: Suggest a New Provider or Software + - name: Suggest Adding or Removing a Tool url: https://discuss.privacyguides.net/c/site-development/suggestions about: Suggest something new for us to look at, or something we should remove. - - name: Suggest a Guide + - name: Suggest a New Guide url: https://discuss.privacyguides.net/c/site-development/guide-suggestions about: Suggest an area where you think guidance might be required. - name: Ask a Question diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ea3d1612..1de854ff 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,31 +1,23 @@ +Changes proposed in this PR: +- -- [ ] Please check this box to confirm you have disclosed any relevant conflicts of interest in your post. -- [ ] Please check this box to confirm your agreement to grant Privacy Guides a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform, relicense, and distribute your contribution as part of our project. -- [ ] Please check this box to confirm you are the sole author of this work, or that any additional authors will also reply to this PR on GitHub confirming their agreement to these terms. +- [ ] I have disclosed any relevant conflicts of interest in my post. +- [ ] I agree to grant Privacy Guides a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform, relicense, and distribute my contribution as part of this project. +- [ ] I am the sole author of this work. +- [ ] I agree to the [Community Code of Conduct](https://www.privacyguides.org/en/code_of_conduct/).