Fixes #2337: Refactor contributor routes for simpler nav/sub-nav templates. #2387

miketaylr · 2018-04-11T20:25:07Z

…d by substring.

…emplate groups.

karlcow

My bad for NOT (edited) noticing this before. Aka the templates contained these rules with endpoint before, while we could have used rule. But we have an opportunity to change that. So I'm sending this with a weak request changes. Your PR is working as-is. but we probably don't have to change views.py

webcompat/views.py

@@ -350,7 +350,7 @@ def contributors():

 @app.route('/contributors/report-bug')
 @cache_policy(private=True, uri_max_age=0, must_revalidate=True)
-def contributors_report_bug():
+def contributors_bug_report():


webcompat/templates/contributors/sub-nav.html

@@ -5,59 +5,59 @@
    </a>
  </li>

-  <li class="sub-nav-item {% if request.url_rule.endpoint in ['contributors_report_bug', 'contributors_reproduce_bug', 'contributors_diagnose_bug', 'contributors_site_outreach'] %} active {% endif %}">
+  <li class="sub-nav-item {% if 'contributors_bug_' in request.url_rule.endpoint %} active {% endif %}">


webcompat/templates/contributors/sub-nav.html

    <a class="link-text" href="/contributors/report-bug">
      Working with bugs <span class="nested-sub"></span>
    </a>
    <ol class="nested-sub-nav">
-      <li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_report_bug' %} sub-nav-active{% endif %}">
+      <li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_bug_report' %} sub-nav-active{% endif %}">


webcompat/templates/contributors/sub-nav.html

@@ -5,59 +5,59 @@
    </a>


miketaylr · 2018-04-12T13:58:54Z

Aka the templates contained these rules with endpoint before, while we could have used rule. But we have an opportunity to change that. So I'm sending this with a weak request changes.

Yep, makes sense! Happy to make the changes.

edit: looking at this more, I think it's a little nicer to use endpoint rather than rule. But if you feel strongly, we can re-do this. It just means the template is a little more verbose than my proposal.

miketaylr

(oops, left my comments as part of a Review)

webcompat/templates/contributors/sub-nav.html

    <a class="link-text" href="/contributors/report-bug">
      Working with bugs <span class="nested-sub"></span>
    </a>
    <ol class="nested-sub-nav">
-      <li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_report_bug' %} sub-nav-active{% endif %}">
+      <li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_bug_report' %} sub-nav-active{% endif %}">


webcompat/templates/contributors/sub-nav.html

@@ -5,59 +5,59 @@
    </a>
  </li>

-  <li class="sub-nav-item {% if request.url_rule.endpoint in ['contributors_report_bug', 'contributors_reproduce_bug', 'contributors_diagnose_bug', 'contributors_site_outreach'] %} active {% endif %}">
+  <li class="sub-nav-item {% if 'contributors_bug_' in request.url_rule.endpoint %} active {% endif %}">


webcompat/templates/shared/footer.html

@@ -16,8 +16,7 @@
            About
          </a>
        </li>
-        <li class="footer-item{% if request.url_rule.endpoint in
-        ['contributors_build_tools', 'contributors_web_platform_research', 'contributors_organize_webcompat_events', 'contributors', 'contributors_report_bug', 'contributors_reproduce_bug', 'contributors_diagnose_bug', 'contributors_site_outreach'] %} active{% endif %}">
+        <li class="footer-item{% if 'contributors' in request.url_rule.endpoint %} active{% endif %}">


webcompat/templates/shared/footer.html

@@ -40,33 +39,33 @@
      </ul>

 <!-- sub nav for contribute > working with bugs -->
-      {% if request.url_rule.endpoint in ['contributors_report_bug', 'contributors_reproduce_bug', 'contributors_diagnose_bug', 'contributors_site_outreach'] %}
+      {% if 'contributors_bug_' in request.url_rule.endpoint %}


webcompat/templates/shared/footer.html

            <a class="footer-item-link" href="/contributors/site-outreach">Site Outreach</a>
          </li>
        </ul>
      {% endif %}

 <!-- sub nav for contribute > other contributions -->
-      {% if request.url_rule.endpoint in ['contributors_build_tools', 'contributors_web_platform_research', 'contributors_organize_webcompat_events'] %}
+      {% if 'contributors_other_' in request.url_rule.endpoint %}


karlcow

ok understood! Indeed it makes sense.

@miketaylr Thanks for the explanations. Super useful.

miketaylr · 2018-04-12T22:03:01Z

Thanks @karlcow for your review, I didn't know about request.url_rule.rule. 🎈

karlcow · 2018-04-12T23:51:00Z

As a kind of followup on this #2391

miketaylr added 2 commits April 11, 2018 15:22

Issue #2337. Rename contributors-related routes so they can be groupe…

40b8353

…d by substring.

Issue #2337. Update footer and sub-nav templates to use contributor t…

abceb18

…emplate groups.

miketaylr requested a review from karlcow April 11, 2018 20:25

miketaylr added the in progress label Apr 11, 2018

karlcow requested changes Apr 12, 2018

View reviewed changes

miketaylr commented Apr 12, 2018

View reviewed changes

karlcow approved these changes Apr 12, 2018

View reviewed changes

karlcow merged commit e205f37 into master Apr 12, 2018

karlcow added status: add to changelog and removed in progress labels Apr 12, 2018

miketaylr deleted the issues/2337/1 branch April 12, 2018 22:02

miketaylr removed the status: add to changelog label Apr 17, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #2337: Refactor contributor routes for simpler nav/sub-nav templates. #2387

Fixes #2337: Refactor contributor routes for simpler nav/sub-nav templates. #2387

miketaylr commented Apr 11, 2018

karlcow left a comment •

edited

Loading

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

miketaylr commented Apr 12, 2018 •

edited

Loading

miketaylr left a comment

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

karlcow left a comment

miketaylr commented Apr 12, 2018

karlcow commented Apr 12, 2018

Fixes #2337: Refactor contributor routes for simpler nav/sub-nav templates. #2387

Fixes #2337: Refactor contributor routes for simpler nav/sub-nav templates. #2387

Conversation

miketaylr commented Apr 11, 2018

karlcow left a comment • edited Loading

Choose a reason for hiding this comment

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

miketaylr commented Apr 12, 2018 • edited Loading

miketaylr left a comment

Choose a reason for hiding this comment

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

karlcow left a comment

Choose a reason for hiding this comment

miketaylr commented Apr 12, 2018

karlcow commented Apr 12, 2018

karlcow left a comment •

edited

Loading

miketaylr commented Apr 12, 2018 •

edited

Loading