June 2019 - tor-commits - lists.torproject.org

[gettor/master] Update twisted version
by hiro＠torproject.org 20 Jun '19

20 Jun '19

commit 3cb99ad6bc159ab064ddbc6c25d38d0d329c749c Author: hiro <hiro(a)torproject.org> Date: Thu Jun 20 17:38:02 2019 +0200 Update twisted version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cbb6780..a6150bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ pydkim==0.3 pyopenssl==19.0.0 dnspython==1.16.0 validate_email==1.3 -twisted==18.9.0 +twisted==19.2.1

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 30575: Don't allow enterprise policies in Tor Browser
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit 9d582e62e32ee8143fd638744f2f5f0f49c28ca3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 7 11:49:06 2019 +0000 Bug 30575: Don't allow enterprise policies in Tor Browser --- .../enterprisepolicies/EnterprisePolicies.js | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js index 20cc33628f2a..4bab7d000ab0 100644 --- a/browser/components/enterprisepolicies/EnterprisePolicies.js +++ b/browser/components/enterprisepolicies/EnterprisePolicies.js @@ -78,20 +78,10 @@ EnterprisePoliciesManager.prototype = { _xpcom_factory: EnterprisePoliciesFactory, _initialize() { - let provider = this._chooseProvider(); - - if (!provider) { - this.status = Ci.nsIEnterprisePolicies.INACTIVE; - return; - } - - if (provider.failed) { - this.status = Ci.nsIEnterprisePolicies.FAILED; - return; - } - - this.status = Ci.nsIEnterprisePolicies.ACTIVE; - this._activatePolicies(provider.policies); + // We don't want to have any enterprise policies in Tor Browser enabled as + // those can affect proxy settings etc. See: e.g. #30575. + this.status = Ci.nsIEnterprisePolicies.INACTIVE; + return; }, _chooseProvider() {

1 0

[tor-browser-build/master] Pick up the second chemspill as well
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit 343b8bc4e9208e9b412cfb9227fa26449bc8458a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 20 14:08:48 2019 +0000 Pick up the second chemspill as well --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 9d548cd..20c5b0f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 851cc5e..b03054b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,6 @@ -Tor Browser 9.0a3 -- June 20 2019 +Tor Browser 9.0a3 -- June 24 2019 * All platforms - * Pick up fix for Mozilla's bug 1544386 + * Pick up fixes for Mozilla's bug 1544386 and 1560192 * Update NoScript to 10.6.3 * Bug 29904: NoScript blocks MP4 on higher security levels * Bug 30624+29043+29647: Prevent XSS protection from freezing the browser diff --git a/rbm.conf b/rbm.conf index 8e90615..657ce31 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0a3' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 9.0a2 project_name: tor-browser

1 0

[depictor/master] Link to the bandwidth files used by dir auths.
by tom＠torproject.org 20 Jun '19

20 Jun '19

commit d501bfe98e151d6b78c89cec16bd8d6558bd758d Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Apr 24 12:26:41 2019 -0500 Link to the bandwidth files used by dir auths. Closes #28403 --- website.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/website.py b/website.py index 9b6045a..b03298b 100755 --- a/website.py +++ b/website.py @@ -282,8 +282,7 @@ class WebsiteWriter: + "<table border=\"0\" cellpadding=\"4\" cellspacing=\"0\" summary=\"\">\n" + " <colgroup>\n" + " <col width=\"160\">\n" - + " <col width=\"230\">\n" - + " <col width=\"410\">\n" + + " <col width=\"640\">\n" + " </colgroup>\n") # XXX Should also write if the displayed consensus is out of date @@ -302,9 +301,13 @@ class WebsiteWriter: + "/tor/status-vote/current/consensus\">consensus</a> (<a href=\"http://" + authority.address + ":" + str(authority.dir_port) + "/tor/status-vote/current/consensus-microdesc\">microdesc</a>)" + " <a href=\"http://" + authority.address + ":" + str(authority.dir_port) - + "/tor/status-vote/current/authority\">vote</a></td>\n") + + "/tor/status-vote/current/authority\">vote</a>") + if dirauth_nickname in self.bandwidth_authorities: + self.site.write(" <a href=\"http://" + authority.address + ":" + str(authority.dir_port) + + "/tor/status-vote/next/bandwidth\">bandwidth vote</a>") + self.site.write("</td>\n") else: - self.site.write(" <td colspan=\"2\" class=\"oiv\">Missing entirely from consensus</td>\n") + self.site.write(" <td class=\"oiv\">Missing entirely from consensus</td>\n") if dirauth_nickname in [d.nickname.lower() for d in self.consensus.directory_authorities]: #The above structure is sufficient for getting the address & port

1 0

[depictor/master] Link to descriptors
by tom＠torproject.org 20 Jun '19

20 Jun '19

