commit de40c311a4cad43dd26121a0d20548e1c0dec43f Author: hiro hiro@torproject.org Date: Thu Jun 20 13:30:56 2019 +0200

Update templates symlink --- templates/footer.html | 95 +------------------------------------------------- templates/header.html | 28 +-------------- templates/lego | 1 + templates/navbar.html | 64 +--------------------------------- templates/pagenav.html | 2 +- templates/search.html | 2 +- 6 files changed, 6 insertions(+), 186 deletions(-)

diff --git a/templates/footer.html b/templates/footer.html deleted file mode 100644 index b00757e..0000000 --- a/templates/footer.html +++ /dev/null @@ -1,94 +0,0 @@ -{% if this.path == '/download' %} - {% include 'download-android.html' %} -{% endif %} -<div class="container-fluid bg-dark footer onion-bg"> - <div class="row"> - <div class="col-12 d-flex justify-content-right"> - <div class="container pt-5 justify-content-right"> - <div class="offset-lx-2 offset-sm-4 mt-5"> - <h2 class="text-white text-bold">{{ _('Download Tor Browser') }}</h2> - <p class="text-white">{{ _('Download Tor Browser to experience real private browsing without tracking, surveillance, or censorship.') }}</p> - {% set download = site.get('/download') %} - <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download, alt=this.alt) }}"> - {{ _("Download Tor Browser") }}<i class="ml-2 pt-1 fas fa-arrow-down-png-purple"></i> - </a> - </div> - </div> - </div> - </div> - <div class="row"> - <div class="col-12 d-flex justify-content-center"> - <div class="col-sm-6 offset-lx-1 offset-sm-0 mt-5"> - <h5 class="font-weight-bold mt-5 text-white">{{ _('Our mission:') }}</h5> - <p class="text-white mb-5" >{{ _('To advance human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.') }}</p> - </div> - <div class="col-sm-2 mt-5 d-none d-sm-block"> - <ul class="nav flex-column mt-sm-5"> - {% 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 %}> - {% set link = site.get(item.path) %} - {% if link %} - <a class="nav-link text-light" href="{{ item.path|url(alt=this.alt) }}"> - {% 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 %} - </a> - </li> - {% endfor %} - </ul> - <a href="https://donate.torproject.org" title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2 mt-2">{{ _("DONATE NOW") }}</span></h5></a> - </div> - </div> - <div class="col-12 d-flex justify-content-center border"> - <div class="col-sm-6 offset-lx-1 offset-md-2 offset-sm-0 mt-5 mt-5 pb-5"> - <p class="text-primary-light">{{ _('SUBSCRIBE TO OUR NEWSLETTER') }}</p> - <p class="text-light">{{ _('Get monthly updates and opportunities from the Tor Project:') }}</p> - <p class="w"><a class="btn btn-small btn-dark mt-2 text-white active" role="button" aria-pressed="true" href="https://newsletter.torproject.org/">{{ _('SIGN UP') }}</a></p> - </div> - <div class="col-md-4 col-lg-4 ml-2 mt-5 pb-5"> - <div class="row"> - <h4><a class="text-white px-3" target="_blank" href="https://www.facebook.com/TorProject/"><i class="fab fa-facebook-png"></i></a></h4> - <h4><a class="mastodon text-white px-3" target="_blank" href="https://mastodon.social/@torproject"><i class="fab fa-mastodon-png"></i></a></h4> - <h4><a class="twitter text-white px-3" target="_blank" href="https://twitter.com/torproject"><i class="fab fa-twitter-png"></i></a></h4> - </div> - <div class="row"> - <h4><a class="instagram text-white px-3" target="_blank" href="https://www.instagram.com/torproject"><i class="fab fa-instagram-png"></i></a></h4> - <h4><a class="linkedin text-white px-3" target="_blank" href="https://www.linkedin.com/company/tor-project"><i class="fab fa-linkedin-png"></i></a></h4> - <h4><a class="github text-white px-3" target="_blank" href="https://github.com/TheTorProject"><i class="fab fa-github-png"></i></a></h4> - </div> - </div> - </div> - - <div class="col-12 d-flex justify-content-center"> - <div class="col-sm-6 offset-lx-1 offset-sm-0 mt-5"> - {% from "macros/footer.html" import render_faq %} - <p class="text-primary text-light">{{ _('Trademark, copyright notices, and rules for use by third parties can be found in our %(link_to_faq)s')|format(link_to_faq=render_faq())|safe }}.</p> - </div> - <div class="col-sm-2 mt-5 d-none d-sm-block"> - <div class="btn-group dropdown float-right"> - <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - {{ bag('alternatives', this.alt, 'language') }} - </button> - <div class="dropdown-menu"> - {% for id, item in bag('alternatives').items() %} - {% if this.alt != id %} - <a class="dropdown-item" href="{{ this.path|url(alt=id) }}">{{ item.language }}</a> - {% endif %} - {% endfor %} - </div> - </div> - </div> - - <script src="{{ '/static/js/jquery-3.2.1.min.js'|asseturl }}" ></script> - <script src="{{ '/static/js/popper.min.js'|asseturl }}" ></script> - <script src="{{ '/static/js/bootstrap.bundle.min.js'|asseturl }}" ></script> - <script src="{{ '/static/js/scrollspy.min.js'|asseturl }}" ></script> - <script src="{{ '/static/js/modernizr.js'|asseturl }}" ></script> - <script src="{{ '/static/js/download.js'|asseturl }}" ></script> - <script src="{{ '/static/js/fallback.js'|asseturl }}" ></script> - </div> diff --git a/templates/footer.html b/templates/footer.html new file mode 120000 index 0000000..e78ee3c --- /dev/null +++ b/templates/footer.html @@ -0,0 +1 @@ +../lego/templates/footer.html \ No newline at end of file diff --git a/templates/header.html b/templates/header.html deleted file mode 100644 index 866edad..0000000 --- a/templates/header.html +++ /dev/null @@ -1,27 +0,0 @@ -{% if this.color == 'primary' %} -<div class="container-fluid bg-primary"> -{% else %} -<div class="container-fluid bg-dark"> -{% endif %} - <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}"> - {% if this.color == 'primary' %} - <div class="container bg-primary pt-5"> - {% else %} - <div class="container bg-dark pt-5"> - {% endif %} - <div class="row"> - <div class="col-12 content-center pt-5"> - <div class="row"> - <h6 class="mx-auto text-white">{% block section %}{{ this.section }}{% endblock %}</h6> - </div> - <div class="row pb-5"> - <h2 class="mx-auto display-3 text-white">{% block title %}{{ this.title }}{% endblock %}</h2> - </div> - </div> - </div> - </div> - </div> -</div> -{% if this.section_id == 'about' %} - {% include 'pagenav.html' %} -{% endif %} diff --git a/templates/header.html b/templates/header.html new file mode 120000 index 0000000..46dac03 --- /dev/null +++ b/templates/header.html @@ -0,0 +1 @@ +../lego/templates/header.html \ No newline at end of file diff --git a/templates/lego b/templates/lego new file mode 120000 index 0000000..5fbf47c --- /dev/null +++ b/templates/lego @@ -0,0 +1 @@ +../lego/ \ No newline at end of file diff --git a/templates/navbar.html b/templates/navbar.html deleted file mode 100644 index 681ffa8..0000000 --- a/templates/navbar.html +++ /dev/null @@ -1,63 +0,0 @@ -{% if this.color == 'primary' %} -<div class="container bg-primary"> - <nav class="navbar no-background navbar-expand-lg navbar-dark fixed-top bg-primary p-4"> -{% else %} -<div class="container bg-dark"> - <nav class="navbar no-background navbar-expand-lg navbar-dark fixed-top bg-dark p-4"> -{% endif %} - <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> - <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo@2x.png'|asseturl }}" > - <span class="sr-only">Tor Logo</span> - </a> - <a href="https://donate.torproject.org" title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2">{{ _("DONATE NOW") }}</span></h5></a> - <label for="nav-toggle"> - <a class="btn btn-lg btn-primary navbar-toggler text-white p-3" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> - {{ _("Menu") }} <span class="navbar-toggler-icon ml-1"></span> - </a> - </label> - <input type="checkbox" id="nav-toggle"/> - <div class="collapse navbar-collapse hamburger-menu" id="navbarSupportedContent"> - <div class="mx-auto"> - <ul class="navbar-nav"> - {% set menubag = 'menu+' + this.alt %} - {% for id, item in bag(menubag).items() %} - <li{% if this.path == item.path %} class="nav-item active" {% else %} class="nav-item"{% endif %}> - {% set link = site.get(item.path) %} - {% if link %} - <a class="nav-link" href="{{ item.path|url(alt=this.alt) }}"> - {% else %} - <a class="nav-link" href="{{ item.path }}"> - {% endif %} - {{ _(item.label) }} - {% if this.path == item.path %} - <span class="sr-only">(current)</span> - {% endif %} - </a> - </li> - {% endfor %} - </ul> - </div> - <div class="btn-group dropdown pull-right"> - {% if this.color == 'primary' %} - <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - {% else %} - <button type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block my-3 my-sm-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - {% endif %} - {{ bag('alternatives', this.alt, 'language') }} - </button> - <div class="dropdown-menu"> - {% for id, item in bag('alternatives').items() %} - {% if this.alt != id %} - <a class="dropdown-item" href="{{ this.path|url(alt=id) }}">{{ item.language }}</a> - {% endif %} - {% endfor %} - </div> - </div> - {% set download = site.get('/download') %} - <div class="pull-right"> - <a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}"> - {{ _("Download Tor Browser") }}<i class="ml-2 pt-1 fas fa-arrow-down-png"></i> - </a> - </div> - </nav> -</div> diff --git a/templates/navbar.html b/templates/navbar.html new file mode 120000 index 0000000..ea44d39 --- /dev/null +++ b/templates/navbar.html @@ -0,0 +1 @@ +../lego/templates/navbar.html \ No newline at end of file diff --git a/templates/pagenav.html b/templates/pagenav.html index 39df2ec..2a4d82b 120000 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -1 +1 @@ -../../lego/templates/pagenav.html \ No newline at end of file +../lego/templates/pagenav.html \ No newline at end of file diff --git a/templates/search.html b/templates/search.html index 6057671..66903be 120000 --- a/templates/search.html +++ b/templates/search.html @@ -1 +1 @@ -../../lego/templates/search.html \ No newline at end of file +../lego/templates/search.html \ No newline at end of file