Merge pull request #597 from DIVD-NL/revert-594-593-add-code-of-ethic…

…s-page Revert "593 - Add Code of Ethics page and markdownify teams description"
DIVD-NL · Sep 23, 2024 · 9c203ff · 9c203ff
2 parents 9b3944a + 3f61624
commit 9c203ff
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 142 deletions.
diff --git a/admin/config.yml b/admin/config.yml
@@ -1049,23 +1049,6 @@ collections:
       - { label: "Title", name: "title", widget: "string", i18n: true }
       - { label: "Body", name: "body", widget: "markdown", i18n: true }
 
-  # PAGE: !Code of Ethics #####################################################
-  - name: codeofethics
-    label: "Code of ethics"
-    folder: "content/what-we-do/code-of-ethics"
-    slug: "_index"
-    create: false
-    i18n: true
-    fields:
-      - {
-          label: "type",
-          name: "type",
-          widget: "hidden",
-          value: "codeofethics",
-        }
-      - { label: "Title", name: "title", widget: "string", i18n: true }
-      - { label: "Body", name: "body", widget: "markdown", i18n: true }
-
   # PAGE: !Terms #####################################################
   - name: termsandconditions
     label: "Terms and Conditions"
@@ -1215,7 +1198,7 @@ collections:
           - { label: "type", name: "type", widget: "hidden", value: "team" }
           - label: "Description"
             name: "description"
-            widget: markdown
+            widget: "text"
             i18n: true
             required: false
           - label: "Members"

diff --git a/admin/development/config-dev.yml b/admin/development/config-dev.yml
@@ -1049,23 +1049,6 @@ collections:
       - { label: "Title", name: "title", widget: "string", i18n: true }
       - { label: "Body", name: "body", widget: "markdown", i18n: true }
 
-  # PAGE: !Code of Ethics #####################################################
-  - name: codeofethics
-    label: "Code of ethics"
-    folder: "content/what-we-do/code-of-ethics"
-    slug: "_index"
-    create: false
-    i18n: true
-    fields:
-      - {
-          label: "type",
-          name: "type",
-          widget: "hidden",
-          value: "codeofethics",
-        }
-      - { label: "Title", name: "title", widget: "string", i18n: true }
-      - { label: "Body", name: "body", widget: "markdown", i18n: true }
-
   # PAGE: !Terms #####################################################
   - name: termsandconditions
     label: "Terms and Conditions"
@@ -1215,7 +1198,7 @@ collections:
           - { label: "type", name: "type", widget: "hidden", value: "team" }
           - label: "Description"
             name: "description"
-            widget: markdown
+            widget: "text"
             i18n: true
             required: false
           - label: "Members"

diff --git a/admin/staging/config-staging.yml b/admin/staging/config-staging.yml
@@ -1049,23 +1049,6 @@ collections:
       - { label: "Title", name: "title", widget: "string", i18n: true }
       - { label: "Body", name: "body", widget: "markdown", i18n: true }
 
-  # PAGE: !Code of Ethics #####################################################
-  - name: codeofethics
-    label: "Code of ethics"
-    folder: "content/what-we-do/code-of-ethics"
-    slug: "_index"
-    create: false
-    i18n: true
-    fields:
-      - {
-          label: "type",
-          name: "type",
-          widget: "hidden",
-          value: "codeofethics",
-        }
-      - { label: "Title", name: "title", widget: "string", i18n: true }
-      - { label: "Body", name: "body", widget: "markdown", i18n: true }
-
   # PAGE: !Terms #####################################################
   - name: termsandconditions
     label: "Terms and Conditions"
@@ -1215,7 +1198,7 @@ collections:
           - { label: "type", name: "type", widget: "hidden", value: "team" }
           - label: "Description"
             name: "description"
-            widget: markdown
+            widget: "text"
             i18n: true
             required: false
           - label: "Members"

diff --git a/content/what-we-do/code-of-ethics/_index.en.md b/content/what-we-do/code-of-ethics/_index.en.md
diff --git a/content/what-we-do/code-of-ethics/_index.nl.md b/content/what-we-do/code-of-ethics/_index.nl.md
diff --git a/layouts/codeofethics/list.html b/layouts/codeofethics/list.html
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -37,9 +37,6 @@ <h4>{{ i18n "security" }}</h4>
               <li>
                 <a href="{{ "what-we-do/code-of-conduct/" | relLangURL }}">{{ i18n "codeofconduct" }}</a>
               </li>
-              <li>
-                <a href="{{ "what-we-do/code-of-ethics/" | relLangURL }}">{{ i18n "codeofethics" }}</a>
-              </li>
               <li>
                 <a href="{{ "security/" | relLangURL }}">{{ i18n "securitypolicy" }}</a>
               </li>

diff --git a/layouts/partials/mainnav.html b/layouts/partials/mainnav.html
@@ -24,11 +24,6 @@
         {{ i18n "nav_security" }}
         {{ partial "svg/icon" "chevrondown" }}
       </a>
-
-      <a href="{{ "/what-we-do/code-of-ethics" | relLangURL }}">
-        {{ i18n "nav_security" }}
-        {{ partial "svg/icon" "chevrondown" }}
-      </a>
     </article>
 
     <aside>
@@ -119,9 +114,6 @@ <h3>Security</h3>
             <li>
               <a href="{{ "/what-we-do/code-of-conduct" | relLangURL }}">Code of Conduct</a>
             </li>
-            <li>
-              <a href="{{ "/what-we-do/code-of-ethics" | relLangURL }}">Code of Ethics</a>
-            </li>
             <li>
               <a href="{{ "/why-our-work-matters" | relLangURL }}">Why our work matters</a>
             </li>

diff --git a/static/.htaccess b/static/.htaccess
@@ -40,7 +40,6 @@ RewriteRule .* /contribute/#donate [NE,L,r=301,QSA]
 
 RewriteCond %{REQUEST_URI} ^/divd-nl-2024/code [NC]
 RewriteRule .* /what-we-do/code-of-conduct/ [L,r=301,QSA]
-RewriteRule .* /what-we-do/code-of-ethics/ [L,r=301,QSA]
 
 RewriteCond %{REQUEST_URI} ^/divd-nl-2024/join [NC]
 RewriteRule .* /contribute/volunteers/ [L,r=301,QSA]
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,9 +37,6 @@ <h4>{{ i18n "security" }}</h4> @@
                   <li>
                     <a href="{{ "what-we-do/code-of-conduct/" | relLangURL }}">{{ i18n "codeofconduct" }}</a>
                   </li>
-                  <li>
-                    <a href="{{ "what-we-do/code-of-ethics/" | relLangURL }}">{{ i18n "codeofethics" }}</a>
-                  </li>
                   <li>
                     <a href="{{ "security/" | relLangURL }}">{{ i18n "securitypolicy" }}</a>
                   </li>
@@ Expand Down @@