commit be09d1a8682a07ddfb54269e3001c78bd111a55c Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Apr 24 12:31:37 2019 -0500 Link to descriptors Closes #28404 --- website.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/website.py b/website.py index b03298b..6d43e6f 100755 --- a/website.py +++ b/website.py @@ -299,9 +299,11 @@ class WebsiteWriter: authority = authority[0] self.site.write(" <td><a href=\"http://" + authority.address + ":" + str(authority.dir_port) + "/tor/status-vote/current/consensus\">consensus</a> (<a href=\"http://" + authority.address - + ":" + str(authority.dir_port) + "/tor/status-vote/current/consensus-microdesc\">microdesc</a>)" - + " <a href=\"http://" + authority.address + ":" + str(authority.dir_port) + + ":" + str(authority.dir_port) + "/tor/status-vote/current/consensus-microdesc\">microdesc</a>)") + self.site.write(" <a href=\"http://" + authority.address + ":" + str(authority.dir_port) + "/tor/status-vote/current/authority\">vote</a>") + self.site.write(" <a href=\"http://" + authority.address + ":" + str(authority.dir_port) + + "/tor/server/all\">descriptors</a>") if dirauth_nickname in self.bandwidth_authorities: self.site.write(" <a href=\"http://" + authority.address + ":" + str(authority.dir_port) + "/tor/status-vote/next/bandwidth\">bandwidth vote</a>")

1 0

[depictor/master] Add bandwidth file info. Closes #29946 and #29947
by tom＠torproject.org 20 Jun '19

20 Jun '19

