November 2017 - tor-commits - lists.torproject.org

[atlas/master] Fixes Bootstrap tooltips
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit 8f41a8677566d63a6a5ea5bd7b1afeae4e0b7f43 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sat Nov 25 16:54:54 2017 +0000 Fixes Bootstrap tooltips --- js/libs/bootstrap/bootstrap-tooltip.js | 278 --------------------------------- js/libs/bootstrap/bootstrap.min.js | 7 + js/main.js | 3 +- js/views/details/main.js | 21 ++- js/views/search/do.js | 5 +- 5 files changed, 19 insertions(+), 295 deletions(-) diff --git a/js/libs/bootstrap/bootstrap-tooltip.js b/js/libs/bootstrap/bootstrap-tooltip.js deleted file mode 100644 index 10c155f..0000000 --- a/js/libs/bootstrap/bootstrap-tooltip.js +++ /dev/null @@ -1,278 +0,0 @@ -/* =========================================================== - * bootstrap-tooltip.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - -!function( $ ) { - - "use strict" - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function ( element, options ) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function ( type, element, options ) { - var eventIn - , eventOut - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function ( options ) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) { - self.show() - } else { - self.hoverState = 'in' - setTimeout(function() { - if (self.hoverState == 'in') { - self.show() - } - }, self.options.delay.show) - } - } - - , leave: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.hide) { - self.hide() - } else { - self.hoverState = 'out' - setTimeout(function() { - if (self.hoverState == 'out') { - self.hide() - } - }, self.options.delay.hide) - } - } - - , show: function () { - var $tip - , inside - , pos - , actualWidth - , actualHeight - , placement - , tp - - if (this.hasContent() && this.enabled) { - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - inside = /in/.test(placement) - - $tip - .remove() - .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) - - pos = this.getPosition(inside) - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - // XXX this is a fix to a bug inside of firefox where the offsetWidth - // is not set on svg circle elements. - var left_fix; - if (pos.width) { - left_fix = pos.left + pos.width / 2 - actualWidth / 2; - } - else { - left_fix = pos.left - actualWidth / 2; - } - switch (inside ? placement.split(' ')[1] : placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: left_fix}; - break - case 'top': - tp = {top: pos.top - actualHeight, left: left_fix}; - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - $tip - .css(tp) - .addClass(placement) - .addClass('in') - } - } - - , setContent: function () { - var $tip = this.tip() - $tip.find('.tooltip-inner').html(this.getTitle()) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.remove() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.remove() - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - title = title.toString().replace(/(^\s*|\s*$)/, "") - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , delay: 0 - , selector: false - , placement: 'top' - , trigger: 'hover' - , title: '' - , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>' - } - -}( window.jQuery ) diff --git a/js/libs/bootstrap/bootstrap.min.js b/js/libs/bootstrap/bootstrap.min.js new file mode 100644 index 0000000..133aeec --- /dev/null +++ b/js/libs/bootstrap/bootstrap.min.js @@ -0,0 +1,7 @@ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under the MIT license + */ +if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj. handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.5",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a) {"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.5",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.pr op("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),a(c.target).is('input[type="radio"]')||a(c.target).is('input[type="checkbox"]')||c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"o bject"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.5",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),th is.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0) ),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active" ),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href" ))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.5",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(! (e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element [c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Construc tor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==type of b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.5",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h =" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",c).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element. find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.5",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignore BackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in"),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTran sitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$eleme nt.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+e).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this .$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.ap pend(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=nul l,this.inState=null,this.init("tooltip",a,b)};c.VERSION="3.3.5",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+t his.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a (b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),c.isInStateTrue()?void 0:(clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide())},c.prototype.show=fun ction(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-m<o.top?"bottom":"right"==h&&k .right+l>o.width?"left":"left"==h&&k.left-l<o.left?"right":h,f.removeClass(n).addClass(h)}var p=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(p,h);var q=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",q).emulateTransitionEnd(c.TRANSITION_DURATION):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top+=g,b.left+=h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.of fset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);return this.$element.trigger(g),g.isDefaultPrevented()?void 0:(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this)},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return th is.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=d?{top:0,left:0}:b.offset(),g={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},h=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,g,h,f)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.to p=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this. getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.5",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",t emplate:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.5",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this. scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+ b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")), +d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.5",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e. trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constru ctor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.5",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!= c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix "+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery); \ No newline at end of file diff --git a/js/main.js b/js/main.js index a7f3623..cc18403 100644 --- a/js/main.js +++ b/js/main.js @@ -11,8 +11,7 @@ require.config({ datatables: 'libs/datatables/jquery.dataTables.min', datatablest: 'libs/datatables/dataTables.TorStatus', datatablessort: 'libs/datatables/dataTables.Sorting', - bootstrap: 'https://metrics.torproject.org/js/bootstrap.min', - tooltip: 'libs/bootstrap/bootstrap-tooltip', + bootstrap: 'libs/bootstrap/bootstrap.min', datatablesbs: 'libs/datatables/dataTables.bootstrap', d3js: 'libs/d3js/d3.v3.min', jssha: 'libs/jssha/sha1', diff --git a/js/views/details/main.js b/js/views/details/main.js index 87e796e..22bbc27 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -9,7 +9,6 @@ define([ 'text!templates/details/router.html', 'text!templates/details/bridge.html', 'text!templates/details/error.html', - 'tooltip', 'd3js', 'helpers' ], function($, _, Backbone, relayModel, graphModel, @@ -54,6 +53,7 @@ define([ var xAxis = d3.svg.axis() .scale(xScale) .ticks(4) + .tickFormat(d3.time.format("%d %b %Y")) .orient("bottom"); var xAxisContainer = svg.append("g") .attr("class", "x axis") @@ -107,17 +107,8 @@ define([ .attr("d", line) .style("fill", "none"); - var datetimeFormat = function(seconds) { - var date = new Date(seconds); - return d3.time.format("%Y-%m-%d %H:%M")(date); - } - - var tooltip = d3.select("body").append("div") - .attr("class", "tooltip") - .style("opacity", 0); /* Add dots for all line values, and add tooltips. */ - var tooltipFormatter = d3.format(tooltipFormat); lineContainers.selectAll("circle") .data(function(d) { return d; }) .enter() @@ -128,11 +119,17 @@ define([ .attr("r", 3) .style("fill", "white"); - $("svg circle").tooltip({ + $("#" + g + ">svg circle").tooltip({ title: function() { var d = this.__data__; + var datetimeFormat = function(seconds) { + var date = new Date(seconds); + return d3.time.format("%Y-%m-%d %H:%M")(date); + } + var tooltipFormatter = d3.format(tooltipFormat); return datetimeFormat(d[0]) + ": " + tooltipFormatter(d[1]); - } + }, + container: 'body' }); /* Add a legend. */ diff --git a/js/views/search/do.js b/js/views/search/do.js index b5b8eee..bed2e8c 100644 --- a/js/views/search/do.js +++ b/js/views/search/do.js @@ -9,8 +9,7 @@ define([ 'datatablessort', 'helpers', 'bootstrap', - 'datatablesbs', - 'tooltip' + 'datatablesbs' ], function($, _, Backbone, resultsCollection, doSearchTemplate){ var doSearchView = Backbone.View.extend({ el: "#content", @@ -48,7 +47,7 @@ define([ "bStateSave": false, "aaSorting": [[2, "desc"]], "fnDrawCallback": function( oSettings ) { - $(".tip").tooltip(); + $(".tip").tooltip({'html':true}); } }); },

