Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 12, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40b8353
Issue #2337. Rename contributors-related routes so they can be groupe…
miketaylr Apr 11, 2018
abceb18
Issue #2337. Update footer and sub-nav templates to use contributor t…
miketaylr Apr 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions webcompat/templates/contributors/sub-nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,59 +5,59 @@
</a>

This comment was marked as abuse.

Sign in to view

</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 %}">

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

<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 %}">

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

<a class="link-text" href="/contributors/report-bug">
Report a Bug
</a>
</li>

<li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_reproduce_bug' %} sub-nav-active{% endif %}">
<li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_bug_reproduce' %} sub-nav-active{% endif %}">
<a class="link-text" href="/contributors/reproduce-bug">
Reproduce a Bug
</a>
</li>

<li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_diagnose_bug' %} sub-nav-active{% endif %}">
<li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_bug_diagnosis' %} sub-nav-active{% endif %}">
<a class="link-text" href="/contributors/diagnose-bug">
Diagnose a Bug
</a>
</li>

<li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_site_outreach' %} sub-nav-active{% endif %}">
<li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_bug_outreach' %} sub-nav-active{% endif %}">
<a class="link-text" href="/contributors/site-outreach">
Site outreach
</a>
</li>
</ol>
</li>

<li class="sub-nav-item {% if request.url_rule.endpoint in ['contributors_build_tools', 'contributors_web_platform_research', 'contributors_organize_webcompat_events'] %} active {% endif %}">
<li class="sub-nav-item {% if 'contributors_other_' in request.url_rule.endpoint %} active {% endif %}">
<a class="link-text" href="/contributors/build-tools">
Other ways to contribute <span class="nested-sub"></span>
</a>
<ol class="nested-sub-nav">
<li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_build_tools' %} sub-nav-active{% endif %}">
<li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_other_tools' %} sub-nav-active{% endif %}">
<a class="link-text" href="/contributors/build-tools">
Build Tools
</a>
</li>

<li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_web_platform_research' %} sub-nav-active{% endif %}">
<li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_other_research' %} sub-nav-active{% endif %}">
<a class="link-text" href="/contributors/web-platform-research">
Web Platform Research
</a>
</li>

<li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_organize_webcompat_events' %} sub-nav-active{% endif %}">
<li class="nested-sub-nav-item {% if request.url_rule.endpoint == 'contributors_other_events' %} sub-nav-active{% endif %}">
<a class="link-text" href="/contributors/organize-webcompat-events">
Organize Webcompat events
</a>
</li>
</ol>
</li>
</ol>
</ol>
21 changes: 10 additions & 11 deletions webcompat/templates/shared/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}">

This comment was marked as abuse.

Sign in to view

<a class="footer-item-link" aria-label="go to contribute" href="{{ url_for('contributors') }}">
Contribute
</a>
Expand All @@ -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 %}

This comment was marked as abuse.

Sign in to view

<ul class="grid-cell x1 footer-sub-list">
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_report_bug' %}active{% endif %}">
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_bug_report' %}active{% endif %}">
<a class="footer-item-link" href="/contributors/report-bug">Report a Bug</a>
</li>
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_reproduce_bug' %}active{% endif %}">
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_bug_reproduce' %}active{% endif %}">
<a class="footer-item-link" href="/contributors/reproduce-bug">Reproduce a Bug</a>
</li>
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_diagnose_bug' %}active{% endif %}">
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_bug_diagnosis' %}active{% endif %}">
<a class="footer-item-link" href="/contributors/diagnose-bug">Diagnose a Bug</a>
</li>
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_site_outreach' %}active{% endif %}">
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_bug_outreach' %}active{% endif %}">
<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 %}

This comment was marked as abuse.

Sign in to view

<ul class="grid-cell x1 footer-sub-list">
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_build_tools' %}active{% endif %}">
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_other_tools' %}active{% endif %}">
<a class="footer-item-link" href="/contributors/build-tools">Build Tools</a>
</li>
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_web_platform_research' %}active{% endif %}">
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_other_research' %}active{% endif %}">
<a class="footer-item-link" href="/contributors/web-platform-research">Web Platform Research</a>
</li>
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_organize_webcompat_events' %}active{% endif %}">
<li class="footer-sub-item {% if request.url_rule.endpoint == 'contributors_other_events' %}active{% endif %}">
<a class="footer-item-link" href="/contributors/organize-webcompat-events">Organize Webcompat events</a>
</li>
</ul>
Expand Down
14 changes: 7 additions & 7 deletions webcompat/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():

This comment was marked as abuse.

Sign in to view

"""Route to display contributors/report-bug page."""
if g.user:
get_user_info()
Expand All @@ -359,7 +359,7 @@ def contributors_report_bug():

@app.route('/contributors/reproduce-bug')
@cache_policy(private=True, uri_max_age=0, must_revalidate=True)
def contributors_reproduce_bug():
def contributors_bug_reproduce():
"""Route to display contributors/reproduce-bug page."""
if g.user:
get_user_info()
Expand All @@ -368,7 +368,7 @@ def contributors_reproduce_bug():

@app.route('/contributors/diagnose-bug')
@cache_policy(private=True, uri_max_age=0, must_revalidate=True)
def contributors_diagnose_bug():
def contributors_bug_diagnosis():
"""Route to display contributors/diagnose-bug page."""
if g.user:
get_user_info()
Expand All @@ -377,7 +377,7 @@ def contributors_diagnose_bug():

@app.route('/contributors/site-outreach')
@cache_policy(private=True, uri_max_age=0, must_revalidate=True)
def contributors_site_outreach():
def contributors_bug_outreach():
"""Route to display contributors/site-outreach page."""
if g.user:
get_user_info()
Expand All @@ -386,7 +386,7 @@ def contributors_site_outreach():

@app.route('/contributors/build-tools')
@cache_policy(private=True, uri_max_age=0, must_revalidate=True)
def contributors_build_tools():
def contributors_other_tools():
"""Route to display contributors/build-tools page."""
if g.user:
get_user_info()
Expand All @@ -395,7 +395,7 @@ def contributors_build_tools():

@app.route('/contributors/web-platform-research')
@cache_policy(private=True, uri_max_age=0, must_revalidate=True)
def contributors_web_platform_research():
def contributors_other_research():
"""Route to display contributors/web-platform-research page."""
if g.user:
get_user_info()
Expand All @@ -404,7 +404,7 @@ def contributors_web_platform_research():

@app.route('/contributors/organize-webcompat-events')
@cache_policy(private=True, uri_max_age=0, must_revalidate=True)
def contributors_organize_webcompat_events():
def contributors_other_events():
"""Route to display contributors/organize-webcompat-events page."""
if g.user:
get_user_info()
Expand Down