commit d7aca8850f4bbff25d8c6155ac094c937d680bc5 Author: Tom Ritter <tom(a)ritter.vg> Date: Thu Jun 20 07:02:34 2019 -0700 Add bandwidth file info. Closes #29946 and #29947 --- utility.py | 8 ++++++++ website.py | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/utility.py b/utility.py index c931c59..38fb47a 100755 --- a/utility.py +++ b/utility.py @@ -26,6 +26,14 @@ def get_bwauths(): global config return dict((k.lower(), v) for (k, v) in stem.descriptor.remote.get_authorities().items() if v.nickname.lower() in config['bwauths']) +# How to grab a vote or consensus with stem: +""" +import stem.descriptor.remote +authority = stem.descriptor.remote.get_authorities()['moria1'] +downloader = stem.descriptor.remote.DescriptorDownloader(fall_back_to_authority = False, document_handler = stem.descriptor.DocumentHandler.DOCUMENT) +vote = downloader.query('/tor/status-vote/current/authority.z', default_params = False, endpoints=[(authority.address, authority.dir_port)]).run()[0] +""" + downloader = stem.descriptor.remote.DescriptorDownloader( timeout = 30, fall_back_to_authority = False, diff --git a/website.py b/website.py index 6d43e6f..f035da2 100755 --- a/website.py +++ b/website.py @@ -57,6 +57,7 @@ class WebsiteWriter: self._write_protocols() self._write_bandwidth_weights() self._write_bandwidth_scanner_status(True) + self._write_bandwidth_scanner_info() self._write_fallback_directory_status(True) self._write_authority_versions() self._write_download_statistics() @@ -1071,6 +1072,46 @@ class WebsiteWriter: self.site.write("</table>\n") #----------------------------------------------------------------------------------------- + def _write_bandwidth_scanner_info(self): + """ + Write the headers and digest from the bandwidth file + """ + self.site.write("<br>\n\n\n" + + " " + + "<a name=\"bwauthinfo\">\n" + + "<h3><a href=\"#bwauthinfo\" class=\"anchor\">" + + "Bandwidth scanner information</a></h3>\n") + self.site.write("<table border=\"0\" cellpadding=\"4\" cellspacing=\"0\" summary=\"\">\n" + + " <colgroup>\n" + + " <col width=\"160\">\n" + + " <col width=\"640\">\n" + + " </colgroup>\n") + if not self.votes: + self.site.write(" <tr><td>(No votes.)</td><td></td></tr>\n") + else: + for dirauth_nickname in self.bandwidth_authorities: + if dirauth_nickname not in self.votes: + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td class=\"oiv\">Missing vote</td>\n" + + " </tr>\n") + else: + vote = self.votes[dirauth_nickname] + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td>") + for h in vote.bandwidth_file_headers: + self.site.write(h + "=" + vote.bandwidth_file_headers[h] + " ") + if h == "timestamp": + friendly = datetime.datetime.utcfromtimestamp(int(vote.bandwidth_file_headers[h])).isoformat().replace("T", " ") + self.site.write("(" + friendly + ") ") + for h in vote.bandwidth_file_digest: + self.site.write(h + "=" + vote.bandwidth_file_digest[h] + " ") + self.site.write("</td>\n" + + " </tr>\n") + self.site.write("</table>\n") + + #----------------------------------------------------------------------------------------- def _write_fallback_directory_status(self, linkToGraph): """ Write the status of the fallback directory mirrors

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-2] Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit df852fdc7f75aa7edddbaf1b54eea3484a552414 Author: Johann Hofmann <jhofmann(a)mozilla.com> Date: Wed Jun 19 21:59:18 2019 +0000 Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D35371 --HG-- extra : source : bfd88bfc61c42a09475da8749b2218f540e4592c --- browser/modules/RemotePrompt.jsm | 14 +++++++++----- toolkit/components/prompts/src/nsPrompter.js | 18 +++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/browser/modules/RemotePrompt.jsm b/browser/modules/RemotePrompt.jsm index 45755c2446fc..f94052410d5c 100644 --- a/browser/modules/RemotePrompt.jsm +++ b/browser/modules/RemotePrompt.jsm @@ -23,10 +23,14 @@ var RemotePrompt = { receiveMessage(message) { switch (message.name) { case "Prompt:Open": - if (message.data.uri) { - this.openModalWindow(message.data, message.target); - } else { + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + if (message.data.tabPrompt) { this.openTabPrompt(message.data, message.target); + } else { + let uri = (message.data.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; + this.openModalWindow(uri, message.data, message.target); } break; } @@ -90,13 +94,13 @@ var RemotePrompt = { } }, - openModalWindow(args, browser) { + openModalWindow(uri, args, browser) { let window = browser.ownerGlobal; try { PromptUtils.fireDialogEvent(window, "DOMWillOpenModalDialog", browser); let bag = PromptUtils.objectToPropBag(args); - Services.ww.openWindow(window, args.uri, "_blank", + Services.ww.openWindow(window, uri, "_blank", "centerscreen,chrome,modal,titlebar", bag); PromptUtils.propBagToObject(bag, args); diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js index bf76cd8b2078..77a65b25b100 100644 --- a/toolkit/components/prompts/src/nsPrompter.js +++ b/toolkit/components/prompts/src/nsPrompter.js @@ -430,7 +430,7 @@ function openTabPrompt(domWin, tabPrompt, args) { } } -function openRemotePrompt(domWin, args, tabPrompt) { +function openRemotePrompt(domWin, args) { let docShell = domWin.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIDocShell); let messageManager = docShell.QueryInterface(Ci.nsIInterfaceRequestor) @@ -438,7 +438,7 @@ function openRemotePrompt(domWin, args, tabPrompt) { .messageManager; let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload; - let eventDetail = Cu.cloneInto({tabPrompt, inPermitUnload}, domWin); + let eventDetail = Cu.cloneInto({tabPrompt: args.tabPrompt, inPermitUnload}, domWin); PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail); let winUtils = domWin.QueryInterface(Ci.nsIInterfaceRequestor) @@ -536,7 +536,8 @@ ModalPrompter.prototype = { if (allowTabModal && this.domWin) { if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) { - openRemotePrompt(this.domWin, args, true); + args.tabPrompt = true; + openRemotePrompt(this.domWin, args); return; } @@ -548,17 +549,16 @@ ModalPrompter.prototype = { } // If we can't do a tab modal prompt, fallback to using a window-modal dialog. - const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; - const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; - - let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; - if (Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_CONTENT) { - args.uri = uri; + args.tabPrompt = false; openRemotePrompt(this.domWin, args); return; } + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; let propBag = PromptUtils.objectToPropBag(args); openModalWindow(this.domWin, uri, propBag); PromptUtils.propBagToObject(propBag, args);

1 0

[tpo/master] Update templates symlink
by hiro＠torproject.org 20 Jun '19

20 Jun '19

commit de40c311a4cad43dd26121a0d20548e1c0dec43f Author: hiro <hiro(a)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(a)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

1 0

[tpo/master] Update submodule link
by hiro＠torproject.org 20 Jun '19

20 Jun '19

commit d93ccc84a31ca9f601e95e4446244d34188928ce Author: hiro <hiro(a)torproject.org> Date: Thu Jun 20 13:25:47 2019 +0200 Update submodule link --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 01cf3ad..d246c46 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "lego"] path = lego - url = git@git-rw.torproject.org:project/web/lego + url = https://git.torproject.org/project/web/lego.git

1 0

[tpo/master] Fix assets to use lego
by hiro＠torproject.org 20 Jun '19

20 Jun '19

commit cfac5785e12e5d650f2d14c79c10f5fb17809c00 Author: hiro <hiro(a)torproject.org> Date: Thu Jun 20 13:20:05 2019 +0200 Fix assets to use lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 7bc659e..a389bf6 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7bc659e2564b5f131e24042802d43cf7e6384713 +Subproject commit a389bf68b178ffcbd7b9005c322febf312ddbb8c

1 0