1 0

[atlas/master] Adds aggregated results table for relays grouped by country and/or AS (Fixes: #23517)
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit 5463eb8d9c3de6ddecb011da992b14d6524c3693 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 00:52:21 2017 +0000 Adds aggregated results table for relays grouped by country and/or AS (Fixes: #23517) --- css/atlas.css | 2 +- img/cc/README.flags | 2 +- img/cc/xz.png | Bin 0 -> 393 bytes index.html | 7 +-- js/collections/aggregates.js | 111 ++++++++++++++++++++++++++++++++++++++++ js/helpers.js | 1 + js/models/aggregate.js | 23 +++++++++ js/router.js | 73 +++++++++++++++++++++++--- js/views/aggregate/search.js | 47 +++++++++++++++++ js/views/search/main.js | 15 ++++++ templates/aggregate/search.html | 100 ++++++++++++++++++++++++++++++++++++ templates/search/main.html | 27 ++++++++++ 12 files changed, 397 insertions(+), 11 deletions(-) diff --git a/css/atlas.css b/css/atlas.css index 9069a55..cdbec5e 100644 --- a/css/atlas.css +++ b/css/atlas.css @@ -48,7 +48,7 @@ span.flags { background: #ff1515; } -#home-search { +#home-search, #home-aggregate-search { padding: 0; margin: 0 0 10px 0; width: 100%; diff --git a/img/cc/README.flags b/img/cc/README.flags index 7bf7691..95f81c4 100644 --- a/img/cc/README.flags +++ b/img/cc/README.flags @@ -8,7 +8,7 @@ To update these flags: * git clone https://github.com/gosquared/flags * cd flags; make * cp flags/flags-iso/shiny/16/* $RELAYSEARCH/img/cc/ - * cd $RELAYSEARCH/img/cc/; rename 'y/A-Z/a-z/' *.png + * cd $RELAYSEARCH/img/cc/; rename 'y/A-Z/a-z/' *.png; cp _unknown.png xz.png The flags are made available under the MIT license: diff --git a/img/cc/xz.png b/img/cc/xz.png new file mode 100644 index 0000000..44a6fc9 Binary files /dev/null and b/img/cc/xz.png differ diff --git a/index.html b/index.html index 8648eb5..408a94a 100644 --- a/index.html +++ b/index.html @@ -143,14 +143,15 @@ <div class="input-group add-on"> <input class="form-control" placeholder="Search" name="secondary-search-query" id="secondary-search-query" type="text" autocorrect="off" autocapitalize="none"> <div class="input-group-btn"> - <button class="btn btn-secondary" id="secondary-search-clear" type="button"><i class="glyphicon glyphicon-remove-circle"></i></span> - <button class="btn btn-primary" id="secondary-search-submit" type="submit"><i class="glyphicon glyphicon-search"></i></button> + <button class="btn btn-danger" id="secondary-search-clear" type="button" title="Clear Search Query"><i class="glyphicon glyphicon-remove-circle"></i></span> + <button class="btn btn-primary" id="secondary-search-submit" type="submit" title="Perform Search"><i class="glyphicon glyphicon-search"></i></button> + <button class="btn btn-secondary" id="secondary-search-aggregate" type="button" title="Perform Aggregated Search"><i class="fa fa-compress"></i></button> </div> </div> </form> <h1>Relay Search</h1> <div class="progress progress-info progress-striped active"> - <div class="bar"></div> + <div class="progress-bar"></div> </div> <div id="content"> <noscript> diff --git a/js/collections/aggregates.js b/js/collections/aggregates.js new file mode 100644 index 0000000..1161ff4 --- /dev/null +++ b/js/collections/aggregates.js @@ -0,0 +1,111 @@ +// ~ collections/aggregates ~ +define([ + 'jquery', + 'underscore', + 'backbone', + 'models/aggregate' +], function($, _, Backbone, aggregateModel){ + var aggregatesCollection = Backbone.Collection.extend({ + model: aggregateModel, + baseurl: 'https://onionoo.torproject.org/details?running=true&type=relay&fields=count…', + url: '', + aType: 'cc', + lookup: function(options) { + var success = options.success; + var error = options.error; + var err = -1; + var collection = this; + options.success = $.getJSON(this.url, function(response) { + checkIfDataIsUpToDate(options.success.getResponseHeader("Last-Modified")); + this.fresh_until = response.fresh_until; + this.valid_after = response.valid_after; + var aggregates = {}; + var relaysPublished = response.relays_published; + var bridgesPublished = response.bridges_published; + options.error = function(options) { + error(options.error, collection, options); + } + _.each(response.relays, function(relay) { + /* If a relay country is unknown, use XZ as the country code. + This code will never be assigned for use with ISO 3166-1 and is "user-assigned". + Fun fact: UN/LOCODE assigns XZ to represent installations in international waters. */ + relay.country = ((typeof relay.country) == "undefined") ? "xz" : relay.country; + relay.as_number = ((typeof relay.as_number) == "undefined") ? 0 : relay.as_number; + if (relay.as_number == 0) relay.as_name = "Unknown"; + + var ccAggregate = false; + var asAggregate = false; + + if (collection.aType == "all") { + aggregateKey = "zz"; // A user-assigned ISO 3166-1 code, but really just a static key + } else if (collection.aType == "cc") { + aggregateKey = relay.country; + ccAggregate = true; + } else if (collection.aType == "as") { + aggregateKey = relay.as_number; + asAggregate = true; + } else { + aggregateKey = relay.country + "/" + relay.as_number; + ccAggregate = asAggregate = true; + } + + if (!(aggregateKey in aggregates)) { + aggregates[aggregateKey] = new aggregateModel; + if (ccAggregate) { + aggregates[aggregateKey].country = relay.country; + } else { + aggregates[aggregateKey].country = new Set(); + } + if (asAggregate) { + aggregates[aggregateKey].as = relay.as_number; + } else { + aggregates[aggregateKey].as = new Set(); + } + aggregates[aggregateKey].as_name = relay.as_name; + } + + if (!ccAggregate) { + if (relay.country !== "xz") aggregates[aggregateKey].country.add(relay.country); + } + if (!asAggregate) { + if (relay.as_number !== 0) aggregates[aggregateKey].as.add(relay.as_number); + } + + aggregates[aggregateKey].relays++; + if ((typeof relay.guard_probability) !== "undefined") aggregates[aggregateKey].guard_probability += relay.guard_probability; + if ((typeof relay.middle_probability) !== "undefined") aggregates[aggregateKey].middle_probability += relay.middle_probability; + if ((typeof relay.exit_probability) !== "undefined") aggregates[aggregateKey].exit_probability += relay.exit_probability; + if ((typeof relay.consensus_weight) !== "undefined") aggregates[aggregateKey].consensus_weight += relay.consensus_weight; + if ((typeof relay.consensus_weight_fraction) !== "undefined") aggregates[aggregateKey].consensus_weight_fraction += relay.consensus_weight_fraction; + if ((typeof relay.advertised_bandwidth) !== "undefined") aggregates[aggregateKey].advertised_bandwidth += relay.advertised_bandwidth; + _.each(relay.flags, function(flag) { + if (flag == "Guard") aggregates[aggregateKey].guards++; + if (flag == "Exit") aggregates[aggregateKey].exits++; + }); + }); + if (Object.keys(aggregates).length == 0) { + error(0); + return false; + } + _.each(Object.values(aggregates), function(aggregate) { + if ((typeof aggregate.as) !== "string") { + if (aggregate.as.size == 1) aggregate.as = Array.from(aggregate.as.values())[0]; + } + if ((typeof aggregate.country) !== "string") { + if (aggregate.country.size == 1) aggregate.country = Array.from(aggregate.country.values())[0]; + } + }); + collection[options.add ? 'add' : 'reset'](Object.values(aggregates), options); + success(err, relaysPublished, bridgesPublished); + }).fail(function(jqXHR, textStatus, errorThrown) { + if(jqXHR.statusText == "error") { + error(2); + } else { + error(3); + } + }); + } + }); + return aggregatesCollection; +}); + diff --git a/js/helpers.js b/js/helpers.js index 1037bb0..214db67 100644 --- a/js/helpers.js +++ b/js/helpers.js @@ -241,6 +241,7 @@ var CountryCodes = { "vu" : "Vanuatu", "wf" : "Wallis and Futuna", "ws" : "Samoa", + "xz" : "Unknown", "ye" : "Yemen", "yt" : "Mayotte", "za" : "South Africa", diff --git a/js/models/aggregate.js b/js/models/aggregate.js new file mode 100644 index 0000000..0b85050 --- /dev/null +++ b/js/models/aggregate.js @@ -0,0 +1,23 @@ +// ~ models/aggregateModel ~ +define([ + 'jquery', + 'underscore', + 'backbone', + 'helpers' +], function($, _, Backbone){ + var aggregateModel = Backbone.Model.extend({ + country: null, + as: null, + as_name: null, + guard_probability: 0, + middle_probability: 0, + exit_probability: 0, + advertised_bandwidth: 0, + consensus_weight: 0, + consensus_weight_fraction: 0, + relays: 0, + guards: 0, + exits: 0 + }); + return aggregateModel; +}); diff --git a/js/router.js b/js/router.js index 8b6034b..118c094 100644 --- a/js/router.js +++ b/js/router.js @@ -6,8 +6,9 @@ define([ 'views/details/main', 'views/search/main', 'views/search/do', + 'views/aggregate/search', 'jssha' -], function($, _, Backbone, mainDetailsView, mainSearchView, doSearchView, jsSHA){ +], function($, _, Backbone, mainDetailsView, mainSearchView, doSearchView, aggregateSearchView, jsSHA){ var AppRouter = Backbone.Router.extend({ routes: { // Define the routes for the actions in Atlas @@ -17,6 +18,8 @@ define([ 'search/': 'doSearch', 'top10': 'showTopRelays', 'toprelays': 'showTopRelays', + 'aggregate(/:aType)(/:query)': 'aggregateSearch', + 'aggregate(/:aType)/': 'emptyAggregateSearch', // Default '*actions': 'defaultAction' }, @@ -39,7 +42,7 @@ define([ mainDetailsView.model.fingerprint = this.hashFingerprint(fingerprint); mainDetailsView.model.lookup({ success: function(relay) { - mainDetailsView.render(); + mainDetailsView.render(); $(".progress").hide(); $("#content").show(); $(".breadcrumb").html("<li><a href=\"https://metrics.torproject.org/\">Home</a></li><li><a href=\"https://metrics.torproject.org/services.html\">Services</a></li><li><a href=\"#\">Relay Search</a></li><li class=\"active\">Details for " + relay.get('nickname') + "</li>"); @@ -55,12 +58,63 @@ define([ } }); }, + // Empty aggregation query + emptyAggregateSearch: function() { + $(".breadcrumb").html("<li><a href=\"https://metrics.torproject.org/\">Home</a></li><li><a href=\"https://metrics.torproject.org/services.html\">Services</a></li><li><a href=\"#\">Relay Search</a></li><li class=\"active\">Error</li>"); + $("#secondary-search").show(); + $("#secondary-search-query").val(""); + + $("#content").hide(); + $(".progress").show(); + doSearchView.error = 5; + doSearchView.renderError(); + $(".progress").hide(); + $("#content").show(); + + }, + // Perform a countries aggregation + aggregateSearch: function(aType, query){ + $(".breadcrumb").html("<li><a href=\"https://metrics.torproject.org/\">Home</a></li><li><a href=\"https://metrics.torproject.org/services.html\">Services</a></li><li><a href=\"#\">Relay Search</a></li><li class=\"active\">Aggregated search" + ((query) ? " for " + query : "") + "</li>"); + $("#secondary-search").show(); + + $("#content").hide(); + $(".progress").show(); + + aggregateSearchView.collection.aType = (aType) ? aType : "all"; + + if (query) { + query = query.trim(); + $("#secondary-search-query").val(query); + aggregateSearchView.collection.url = + aggregateSearchView.collection.baseurl + "&search=" + this.hashFingerprint(query); + } else { + aggregateSearchView.collection.url = + aggregateSearchView.collection.baseurl; + query = ""; + } + aggregateSearchView.collection.lookup({ + success: function(err, relaysPublished, bridgesPublished){ + aggregateSearchView.error = err; + aggregateSearchView.relaysPublished = relaysPublished; + aggregateSearchView.bridgesPublished = bridgesPublished; + aggregateSearchView.render(query); + $("#search-title").text("Aggregated results" + ((query) ? " for " + query : "")); + $(".progress").hide(); + $("#content").show(); + }, + error: function(err){ + aggregateSearchView.error = err; + aggregateSearchView.renderError(); + $(".progress").hide(); + $("#content").show(); + } + }); + }, // Perform a search on Atlas doSearch: function(query){ $(".breadcrumb").html("<li><a href=\"https://metrics.torproject.org/\">Home</a></li><li><a href=\"https://metrics.torproject.org/services.html\">Services</a></li><li><a href=\"#\">Relay Search</a></li><li class=\"active\">Search for " + query + "</li>"); $("#secondary-search").show(); - $("#secondary-search-query").val(query); $("#content").hide(); $(".progress").show(); @@ -71,9 +125,11 @@ define([ $(".progress").hide(); $("#content").show(); } else { - doSearchView.collection.url = - doSearchView.collection.baseurl + this.hashFingerprint(query); - doSearchView.collection.lookup({ + query = query.trim(); + $("#secondary-search-query").val(query); + doSearchView.collection.url = + doSearchView.collection.baseurl + this.hashFingerprint(query); + doSearchView.collection.lookup({ success: function(err, relaysPublished, bridgesPublished){ doSearchView.relays = doSearchView.collection.models; // Redirect to the details page when there is exactly one @@ -153,6 +209,11 @@ define([ return false; }); + $("#secondary-search-aggregate").bind('click', function(){ + document.location = "#aggregate/all/"+encodeURI($('#secondary-search-query').val()); + return false; + }); + $("#secondary-search-clear").bind('click', function(){ $("#secondary-search-query").val(""); return false; diff --git a/js/views/aggregate/search.js b/js/views/aggregate/search.js new file mode 100644 index 0000000..d189908 --- /dev/null +++ b/js/views/aggregate/search.js @@ -0,0 +1,47 @@ +// ~ views/search/do ~ +define([ + 'jquery', + 'underscore', + 'backbone', + 'collections/aggregates', + 'text!templates/aggregate/search.html', + 'datatables', + 'datatablessort', + 'helpers', + 'bootstrap', + 'datatablesbs' +], function($, _, Backbone, aggregatesCollection, aggregateSearchTemplate){ + var doCountriesView = Backbone.View.extend({ + el: "#content", + initialize: function() { + this.collection = new aggregatesCollection; + }, + render: function(query){ + document.title = "Relay Search"; + var compiledTemplate = _.template(aggregateSearchTemplate) + this.$el.html(compiledTemplate({query: query, + aggregates: this.collection.models, + countries: CountryCodes, + error: this.error, + relaysPublished: this.relaysPublished, + bridgesPublished: this.bridgesPublished})); + + // This creates the table using DataTables + //loadSortingExtensions(); + var oTable = $('#torstatus_results').dataTable({ + "sDom": "<\"top\"l>rt<\"bottom\"ip><\"clear\">", + "bStateSave": false, + "aaSorting": [[2, "desc"]], + "fnDrawCallback": function( oSettings ) { + $(".tip").tooltip({'html': true}); + } + }); + }, + renderError: function(){ + var compiledTemplate = _.template(aggregateSearchTemplate); + this.$el.html(compiledTemplate({aggregates: null, error: this.error, countries: null})); + } + }); + return new doCountriesView; +}); + diff --git a/js/views/search/main.js b/js/views/search/main.js index 7bf97b1..6eedbe2 100644 --- a/js/views/search/main.js +++ b/js/views/search/main.js @@ -28,6 +28,21 @@ define([ document.location = "#search/"+encodeURI($('#query').val()); return false; }); + + $("#do-aggregate").bind('click', function(){ + document.location = "#aggregate/all/"+encodeURI($('#aggregated-query').val()); + return false; + }); + + $("#do-full-aggregation").bind('click', function(){ + document.location = "#aggregate/all"; + return false; + }); + + $("#home-aggregate-search").bind('submit', function(){ + document.location = "#aggregate/all/"+encodeURI($('#aggregated-query').val()); + return false; + }); } }); return new mainSearchView; diff --git a/templates/aggregate/search.html b/templates/aggregate/search.html new file mode 100644 index 0000000..34db02c --- /dev/null +++ b/templates/aggregate/search.html @@ -0,0 +1,100 @@ + +<h2 id="search-title"></h2> + +<div class="results_box"> +<% if(!aggregates) { %> + <% if(error == 0) { %> + <div class="alert alert-info"> + <strong>No Results found!</strong><p> + No Tor relays matched your query :(</p> + <p><a href="#">Return to home page</a></p> + </div> + <% } else if (error == 2) { %> + <div class="alert alert-error"> + <strong>Backend error!</strong> + <p>Relay Search is unable to get a response from its backend server. This + probably means that the backend server is unavailable right now. This + can also happen, however, if you did not format your query correctly. + Please have a look at <a href="#about">the About page</a> that explains + what type of search queries are supported by Relay Search.</p> + </div> + <% } else if (error == 3) { %> + <div class="alert alert-error"> + <strong>JavaScript Error!</strong><p>There is a problem with your + javascript environment, you may have noscript enabled on the remote + onionoo backend. Try temporarily allowing noscript to connect to the + backend IP address. If the problem persits consult <a + href="https://trac.torproject.org/">the bugtracker.</a></p> + </div> + <% } else if (error == 5) { %> + <div class="alert alert-error"> + <strong>No query submitted!</strong> + <p>The search query was found to be empty, which is not supported. You + must enter a search query in order to generate results. Please have a + look at <a href="#about">the About page</a> that explains what type of + search queries are supported by Relay Search.</p> + </div> + <% } %> +<% } else { %> + +<table class="table table-hover table-striped" id="torstatus_results"> + <thead> + <tr> + <th>Country</sup></th> + <th>Autonomous System</th> + <th>Consensus Weight</th> + <th>Advertised Bandwidth</th> + <th>Guard Probability</th> + <th>Middle Probability</th> + <th>Exit Probability</th> + <th>Relays</th> + <th>Guard</th> + <th>Exit</th> + </tr> + </thead> + <tbody> + +<% _.each(aggregates, function(aggregate) { %> + <tr> + <td> + <% if ((typeof aggregate.country) == "string") { %> + <a href="#search/<%= (query) ? query + " " : "" %><% if (query.indexOf("country:") == -1) { %>country:<%= aggregate.country %><% } %>"><img class="inline country" src="img/cc/<%= aggregate.country %>.png"> <%= countries[aggregate.country] %></a> + <% } else { %> + <% if ((typeof aggregate.as) == "string") { %> + (<a href="#aggregate/ascc/<%= (query) ? query + " " : "" %><% if (query.indexOf("as:") == -1) { %>as:<%= aggregate.as %><% } %>"><%= aggregate.country.size %> distinct</a>) + <% } else { %> + (<a href="#aggregate/cc<%= (query) ? "/" + query : "" %>"><%= aggregate.country.size %> distinct</a>) + <% } %> + <% } %> + </td> + <td> + <% if ((typeof aggregate.as) == "string") { %> + <a href="#search/<%= (query) ? query + " " : "" %><% if (query.indexOf("as:") == -1) { %>as:<%= aggregate.as %><% } %>"><%= aggregate.as_name %> (<%= aggregate.as %>)</a> + <% } else { %> + <% if ((typeof aggregate.country) == "string") { %> + (<a href="#aggregate/ascc/<%= (query) ? query + " " : "" %><% if (query.indexOf("country:") == -1) { %>country:<%= aggregate.country %><% } %>"><%= aggregate.as.size %> distinct</a>) + <% } else { %> + (<a href="#aggregate/as<%= (query) ? "/" + query : "" %>"><%= aggregate.as.size %> distinct</a>) + <% } %> + <% } %> + </td> + <td data-order="<%= aggregate.consensus_weight_fraction %>"><span class="tip" title="<%= aggregate.consensus_weight %>"><%= (aggregate.consensus_weight_fraction * 100).toFixed(4) %>%</span></td> + <td data-order="<%= aggregate.advertised_bandwidth %>"><%= hrBandwidth(aggregate.advertised_bandwidth) %></span></td> + <td data-order="<%= aggregate.guard_probability %>"><%= (aggregate.guard_probability * 100).toFixed(4) %>%</td> + <td data-order="<%= aggregate.middle_probability %>"><%= (aggregate.middle_probability * 100).toFixed(4) %>%</td> + <td data-order="<%= aggregate.exit_probability %>"><%= (aggregate.exit_probability * 100).toFixed(4) %>%</td> + <td><%= aggregate.relays %></td> + <td><%= aggregate.guards %></td> + <td><%= aggregate.exits %></td> + </tr> +<% }); %> +</tbody> +</table> + <p>The aggregated search tool displays aggregated data about relays in the +Tor network. It provides insight into diversity in the network and the +probabilities of using relays in a particular country or AS as a guard, middle +or exit relay. The results are restricted to only relays that were running at +the last time the relays data was updated and do not include bridge data.</p> +<p>Information for relays was published: <%= relaysPublished %>.<p> +<% } %> +</div> diff --git a/templates/search/main.html b/templates/search/main.html index d5f6d6d..14a4916 100644 --- a/templates/search/main.html +++ b/templates/search/main.html @@ -1,3 +1,11 @@ +<ul class="nav nav-tabs"> + <li id="main-search-tab" class="search-tabs active"><a onclick="$('.search').hide();$('#main-search-tab-content').fadeIn();$('.search-tabs').removeClass('active');$('#main-search-tab').addClass('active');">Simple Search</a></li> + <li id="aggregated-search-tab" class="search-tabs"><a onclick="$('.search').hide();$('#aggregated-search-tab-content').fadeIn();$('.search-tabs').removeClass('active');$('#aggregated-search-tab').addClass('active');">Aggregated Search</a></li> +</ul> + +<div class="tab-content" id="search-tab-content"> + <div id="main-search-tab-content" class="search tab-pane active"> + <p>The relay search tool displays data about single relays and bridges in the Tor network. It provides useful information on how relays are configured along with graphs about their past.</p> @@ -7,6 +15,24 @@ with graphs about their past.</p> <span class="input-group-btn"><button id="do-search" class="btn btn-primary" type="button">Search</button><button class="btn btn-secondary" type="button" id="do-top-relays">Top Relays</button></span> </div> </form> +</div> + + <div id="aggregated-search-tab-content" class="search tab-pane"> + + <p>The aggregated search tool displays aggregated data about relays in the +Tor network. It provides insight into diversity in the network and the +probabilities of using relays in a particular country or AS as a guard, middle +or exit relay. The results are restricted to only currently running relays and +do not include bridge data.</p> + <form id="home-aggregate-search"> + <div class="input-group"> + <input class="search-query form-control" id="aggregated-query" placeholder="Query" type="text" autocorrect="off" autocapitalize="none"> + <span class="input-group-btn"><button id="do-aggregate" class="btn btn-primary" type="button">Aggregated Search</button><button class="btn btn-secondary" type="button" id="do-full-aggregation">Entire Network</button></span> + </div> + </form> + </div> +</div> + <div class="well"> <p>You can search for Tor relays and bridges by using keywords. In particular, this tool enables you to search for (partial) nicknames (e.g., @@ -25,3 +51,4 @@ Tor data directory. On Debian systems, this is in <code>/var/lib/tor</code> but may be in another location on your system. The location is specified as <code>DataDirectory</code> in your <code>torrc</code>.</p> </div> +

1 0

[atlas/master] Make exit_address IPs RelaySearch URLs (Fixes: #24395)
by irl＠torproject.org 25 Nov '17

25 Nov '17

commit eeb348463d25bc9872692e39b7c28599bb999cf3 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sat Nov 25 20:32:29 2017 +0000 Make exit_address IPs RelaySearch URLs (Fixes: #24395) --- templates/details/router.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/details/router.html b/templates/details/router.html index e646937..4b11519 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -30,7 +30,15 @@ <dd><%= relay.get('dir_address') ? relay.get('dir_address') : 'none' %></dd> <dt><span class="tip" title="Addresses that the relay used to exit to the Internet in the past 24 hours. <em>Only lists addresses that are different from the OR addresses.</em>">Exit Addresses</span></dt> - <dd><%= relay.get('exit_addresses') ? relay.get('exit_addresses') : 'none' %></dd> + <dd> + <% if (relay.get('exit_addresses')) { %> + <% _.each(relay.get('exit_addresses'), function(exit_address) { %> + <a href="#search/<%= exit_address %>"><%= exit_address %></a><br> + <% }); %> + <% } else { %> + none + <% } %> + </dd> <dt> <span class="tip" title="The volume of traffic, both incoming and outgoing, that the relay is willing to sustain, as configured by the operator and claimed to be observed from recent data transfers.">Advertised Bandwidth</span>

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 25 Nov '17

25 Nov '17

commit 76aa96c85b4e793493e953e8e3db81bfacb41932 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 25 12:45:21 2017 +0000 Update translations for torcheck_completed --- bn_BD/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bn_BD/torcheck.po b/bn_BD/torcheck.po index 5962740c6..3707889c2 100644 --- a/bn_BD/torcheck.po +++ b/bn_BD/torcheck.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2017-11-25 12:15+0000\n" +"PO-Revision-Date: 2017-11-25 12:19+0000\n" "Last-Translator: Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/otf/torproject/language/bn_BD/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 25 Nov '17

25 Nov '17

commit b9ee17f5b8767c1fec76e671796491006b249069 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 25 12:45:16 2017 +0000 Update translations for torcheck --- bn_BD/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bn_BD/torcheck.po b/bn_BD/torcheck.po index 5962740c6..3707889c2 100644 --- a/bn_BD/torcheck.po +++ b/bn_BD/torcheck.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2017-11-25 12:15+0000\n" +"PO-Revision-Date: 2017-11-25 12:19+0000\n" "Last-Translator: Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/otf/torproject/language/bn_BD/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 25 Nov '17

25 Nov '17

commit 20c656da569dc57053fa0356614fdccb64631c76 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 25 12:16:59 2017 +0000 Update translations for tor-launcher-network-settings --- tr/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd index 0be270163..53ce73b80 100644 --- a/tr/network-settings.dtd +++ b/tr/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Ağı Ayarları"> <!ENTITY torsettings.wizard.title.default "Tor'a bağlan"> <!ENTITY torsettings.wizard.title.configure "Tor ağı ayarları"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.connecting "Bir Bağlantı kuruluyor">  <!ENTITY torlauncher.localePicker.title "Tor Browser Dili"> @@ -39,8 +39,8 @@ <!ENTITY torsettings.firewall.checkbox "Bu bilgisayar yalnız belirli bağlantı noktalarına bağlanmaya izin veren bir güvenlik duvarı kullanıyor"> <!ENTITY torsettings.firewall.allowedPorts "İzin Verilen Bağlantı Noktaları:"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.default "Bir dahili köprü seç"> +<!ENTITY torsettings.useBridges.default.placeholder "bir köprü seç"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 25 Nov '17

25 Nov '17

commit aeee6d1239ee0fa08354c0666be16c7e01c6bc3e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 25 12:15:23 2017 +0000 Update translations for torcheck_completed --- bn_BD/torcheck.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bn_BD/torcheck.po b/bn_BD/torcheck.po index 8c7b72e81..5962740c6 100644 --- a/bn_BD/torcheck.po +++ b/bn_BD/torcheck.po @@ -2,13 +2,14 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# Al Shahrior <shahrior3814(a)gmail.com>, 2017 +# Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>, 2017 +# Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2017-11-18 16:47+0000\n" -"Last-Translator: Al Shahrior <shahrior3814(a)gmail.com>\n" +"PO-Revision-Date: 2017-11-25 12:15+0000\n" +"Last-Translator: Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/otf/torproject/language/bn_BD/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "টর ব্যবহার সম্পর্কে আরো তথ্য জন্য <a href=\"https://www.torproject.org/\">টর ওয়েবসাইট</a> পড়ুন দয়া করে নিরাপদে সম্পরকে পড়ুন। আপনি এখন নিরাপদে ইন্টারনেট ব্রাউজ করতে পারবেন।" +msgstr "টর ব্যবহার সম্পর্কে আরো তথ্যর জন্য <a href=\"https://www.torproject.org/\">টর ওয়েবসাইট</a> পড়ুন দয়া করে নিরাপদে সম্পরকে পড়ুন। আপনি এখন নিরাপদে ইন্টারনেট ব্রাউজ করতে পারবেন।" msgid "There is a security update available for Tor Browser." msgstr "টর ব্রাউজারের জন্য একটি নিরাপত্তা আপডেট আছে।"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 25 Nov '17

25 Nov '17

commit b32a301fbeff3f005d481202b02e7c99893a5a0e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 25 12:15:15 2017 +0000 Update translations for torcheck --- bn_BD/torcheck.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bn_BD/torcheck.po b/bn_BD/torcheck.po index 8c7b72e81..5962740c6 100644 --- a/bn_BD/torcheck.po +++ b/bn_BD/torcheck.po @@ -2,13 +2,14 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# Al Shahrior <shahrior3814(a)gmail.com>, 2017 +# Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>, 2017 +# Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2017-11-18 16:47+0000\n" -"Last-Translator: Al Shahrior <shahrior3814(a)gmail.com>\n" +"PO-Revision-Date: 2017-11-25 12:15+0000\n" +"Last-Translator: Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/otf/torproject/language/bn_BD/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "টর ব্যবহার সম্পর্কে আরো তথ্য জন্য <a href=\"https://www.torproject.org/\">টর ওয়েবসাইট</a> পড়ুন দয়া করে নিরাপদে সম্পরকে পড়ুন। আপনি এখন নিরাপদে ইন্টারনেট ব্রাউজ করতে পারবেন।" +msgstr "টর ব্যবহার সম্পর্কে আরো তথ্যর জন্য <a href=\"https://www.torproject.org/\">টর ওয়েবসাইট</a> পড়ুন দয়া করে নিরাপদে সম্পরকে পড়ুন। আপনি এখন নিরাপদে ইন্টারনেট ব্রাউজ করতে পারবেন।" msgid "There is a security update available for Tor Browser." msgstr "টর ব্রাউজারের জন্য একটি নিরাপত্তা আপডেট আছে।"

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 24 Nov '17

24 Nov '17

commit e7a511c5faeabf5a9aee4db8dd470625f69ba07f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 24 17:18:54 2017 +0000 Update translations for tails-openpgp-applet_completed --- nl/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/openpgp-applet.pot b/nl/openpgp-applet.pot index edbde2578..4aa38c6df 100644 --- a/nl/openpgp-applet.pot +++ b/nl/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-22 17:51+0000\n" +"PO-Revision-Date: 2017-11-24 17:02+0000\n" "Last-Translator: Pieter Waegeman <github(a)tijg.be>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 24 Nov '17

24 Nov '17

commit 7ed24e58d4dfcaa0dc9c9f77f495817dda9626fe Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 24 17:18:49 2017 +0000 Update translations for tails-openpgp-applet --- nl/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/openpgp-applet.pot b/nl/openpgp-applet.pot index edbde2578..4aa38c6df 100644 --- a/nl/openpgp-applet.pot +++ b/nl/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-22 17:51+0000\n" +"PO-Revision-Date: 2017-11-24 17:02+0000\n" "Last-Translator: Pieter Waegeman <github(a)tijg.be>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n"

1 0