From 4ed2b5d26db21806037dbf71f3bd09a087d1803c Mon Sep 17 00:00:00 2001 From: Fusl Date: Thu, 6 Apr 2017 05:45:48 +0200 Subject: [PATCH] Added provider logos and removed some unneccessary stuff on the probes overview --- static/css/intrace.css | 10 ++++++++-- static/index.html | 1 + static/js/intrace.js | 18 +++++++++++++----- static/js/md5.min.js | 2 ++ .../d41d8cd98f00b204e9800998ecf8427e.png | Bin 0 -> 95 bytes 5 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 static/js/md5.min.js create mode 100644 static/providerlogos/d41d8cd98f00b204e9800998ecf8427e.png diff --git a/static/css/intrace.css b/static/css/intrace.css index 949b354..a5a1c65 100644 --- a/static/css/intrace.css +++ b/static/css/intrace.css @@ -14,7 +14,7 @@ body { -moz-border-radius: 0 !important; border-radius: 0 !important; } -.toggle.fvzlg, .toggle.fvzlg .toggle-handle { +.toggle.intrace, .toggle.intrace .toggle-handle { font-family: "Lucida Console", "Monaco", "Monospace", "monospace", "Courier New", "Courier"; } .table-borderless td, .table-borderless th { @@ -44,4 +44,10 @@ pre code { .groupheader h3 { margin-top: 10px; margin-bottom: 5px; -} \ No newline at end of file + cursor: pointer; + color: #337ab7; +} +.groupheader h3:focus, .groupheader h3:hover { + color: #23527c; + text-decoration: underline; +} diff --git a/static/index.html b/static/index.html index 6c93885..2d386bd 100644 --- a/static/index.html +++ b/static/index.html @@ -24,6 +24,7 @@ + diff --git a/static/js/intrace.js b/static/js/intrace.js index 8ce8ccc..ddf2d8a 100644 --- a/static/js/intrace.js +++ b/static/js/intrace.js @@ -1,5 +1,11 @@ jQuery(document).ready(function() { jQuery('body').html('Fork me on GitHub
'); + jQuery.get('/ip', function (clientip) { + if (jQuery('#target').val() === '') { + jQuery('#target').val(clientip); + jQuery('#target').select(); + } + }); jQuery('#target').focus(); capsmatch = {}; var datahandler = function (res, end) { @@ -37,7 +43,7 @@ jQuery(document).ready(function() { size: 'mini', onstyle: 'primary', offstyle: 'default', - style: 'fvzlg', + style: 'intrace', width: 60 }; jQuery.getJSON('/config.json', function (config) { @@ -74,12 +80,12 @@ jQuery(document).ready(function() { probes[probe].city + '' + '
' + - ' (' + probes[probe].provider + ' AS' + probes[probe].asnumber + ')' + + ' ' + probes[probe].provider + ' AS' + probes[probe].asnumber + '' + '
' + '
' + '' ) : ( - (lastgroup !== probes[probe].group ? '

' + (lastgroup = probes[probe].group) + ' Toggle all

' : '') + + (lastgroup !== probes[probe].group ? '

' + (lastgroup = probes[probe].group) + '

' : '') + '
' + '
' + ' ' + @@ -87,7 +93,9 @@ jQuery(document).ready(function() { probes[probe].city + '
' + '
' + - ' (' + probes[probe].provider + ' AS' + probes[probe].asnumber + ')' + + ' ' + probes[probe].provider + ' ' + + '' + probes[probe].asnumber + ' ' + + '' + '
' + '
' + '
' @@ -116,7 +124,7 @@ jQuery(document).ready(function() { }); jQuery('.groupheader-toggle').click(function (e) { e.preventDefault(); - var group = jQuery(this).parent().parent().parent().data('group'); + var group = jQuery(this).parent().data('group'); jQuery('input[type=checkbox][data-toggle=probestoggle][data-group="' + group + '"]').bootstrapToggle(jQuery('input[type=checkbox][data-toggle=probestoggle][data-group="' + group + '"]:checked').length ? 'off' : 'on'); }); }); diff --git a/static/js/md5.min.js b/static/js/md5.min.js new file mode 100644 index 0000000..564e1e0 --- /dev/null +++ b/static/js/md5.min.js @@ -0,0 +1,2 @@ +!function(n){"use strict";function t(n,t){var r=(65535&n)+(65535&t),e=(n>>16)+(t>>16)+(r>>16);return e<<16|65535&r}function r(n,t){return n<>>32-t}function e(n,e,o,u,c,f){return t(r(t(t(e,n),t(u,f)),c),o)}function o(n,t,r,o,u,c,f){return e(t&r|~t&o,n,t,u,c,f)}function u(n,t,r,o,u,c,f){return e(t&o|r&~o,n,t,u,c,f)}function c(n,t,r,o,u,c,f){return e(t^r^o,n,t,u,c,f)}function f(n,t,r,o,u,c,f){return e(r^(t|~o),n,t,u,c,f)}function i(n,r){n[r>>5]|=128<>>9<<4)+14]=r;var e,i,a,h,d,l=1732584193,g=-271733879,v=-1732584194,m=271733878;for(e=0;e>5]>>>t%32&255);return r}function h(n){var t,r=[];for(r[(n.length>>2)-1]=void 0,t=0;t>5]|=(255&n.charCodeAt(t/8))<16&&(o=i(o,8*n.length)),r=0;r<16;r+=1)u[r]=909522486^o[r],c[r]=1549556828^o[r];return e=i(u.concat(h(t)),512+8*t.length),a(i(c.concat(e),640))}function g(n){var t,r,e="0123456789abcdef",o="";for(r=0;r>>4&15)+e.charAt(15&t);return o}function v(n){return unescape(encodeURIComponent(n))}function m(n){return d(v(n))}function p(n){return g(m(n))}function s(n,t){return l(v(n),v(t))}function C(n,t){return g(s(n,t))}function A(n,t,r){return t?r?s(t,n):C(t,n):r?m(n):p(n)}"function"==typeof define&&define.amd?define(function(){return A}):"object"==typeof module&&module.exports?module.exports=A:n.md5=A}(this); +//# sourceMappingURL=md5.min.js.map \ No newline at end of file diff --git a/static/providerlogos/d41d8cd98f00b204e9800998ecf8427e.png b/static/providerlogos/d41d8cd98f00b204e9800998ecf8427e.png new file mode 100644 index 0000000000000000000000000000000000000000..1914264c08781d1f30ee0b8482bccf44586f2dc1 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga%mF?ju0VQumF+E%TuG2$FoVOh l8)-lem#2$k2*>s01R$Gz9%CSj!PC{xWt~$(697H@6ZHT9 literal 0 HcmV?d00001