Add Policies FAQ to links and restructure links to make them more obvious

Author: KevinMind

src/olympia/devhub/templates/devhub/includes/agreement.html

@@ -4,8 +4,18 @@
     {{ agreement_message }}
   </p>
   <ul class="agreement-links">
-    <li>{{ agreement_form.distribution_agreement }}<a href="{{ url('devhub.docs', 'policies/agreement') }}" target="_blank" rel="noopener noreferrer">{{ _('Firefox Add-on Distribution Agreement') }}</a> {{ agreement_form.distribution_agreement.errors }}</li>
-    <li>{{ agreement_form.review_policy }}<a href="{{ url('devhub.docs', 'policies/reviews') }}" target="_blank" rel="noopener noreferrer">{{ _('Review Policies and Rules') }}</a> {{ agreement_form.review_policy.errors }}</li>
+    <li>
+      {{ agreement_form.distribution_agreement }}
+      {{ _('Firefox Add-on Distribution Agreement') }}
+      (<a href="{{ url('devhub.docs', 'policies/agreement') }}" target="_blank" rel="noopener noreferrer">{{ _('link') }}</a>)
+      {{ agreement_form.distribution_agreement.errors }}
+    </li>
+    <li>
+      {{ agreement_form.review_policy }}
+      {{ _('Review Policies and Rules') }}
+      (<a href="{{ url('devhub.docs', 'policies/reviews') }}" target="_blank" rel="noopener noreferrer">{{ _('link') }}</a> <a href="{{ url('devhub.docs', 'policies/faq') }}" target="_blank" rel="noopener noreferrer">{{ _('faq') }}</a>)
+      {{ agreement_form.review_policy.errors }}
+    </li>
   </ul>
   <p>
     {{ _('I have read and accept this Agreement and the Rules and Policies') }}.

src/olympia/devhub/tests/test_views.py

@@ -2054,25 +2054,6 @@ def test_doc_urls(self):
         assert '/en-US/developers/docs/te' == reverse('devhub.docs', args=['te'])
         assert '/en-US/developers/docs/te/st', reverse('devhub.docs', args=['te/st'])
 
-        urls = [
-            (reverse('devhub.docs', args=['getting-started']), 301),
-            (reverse('devhub.docs', args=['how-to']), 301),
-            (reverse('devhub.docs', args=['how-to/other-addons']), 301),
-            (reverse('devhub.docs', args=['fake-page']), 404),
-            (reverse('devhub.docs', args=['how-to/fake-page']), 404),
-            (reverse('devhub.docs'), 301),
-        ]
-
-        index = reverse('devhub.index')
-
-        for url in urls:
-            response = self.client.get(url[0])
-            assert response.status_code == url[1]
-
-            if url[1] == 302:  # Redirect to the index page
-                self.assert3xx(response, index)
-
-
 class TestRemoveLocale(TestCase):
     fixtures = ['base/users', 'base/addon_3615']
 

src/olympia/devhub/views.py

@@ -1952,26 +1952,19 @@ def request_review(request, addon_id, addon):
 
 
 def docs(request, doc_name=None):
-    mdn_docs = {
+    developer_docs = {
         None: '',
-        'getting-started': '',
-        'reference': '',
-        'how-to': '',
-        'how-to/getting-started': '',
-        'how-to/extension-development': '#Extensions',
-        'how-to/other-addons': '#Other_types_of_add-ons',
-        'how-to/thunderbird-mobile': '#Application-specific',
-        'how-to/theme-development': '#Themes',
-        'themes': '/Themes/Background',
-        'themes/faq': '/Themes/Background/FAQ',
         'policies': '/AMO/Policy',
         'policies/reviews': '/AMO/Policy/Reviews',
-        'policies/contact': '/AMO/Policy/Contact',
+        'policies/faq': '/AMO/Policy/FAQ',
         'policies/agreement': '/AMO/Policy/Agreement',
     }
 
-    if doc_name in mdn_docs:
-        return redirect(MDN_BASE + mdn_docs[doc_name], permanent=True)
+    if doc_name in developer_docs:
+        return redirect(
+            settings.EXTENSION_WORKSHOP_URL + developer_docs[doc_name],
+            permanent=True,
+        )
 
     raise http.Http404()