Commit 34dc6570 authored by Hiro's avatar Hiro 🏄
Browse files

Fix links in footer

parent 2ee2e938
......@@ -4,7 +4,8 @@
<div class="container">
<div class="row">
<div class="col-md-8 py-3">
<h3 class="text-secondary display-5 mb-4"><i class="fas fa-table-tennis text-primary pr-2"></i> {{ _('Chat with us on <a href="https://webchat.oftc.net/" title="Tor Project IRC" target="_blank">OFTC IRC</a>')|safe }}</h3>
{% from "macros/contact.html" import render_oftc %}
<h3 class="text-secondary display-5 mb-4"><i class="fas fa-table-tennis text-primary pr-2"></i> {{ _('Chat with us on') }} {{ render_oftc() }}</h3>
<p class="text-tpo"><span class="text-primary nick">#tor</span> - {{ _("Ask questions about using Tor.") }}</p>
<p class="text-tpo"><span class="text-primary nick">#tor-dev</span> - {{ _("Discuss Tor-related coding, protocols, and ideas are all welcome.") }}</p>
<p class="text-tpo"><span class="text-primary nick">#tor-project</span> - {{ _("Discuss organization and community related topics: meetups, outreach, translation, or website improvements.") }}</p>
......@@ -92,7 +93,7 @@
<div class="row">
<div class="col-md-8 p-0 pr-5">
<h3 class="text-primary display-5">{{ _('Email us') }}</h3>
<p class="text-tpo">{{ _('For questions and comments about Tor the non-profit organization: trademark questions, affiliation and coordination, contract inquiries, etc, please email') }}<a href="mailto:frontdesk@rt.torproject.org">frontdesk@rt.torproject.org</a>. {{ _('For donor-related questions, contact') }} <a href="mailto:giving@torproject.org">giving@torproject.org</a>.</p>
<p class="text-tpo">{{ _('For questions and comments about Tor the non-profit organization: trademark questions, affiliation and coordination, contract inquiries, etc, please email frontdesk@rt.torproject.org. For donor-related questions, contact giving@torproject.org') }}.</p>
</div>
<div class="d-block d-sm-none container py-3">
<div class="row border-bottom border-light"><p></p></div>
......
......@@ -17,10 +17,12 @@
<div class="row my-5">
<a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="">{{ _('Download .apk') }}</a>
<a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="">{{ _('Go to Google Play') }}</a>
<a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid <small class="badge-pill badge-dark mx-1 nick">S00N</small>')|safe }}</a>
{% from "macros/downloads.html" import render_fdroid %}
<a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a>
</div>
<div class="row">
<p class="text-light mx-auto nick">{{ _('Are you a iOS user? We encourage you to try <a class="mx-auto" href=""><u>Onion Browser.</u></a>')|safe }}</p>
{% from "macros/downloads.html" import render_onion_browser %}
<p class="text-light mx-auto nick">{{ _('Are you a iOS user? We encourage you to try %s')|format(render_onion_browser())|safe }} </p>
</div>
</div>
<div class="d-none d-lg-block col-lg-4">
......
......@@ -26,7 +26,13 @@
{% set menubag = 'menu_footer+' + this.alt %}
{% for id, item in bag(menubag).items() %}
<li{% if this.is_child_of(item.path) %} class="nav-item active" {% else %} class="nav-item"{% endif %}>
<a class="nav-link text-light" href="{{ item.path }}">{{ item.label }}
{% set link = site.get(item.path) %}
{% if link %}
<a class="nav-link text-light" href="{{ item.path|url }}">
{% else %}
<a class="nav-link text-light" href="{{ item.path }}">
{% endif %}
{{ item.label }}
{% if this.is_child_of(item.path) %}
<span class="sr-only">(current)</span>
{% endif %}
......
{% macro render_oftc() %}
<a href="https://webchat.oftc.net/" title="Tor Project IRC" target="_blank">OFTC IRC</a>
{% endmacro %}
......@@ -34,3 +34,11 @@
<a class="downloadLink" href="{{ download_link_32 }}">32-bit</a> (<a href="{{ sig_link_32 }}">sig</a>) / <a href="{{ download_link_32 }}">64-bit</a> (<a href="{{ sig_link_64 }}">sig<a/>)
{% endmacro %}
{% macro render_fdroid() %}
<small class="badge-pill badge-dark mx-1 nick">S00N</small>
{% endmacro %}
{% macro render_onion_browser() %}
<a class="mx-auto" href=""><u>Onion Browser.</u></a>
{% endmacro %}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment