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

[atlas/master] Use the default IPv6 exit policy when it is empty
by irl＠torproject.org 16 Apr '17

16 Apr '17

commit 14de81984189ca24847cf6621ed25befa0dc7798 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sun Apr 16 11:19:48 2017 +0000 Use the default IPv6 exit policy when it is empty According to the Tor directory protocol, a missing "ipv6-policy" line is equivalent to "ipv6-policy reject 1-65535". Closes #21743. --- templates/details/router.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/details/router.html b/templates/details/router.html index f582b01..603282a 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -48,7 +48,7 @@ <pre class="pre-scrollable">reject<% _.each(relay.get('exit_policy_v6_summary')['reject'], function(ports) { %><br> <%= $.trim(ports) %><% });} %></pre> <% if (relay.get('exit_policy_v6_summary') == null) { %> - <pre class="pre-scrollable">none defined</pre> + <pre class="pre-scrollable">reject<br> 1-65535</pre> <% } %> </dd> <dt><span class="tip" title="Policy of exit connections that the relay is going to accept or reject." data-original-title="Exit policy">Exit Policy</span></dt>

1 0

[tor-browser-build/master] Fix tor-browser.git branch for nightly build
by boklm＠torproject.org 15 Apr '17

15 Apr '17

commit 8abc7fb0e05c8470c55f38a4b2142d2a1949cc36 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Apr 15 22:26:07 2017 +0200 Fix tor-browser.git branch for nightly build --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 408852f..14c1cd5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -22,7 +22,7 @@ var: targets: nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0

[atlas/master] Replace the loading icon with a progress bar
by irl＠torproject.org 15 Apr '17

15 Apr '17

commit 4326332ba7c60de2b9a15e49bf8638a045ef6612 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Mar 3 11:45:29 2017 +0000 Replace the loading icon with a progress bar The progress bar is built with CSS which scales better than an animated loading GIF. Closes #21623. --- css/style.css | 12 +++++++----- img/loader.gif | Bin 1928 -> 0 bytes img/onion-loader.gif | Bin 22695 -> 0 bytes img/tor-loading.gif | Bin 142883 -> 0 bytes index.html | 4 ++-- js/router.js | 24 ++++++++++++------------ 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/css/style.css b/css/style.css index 46591f9..f368dbc 100644 --- a/css/style.css +++ b/css/style.css @@ -38,11 +38,13 @@ } -#loading { - width: 24px; - margin: 0 auto; - padding-top: 50px; - padding-bottom: 100px; +.progress { + width: 50%; + margin: 100px auto; +} + +.progress .bar { + width: 50%; } .container #content { diff --git a/img/loader.gif b/img/loader.gif deleted file mode 100644 index 521a291..0000000 Binary files a/img/loader.gif and /dev/null differ diff --git a/img/onion-loader.gif b/img/onion-loader.gif deleted file mode 100644 index 4527225..0000000 Binary files a/img/onion-loader.gif and /dev/null differ diff --git a/img/tor-loading.gif b/img/tor-loading.gif deleted file mode 100644 index 0111fb8..0000000 Binary files a/img/tor-loading.gif and /dev/null differ diff --git a/index.html b/index.html index 9ba5f35..47d635a 100644 --- a/index.html +++ b/index.html @@ -57,8 +57,8 @@ </div> <div class="container"> - <div id="loading" style="display: none"> - <img src="img/loader.gif" alt="Loading content" /> + <div class="progress progress-info progress-striped active"> + <div class="bar"></div> </div> <div id="content"> <noscript> diff --git a/js/router.js b/js/router.js index 1a54f2d..080a750 100644 --- a/js/router.js +++ b/js/router.js @@ -34,19 +34,19 @@ define([ $("#about").removeClass("active"); $("#content").hide(); - $("#loading").show(); + $(".progress").show(); mainDetailsView.model.fingerprint = this.hashFingerprint(fingerprint); mainDetailsView.model.lookup({ success: function(relay) { mainDetailsView.render(); - $("#loading").hide(); + $(".progress").hide(); $("#content").show(); }, error: function() { mainDetailsView.error(); - $("#loading").hide(); + $(".progress").hide(); $("#content").show(); } }); @@ -58,13 +58,13 @@ define([ $("#about").removeClass("active"); $("#content").hide(); - $("#loading").show(); + $(".progress").show(); $("#nav-search").val(query); if (query == "") { doSearchView.error = 5; doSearchView.renderError(); - $("#loading").hide(); + $(".progress").hide(); $("#content").show(); } else { doSearchView.collection.url = @@ -83,14 +83,14 @@ define([ doSearchView.error = err; doSearchView.render(query); $("#search-title").text(query); - $("#loading").hide(); + $(".progress").hide(); $("#content").show(); }, error: function(err){ doSearchView.error = err; doSearchView.renderError(); - $("#loading").hide(); + $(".progress").hide(); $("#content").show(); } }); @@ -101,7 +101,7 @@ define([ $("#about").removeClass("active"); $("#content").hide(); - $("#loading").show(); + $(".progress").show(); doSearchView.collection.url = "https://onionoo.torproject.org/summary?type=relay&order=-consensus_weight&l…"; doSearchView.collection.lookup({ @@ -109,14 +109,14 @@ define([ doSearchView.relays = doSearchView.collection.models; doSearchView.render(""); $("#search-title").text("Top 10 Relays by Consensus Weight"); - $("#loading").hide(); + $(".progress").hide(); $("#content").show(); }, error: function(erno){ doSearchView.error = erno; doSearchView.renderError(); - $("#loading").hide(); + $(".progress").hide(); $("#content").show(); } }); @@ -128,7 +128,7 @@ define([ aboutView.render(); - $("#loading").hide(); + $(".progress").hide(); $("#content").show(); }, @@ -139,7 +139,7 @@ define([ mainSearchView.render(); - $("#loading").hide(); + $(".progress").hide(); $("#content").show(); }

1 0

[atlas/master] Refactor the loading content state transitions
by irl＠torproject.org 15 Apr '17

15 Apr '17

commit fbed2dfd7ac33e592f7c2e64e754af9bdfb2717d Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Mar 3 10:52:18 2017 +0000 Refactor the loading content state transitions Part of #21623. --- js/router.js | 30 ++++++++++++------------------ js/views/about/main.js | 1 - js/views/details/main.js | 3 --- js/views/search/do.js | 3 --- js/views/search/main.js | 7 ------- 5 files changed, 12 insertions(+), 32 deletions(-) diff --git a/js/router.js b/js/router.js index 65cf8af..1a54f2d 100644 --- a/js/router.js +++ b/js/router.js @@ -33,21 +33,21 @@ define([ $("#home").removeClass("active"); $("#about").removeClass("active"); - $("#loading").show(); $("#content").hide(); + $("#loading").show(); mainDetailsView.model.fingerprint = this.hashFingerprint(fingerprint); mainDetailsView.model.lookup({ success: function(relay) { - $("#content").show(); mainDetailsView.render(); $("#loading").hide(); + $("#content").show(); }, error: function() { - $("#content").show(); mainDetailsView.error(); $("#loading").hide(); + $("#content").show(); } }); }, @@ -57,15 +57,15 @@ define([ $("#home").removeClass("active"); $("#about").removeClass("active"); - $("#loading").show(); $("#content").hide(); + $("#loading").show(); $("#nav-search").val(query); if (query == "") { - $("#content").show(); doSearchView.error = 5; doSearchView.renderError(); $("#loading").hide(); + $("#content").show(); } else { doSearchView.collection.url = doSearchView.collection.baseurl + this.hashFingerprint(query); @@ -80,18 +80,18 @@ define([ doSearchView.relays[0].fingerprint; return; } - $("#content").show(); doSearchView.error = err; doSearchView.render(query); $("#search-title").text(query); $("#loading").hide(); + $("#content").show(); }, error: function(err){ - $("#content").show(); doSearchView.error = err; doSearchView.renderError(); $("#loading").hide(); + $("#content").show(); } }); } @@ -100,24 +100,24 @@ define([ $("#home").removeClass("active"); $("#about").removeClass("active"); - $("#loading").show(); $("#content").hide(); + $("#loading").show(); doSearchView.collection.url = "https://onionoo.torproject.org/summary?type=relay&order=-consensus_weight&l…"; doSearchView.collection.lookup({ success: function(relays){ - $("#content").show(); doSearchView.relays = doSearchView.collection.models; doSearchView.render(""); $("#search-title").text("Top 10 Relays by Consensus Weight"); $("#loading").hide(); + $("#content").show(); }, error: function(erno){ - $("#content").show(); doSearchView.error = erno; doSearchView.renderError(); $("#loading").hide(); + $("#content").show(); } }); }, @@ -126,13 +126,10 @@ define([ $("#home").removeClass("active"); $("#about").addClass("active"); - $("#loading").show(); - //$("#content").hide(); - aboutView.render(); $("#loading").hide(); - //$("#content").show(); + $("#content").show(); }, // No matched rules go to the default home page @@ -140,13 +137,10 @@ define([ $("#home").addClass("active"); $("#about").removeClass("active"); - $("#loading").show(); - //$("#content").hide(); - mainSearchView.render(); - //$("#content").show(); $("#loading").hide(); + $("#content").show(); } }); diff --git a/js/views/about/main.js b/js/views/about/main.js index 4d6aad1..c92518c 100644 --- a/js/views/about/main.js +++ b/js/views/about/main.js @@ -17,7 +17,6 @@ define([ var data = {}; var compiledTemplate = _.template(aboutTemplate, data); this.el.html(compiledTemplate); - //$("#loading").hide(); } }); return new aboutView; diff --git a/js/views/details/main.js b/js/views/details/main.js index cc4d51a..5605c0c 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -21,7 +21,6 @@ define([ this.model = new relayModel; this.graph = new graphModel; //console.log(this.graph); - $("#loading").show(); }, plot: function(g, data, labels, legendPos, colors, tickFormat, tooltipFormat) { @@ -238,12 +237,10 @@ define([ }); } - $("#loading").hide(); $(".tip").tooltip({ placement: 'right' }); }, error: function() { var compiledTemplate = _.template(errorDetailsTemplate, {relay: null}); - $("#loading").hide(); this.el.html(compiledTemplate); } }); diff --git a/js/views/search/do.js b/js/views/search/do.js index 1899e85..8bc38b8 100644 --- a/js/views/search/do.js +++ b/js/views/search/do.js @@ -15,7 +15,6 @@ define([ el: $("#content"), initialize: function() { this.collection = new resultsCollection; - $("#loading").show(); }, filtering: function() { var rangefilter = function(data) { @@ -150,7 +149,6 @@ define([ var asInitVals = new Array(); var compiledTemplate = _.template(doSearchTemplate, {relays: this.relays, countries: CountryCodes, error: this.error}); this.el.html(compiledTemplate); - $("#loading").hide(); var fp = this; // This creates the table using DataTables var oTable = $('#torstatus_results').dataTable({ @@ -230,7 +228,6 @@ define([ renderError: function(){ var compiledTemplate = _.template(doSearchTemplate, {relays: null, error: this.error, countries: null}); - $("#loading").hide(); this.el.html(compiledTemplate); } diff --git a/js/views/search/main.js b/js/views/search/main.js index c9ab9a2..6a099f9 100644 --- a/js/views/search/main.js +++ b/js/views/search/main.js @@ -8,9 +8,6 @@ define([ ], function($, _, Backbone, mainSearchTemplate){ var mainSearchView = Backbone.View.extend({ el: $("#content"), - initialize: function(){ - $("#loading").show(); - }, render: function(query){ document.title = "Atlas"; @@ -19,7 +16,6 @@ define([ this.el.html(compiledTemplate); $("#do_search").bind('click', function(){ var query = _.escape($('#query').val()); - $("#loading").show(); $("#suggestion").hide(); document.location = "#search/"+query; return false; @@ -27,13 +23,10 @@ define([ $("#home-search").bind('submit', function(){ var query = _.escape($('#query').val()); - $("#loading").show(); $("#suggestion").hide(); document.location = "#search/"+query; return false; }); - - $("#loading").hide(); } }); return new mainSearchView;

1 0

[atlas/master] Do not rehash invalid fingerprints
by irl＠torproject.org 15 Apr '17

15 Apr '17

commit 20acb807fb691e2c3f0948c88ef2f95fb00c9f23 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Mar 2 14:50:41 2017 +0000 Do not rehash invalid fingerprints The regular expression only matches the beginning of the fingerprint. This allows passing invalid hexadecimal strings to the JavaScript SHA library which aborts further page loading. Also rename the function to reflect that it only supports one fingerprint argument, not an array of fingerprints. Closes #21612. --- js/router.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/router.js b/js/router.js index 2c02dad..65cf8af 100644 --- a/js/router.js +++ b/js/router.js @@ -20,8 +20,8 @@ define([ '*actions': 'defaultAction' }, - hashFingerprints: function(fp){ - if (fp.match(/^[a-f0-9]{40}/i) != null) + hashFingerprint: function(fp){ + if (fp.match(/^[a-f0-9]{40}$/i) != null) return new jsSHA(fp, "HEX").getHash("SHA-1", "HEX").toUpperCase(); else return fp @@ -36,7 +36,7 @@ define([ $("#loading").show(); $("#content").hide(); - mainDetailsView.model.fingerprint = this.hashFingerprints(fingerprint); + mainDetailsView.model.fingerprint = this.hashFingerprint(fingerprint); mainDetailsView.model.lookup({ success: function(relay) { $("#content").show(); @@ -68,7 +68,7 @@ define([ $("#loading").hide(); } else { doSearchView.collection.url = - doSearchView.collection.baseurl + this.hashFingerprints(query); + doSearchView.collection.baseurl + this.hashFingerprint(query); doSearchView.collection.lookup({ success: function(err){ doSearchView.relays = doSearchView.collection.models;

1 0

[atlas/master] Always show the search box in mobile view
by irl＠torproject.org 15 Apr '17

15 Apr '17

commit af640b5b0a6c674b0c17a90c7f9c1d34227d96b6 Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Thu Mar 2 17:49:09 2017 +0100 Always show the search box in mobile view --- css/style.css | 15 +++++++++++++++ index.html | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/css/style.css b/css/style.css index f0d5326..46591f9 100644 --- a/css/style.css +++ b/css/style.css @@ -86,6 +86,21 @@ input { } @media screen and (max-width: 980px) { + .nav-collapse ul { + padding-top:20px; + } + .navbar-search { + float: none; + margin: -5px 0 -6px -10px; + border-top: 0; + border-bottom: 0; + width:200px; + max-width:30%; + display:inline-block; + } + .navbar-search input { + max-width:100%; + } .splash h1 { font-size:40px; } diff --git a/index.html b/index.html index 57dab8c..9ba5f35 100644 --- a/index.html +++ b/index.html @@ -42,15 +42,15 @@ <span class="icon-bar"></span> </a> <a class="brand" href="#"><img src="img/atlas.png" alt="Home" /></a> + <form id="nav-search" class="navbar-search pull-right"> + <input type="text" class="search-query" placeholder="Search"> + </form> <div class="nav-collapse"> <ul class="nav navbar-nav"> <li><a href="#/">Home</a></li> <li><a href="#/about">About</a></li> <li><a href="#/top10">Top 10 Relays</a></li> </ul> - <form id="nav-search" class="navbar-search pull-right"> - <input type="text" class="search-query" placeholder="Search"> - </form> </div> </div> </div>

1 0

[atlas/master] Remove the descriptor published field
by irl＠torproject.org 15 Apr '17

15 Apr '17

commit 738967715b4afc72102d4f49d8c4e8c13b02b626 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Mar 4 19:43:22 2017 +0000 Remove the descriptor published field The `desc_published` field from Onionoo was removed 5 years ago so Atlas always says 'never'. Closes #21630. --- templates/details/router.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/templates/details/router.html b/templates/details/router.html index 79b4b70..f582b01 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -120,9 +120,6 @@ <% if (valid) { %><a href="#details/<%= member.replace('$', '') %>" title="Alleged family member" class="alleged"><% } %><%= member %><% if (valid) { %></a><% }}); %><% } %><% if (relay.get('alleged_family') == null) { %>none<% } %></pre> </dd> - <dt><span class="tip" title="Date and time when the relay last published a descriptor to the directory authorities." data-original-title="Descriptor published">Descriptor Published</span></dt> - <dd><%= relay.get('desc_published') ? relay.get('desc_published') : 'never' %></dd> - <dt><span class="tip" title="What OS and Tor version the relay is using" data-original-title="Platform">Platform</span></dt> <dd><%= _.escape(relay.get('platform')) %></dd>

1 0

[atlas/master] More clearly distinguish between running and non-running relays
by irl＠torproject.org 15 Apr '17

15 Apr '17

commit f38331fd23a53aa241508346136a132397e140eb Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Fri Mar 10 14:56:52 2017 +0100 More clearly distinguish between running and non-running relays --- img/properties/offline_16x16.png | Bin 0 -> 229 bytes img/properties/online_16x16.png | Bin 0 -> 230 bytes templates/search/do.html | 10 ++++++++++ 3 files changed, 10 insertions(+) diff --git a/img/properties/offline_16x16.png b/img/properties/offline_16x16.png new file mode 100644 index 0000000..9af422b Binary files /dev/null and b/img/properties/offline_16x16.png differ diff --git a/img/properties/online_16x16.png b/img/properties/online_16x16.png new file mode 100644 index 0000000..37a4e5b Binary files /dev/null and b/img/properties/online_16x16.png differ diff --git a/templates/search/do.html b/templates/search/do.html index c237d61..51a2d82 100644 --- a/templates/search/do.html +++ b/templates/search/do.html @@ -54,6 +54,7 @@ <table class="table table-bordered table-striped" id="torstatus_results"> <thead> <tr> + <th style="width:16px;"> </th> <th>Nickname</th> <th>Bandwidth</th> <th>Uptime</th> @@ -75,6 +76,13 @@ <% } else { %> <tr class="odd"> <% } %> + <td> + <% if (relay.get('running') === false) { %> + <img class="tip inline flags" src="img/properties/offline_16x16.png" alt="Currently offline" title="This relay is currently offline."/> + <% } else { %> + <img class="tip inline flags" src="img/properties/online_16x16.png" alt="Currently running" title="This relay is currently running."/> + <% } %> + </td> <td> <a href="#details/<%= relay.get('fingerprint') %>"> <%= _.escape(relay.get('nickname')) %> @@ -117,6 +125,8 @@ </tbody> <tfoot> <tr> + <th> + </th> <th> <input type="text" id="nickname" name="nickname" placeholder="Nickname" class="search_init"> </th>

1 0

[atlas/master] Remove the executable bit from the country flags
by irl＠torproject.org 15 Apr '17

15 Apr '17

commit cf4405495575cadef0097b4d4b27566e08f65073 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Mar 3 12:07:58 2017 +0000 Remove the executable bit from the country flags Closes #21624. --- img/cc/ad.png | Bin img/cc/ae.png | Bin img/cc/af.png | Bin img/cc/ag.png | Bin img/cc/ai.png | Bin img/cc/al.png | Bin img/cc/am.png | Bin img/cc/an.png | Bin img/cc/ar.png | Bin img/cc/as.png | Bin img/cc/at.png | Bin img/cc/au.png | Bin img/cc/aw.png | Bin img/cc/ax.png | Bin img/cc/az.png | Bin img/cc/ba.png | Bin img/cc/bb.png | Bin img/cc/bd.png | Bin img/cc/be.png | Bin img/cc/bf.png | Bin img/cc/bg.png | Bin img/cc/bh.png | Bin img/cc/bi.png | Bin img/cc/bj.png | Bin img/cc/bm.png | Bin img/cc/bn.png | Bin img/cc/bo.png | Bin img/cc/br.png | Bin img/cc/bs.png | Bin img/cc/bt.png | Bin img/cc/bv.png | Bin img/cc/bw.png | Bin img/cc/by.png | Bin img/cc/bz.png | Bin img/cc/ca.png | Bin img/cc/cc.png | Bin img/cc/cf.png | Bin img/cc/cg.png | Bin img/cc/ch.png | Bin img/cc/ci.png | Bin img/cc/ck.png | Bin img/cc/cl.png | Bin img/cc/cm.png | Bin img/cc/cn.png | Bin img/cc/co.png | Bin img/cc/cr.png | Bin img/cc/cs.png | Bin img/cc/cu.png | Bin img/cc/cv.png | Bin img/cc/cx.png | Bin img/cc/cy.png | Bin img/cc/cz.png | Bin img/cc/de.png | Bin img/cc/dj.png | Bin img/cc/dk.png | Bin img/cc/dm.png | Bin img/cc/do.png | Bin img/cc/dz.png | Bin img/cc/ec.png | Bin img/cc/ee.png | Bin img/cc/eg.png | Bin img/cc/eh.png | Bin img/cc/england.png | Bin img/cc/er.png | Bin img/cc/es.png | Bin img/cc/et.png | Bin img/cc/fam.png | Bin img/cc/fi.png | Bin img/cc/fj.png | Bin img/cc/fk.png | Bin img/cc/fm.png | Bin img/cc/fo.png | Bin img/cc/fr.png | Bin img/cc/ga.png | Bin img/cc/gd.png | Bin img/cc/ge.png | Bin img/cc/gf.png | Bin img/cc/gh.png | Bin img/cc/gi.png | Bin img/cc/gl.png | Bin img/cc/gm.png | Bin img/cc/gn.png | Bin img/cc/gp.png | Bin img/cc/gq.png | Bin img/cc/gr.png | Bin img/cc/gs.png | Bin img/cc/gt.png | Bin img/cc/gu.png | Bin img/cc/gw.png | Bin img/cc/gy.png | Bin img/cc/hk.png | Bin img/cc/hm.png | Bin img/cc/hn.png | Bin img/cc/hr.png | Bin img/cc/ht.png | Bin img/cc/hu.png | Bin img/cc/id.png | Bin img/cc/ie.png | Bin img/cc/il.png | Bin img/cc/in.png | Bin img/cc/io.png | Bin img/cc/iq.png | Bin img/cc/ir.png | Bin img/cc/is.png | Bin img/cc/it.png | Bin img/cc/jm.png | Bin img/cc/jo.png | Bin img/cc/jp.png | Bin img/cc/ke.png | Bin img/cc/kg.png | Bin img/cc/kh.png | Bin img/cc/ki.png | Bin img/cc/km.png | Bin img/cc/kn.png | Bin img/cc/kp.png | Bin img/cc/kr.png | Bin img/cc/kw.png | Bin img/cc/ky.png | Bin img/cc/kz.png | Bin img/cc/la.png | Bin img/cc/lb.png | Bin img/cc/li.png | Bin img/cc/lk.png | Bin img/cc/lr.png | Bin img/cc/ls.png | Bin img/cc/lt.png | Bin img/cc/lu.png | Bin img/cc/lv.png | Bin img/cc/ly.png | Bin img/cc/ma.png | Bin img/cc/mc.png | Bin img/cc/md.png | Bin img/cc/mg.png | Bin img/cc/mh.png | Bin img/cc/mk.png | Bin img/cc/ml.png | Bin img/cc/mm.png | Bin img/cc/mn.png | Bin img/cc/mo.png | Bin img/cc/mp.png | Bin img/cc/mq.png | Bin img/cc/mr.png | Bin img/cc/ms.png | Bin img/cc/mt.png | Bin img/cc/mu.png | Bin img/cc/mv.png | Bin img/cc/mw.png | Bin img/cc/mx.png | Bin img/cc/my.png | Bin img/cc/mz.png | Bin img/cc/na.png | Bin img/cc/nc.png | Bin img/cc/ne.png | Bin img/cc/nf.png | Bin img/cc/ng.png | Bin img/cc/ni.png | Bin img/cc/nl.png | Bin img/cc/no.png | Bin img/cc/np.png | Bin img/cc/nr.png | Bin img/cc/nu.png | Bin img/cc/nz.png | Bin img/cc/om.png | Bin img/cc/pa.png | Bin img/cc/pe.png | Bin img/cc/pf.png | Bin img/cc/pg.png | Bin img/cc/ph.png | Bin img/cc/pk.png | Bin img/cc/pl.png | Bin img/cc/pm.png | Bin img/cc/pn.png | Bin img/cc/pr.png | Bin img/cc/ps.png | Bin img/cc/pt.png | Bin img/cc/pw.png | Bin img/cc/py.png | Bin img/cc/qa.png | Bin img/cc/re.png | Bin img/cc/ro.png | Bin img/cc/ru.png | Bin img/cc/rw.png | Bin img/cc/sa.png | Bin img/cc/sb.png | Bin img/cc/sc.png | Bin img/cc/scotland.png | Bin img/cc/sd.png | Bin img/cc/se.png | Bin img/cc/sg.png | Bin img/cc/sh.png | Bin img/cc/si.png | Bin img/cc/sj.png | Bin img/cc/sk.png | Bin img/cc/sl.png | Bin img/cc/sm.png | Bin img/cc/sn.png | Bin img/cc/so.png | Bin img/cc/sr.png | Bin img/cc/st.png | Bin img/cc/sv.png | Bin img/cc/sy.png | Bin img/cc/sz.png | Bin img/cc/tc.png | Bin img/cc/td.png | Bin img/cc/tf.png | Bin img/cc/tg.png | Bin img/cc/th.png | Bin img/cc/tj.png | Bin img/cc/tk.png | Bin img/cc/tl.png | Bin img/cc/tm.png | Bin img/cc/tn.png | Bin img/cc/to.png | Bin img/cc/tr.png | Bin img/cc/tt.png | Bin img/cc/tv.png | Bin img/cc/tw.png | Bin img/cc/tz.png | Bin img/cc/ua.png | Bin img/cc/ug.png | Bin img/cc/um.png | Bin img/cc/us.png | Bin img/cc/uy.png | Bin img/cc/uz.png | Bin img/cc/va.png | Bin img/cc/vc.png | Bin img/cc/ve.png | Bin img/cc/vg.png | Bin img/cc/vi.png | Bin img/cc/vn.png | Bin img/cc/vu.png | Bin img/cc/wales.png | Bin img/cc/wf.png | Bin img/cc/ws.png | Bin img/cc/ye.png | Bin img/cc/yt.png | Bin img/cc/za.png | Bin img/cc/zm.png | Bin img/cc/zw.png | Bin 239 files changed, 0 insertions(+), 0 deletions(-) diff --git a/img/cc/ad.png b/img/cc/ad.png old mode 100755 new mode 100644 diff --git a/img/cc/ae.png b/img/cc/ae.png old mode 100755 new mode 100644 diff --git a/img/cc/af.png b/img/cc/af.png old mode 100755 new mode 100644 diff --git a/img/cc/ag.png b/img/cc/ag.png old mode 100755 new mode 100644 diff --git a/img/cc/ai.png b/img/cc/ai.png old mode 100755 new mode 100644 diff --git a/img/cc/al.png b/img/cc/al.png old mode 100755 new mode 100644 diff --git a/img/cc/am.png b/img/cc/am.png old mode 100755 new mode 100644 diff --git a/img/cc/an.png b/img/cc/an.png old mode 100755 new mode 100644 diff --git a/img/cc/ar.png b/img/cc/ar.png old mode 100755 new mode 100644 diff --git a/img/cc/as.png b/img/cc/as.png old mode 100755 new mode 100644 diff --git a/img/cc/at.png b/img/cc/at.png old mode 100755 new mode 100644 diff --git a/img/cc/au.png b/img/cc/au.png old mode 100755 new mode 100644 diff --git a/img/cc/aw.png b/img/cc/aw.png old mode 100755 new mode 100644 diff --git a/img/cc/ax.png b/img/cc/ax.png old mode 100755 new mode 100644 diff --git a/img/cc/az.png b/img/cc/az.png old mode 100755 new mode 100644 diff --git a/img/cc/ba.png b/img/cc/ba.png old mode 100755 new mode 100644 diff --git a/img/cc/bb.png b/img/cc/bb.png old mode 100755 new mode 100644 diff --git a/img/cc/bd.png b/img/cc/bd.png old mode 100755 new mode 100644 diff --git a/img/cc/be.png b/img/cc/be.png old mode 100755 new mode 100644 diff --git a/img/cc/bf.png b/img/cc/bf.png old mode 100755 new mode 100644 diff --git a/img/cc/bg.png b/img/cc/bg.png old mode 100755 new mode 100644 diff --git a/img/cc/bh.png b/img/cc/bh.png old mode 100755 new mode 100644 diff --git a/img/cc/bi.png b/img/cc/bi.png old mode 100755 new mode 100644 diff --git a/img/cc/bj.png b/img/cc/bj.png old mode 100755 new mode 100644 diff --git a/img/cc/bm.png b/img/cc/bm.png old mode 100755 new mode 100644 diff --git a/img/cc/bn.png b/img/cc/bn.png old mode 100755 new mode 100644 diff --git a/img/cc/bo.png b/img/cc/bo.png old mode 100755 new mode 100644 diff --git a/img/cc/br.png b/img/cc/br.png old mode 100755 new mode 100644 diff --git a/img/cc/bs.png b/img/cc/bs.png old mode 100755 new mode 100644 diff --git a/img/cc/bt.png b/img/cc/bt.png old mode 100755 new mode 100644 diff --git a/img/cc/bv.png b/img/cc/bv.png old mode 100755 new mode 100644 diff --git a/img/cc/bw.png b/img/cc/bw.png old mode 100755 new mode 100644 diff --git a/img/cc/by.png b/img/cc/by.png old mode 100755 new mode 100644 diff --git a/img/cc/bz.png b/img/cc/bz.png old mode 100755 new mode 100644 diff --git a/img/cc/ca.png b/img/cc/ca.png old mode 100755 new mode 100644 diff --git a/img/cc/cc.png b/img/cc/cc.png old mode 100755 new mode 100644 diff --git a/img/cc/cf.png b/img/cc/cf.png old mode 100755 new mode 100644 diff --git a/img/cc/cg.png b/img/cc/cg.png old mode 100755 new mode 100644 diff --git a/img/cc/ch.png b/img/cc/ch.png old mode 100755 new mode 100644 diff --git a/img/cc/ci.png b/img/cc/ci.png old mode 100755 new mode 100644 diff --git a/img/cc/ck.png b/img/cc/ck.png old mode 100755 new mode 100644 diff --git a/img/cc/cl.png b/img/cc/cl.png old mode 100755 new mode 100644 diff --git a/img/cc/cm.png b/img/cc/cm.png old mode 100755 new mode 100644 diff --git a/img/cc/cn.png b/img/cc/cn.png old mode 100755 new mode 100644 diff --git a/img/cc/co.png b/img/cc/co.png old mode 100755 new mode 100644 diff --git a/img/cc/cr.png b/img/cc/cr.png old mode 100755 new mode 100644 diff --git a/img/cc/cs.png b/img/cc/cs.png old mode 100755 new mode 100644 diff --git a/img/cc/cu.png b/img/cc/cu.png old mode 100755 new mode 100644 diff --git a/img/cc/cv.png b/img/cc/cv.png old mode 100755 new mode 100644 diff --git a/img/cc/cx.png b/img/cc/cx.png old mode 100755 new mode 100644 diff --git a/img/cc/cy.png b/img/cc/cy.png old mode 100755 new mode 100644 diff --git a/img/cc/cz.png b/img/cc/cz.png old mode 100755 new mode 100644 diff --git a/img/cc/de.png b/img/cc/de.png old mode 100755 new mode 100644 diff --git a/img/cc/dj.png b/img/cc/dj.png old mode 100755 new mode 100644 diff --git a/img/cc/dk.png b/img/cc/dk.png old mode 100755 new mode 100644 diff --git a/img/cc/dm.png b/img/cc/dm.png old mode 100755 new mode 100644 diff --git a/img/cc/do.png b/img/cc/do.png old mode 100755 new mode 100644 diff --git a/img/cc/dz.png b/img/cc/dz.png old mode 100755 new mode 100644 diff --git a/img/cc/ec.png b/img/cc/ec.png old mode 100755 new mode 100644 diff --git a/img/cc/ee.png b/img/cc/ee.png old mode 100755 new mode 100644 diff --git a/img/cc/eg.png b/img/cc/eg.png old mode 100755 new mode 100644 diff --git a/img/cc/eh.png b/img/cc/eh.png old mode 100755 new mode 100644 diff --git a/img/cc/england.png b/img/cc/england.png old mode 100755 new mode 100644 diff --git a/img/cc/er.png b/img/cc/er.png old mode 100755 new mode 100644 diff --git a/img/cc/es.png b/img/cc/es.png old mode 100755 new mode 100644 diff --git a/img/cc/et.png b/img/cc/et.png old mode 100755 new mode 100644 diff --git a/img/cc/fam.png b/img/cc/fam.png old mode 100755 new mode 100644 diff --git a/img/cc/fi.png b/img/cc/fi.png old mode 100755 new mode 100644 diff --git a/img/cc/fj.png b/img/cc/fj.png old mode 100755 new mode 100644 diff --git a/img/cc/fk.png b/img/cc/fk.png old mode 100755 new mode 100644 diff --git a/img/cc/fm.png b/img/cc/fm.png old mode 100755 new mode 100644 diff --git a/img/cc/fo.png b/img/cc/fo.png old mode 100755 new mode 100644 diff --git a/img/cc/fr.png b/img/cc/fr.png old mode 100755 new mode 100644 diff --git a/img/cc/ga.png b/img/cc/ga.png old mode 100755 new mode 100644 diff --git a/img/cc/gd.png b/img/cc/gd.png old mode 100755 new mode 100644 diff --git a/img/cc/ge.png b/img/cc/ge.png old mode 100755 new mode 100644 diff --git a/img/cc/gf.png b/img/cc/gf.png old mode 100755 new mode 100644 diff --git a/img/cc/gh.png b/img/cc/gh.png old mode 100755 new mode 100644 diff --git a/img/cc/gi.png b/img/cc/gi.png old mode 100755 new mode 100644 diff --git a/img/cc/gl.png b/img/cc/gl.png old mode 100755 new mode 100644 diff --git a/img/cc/gm.png b/img/cc/gm.png old mode 100755 new mode 100644 diff --git a/img/cc/gn.png b/img/cc/gn.png old mode 100755 new mode 100644 diff --git a/img/cc/gp.png b/img/cc/gp.png old mode 100755 new mode 100644 diff --git a/img/cc/gq.png b/img/cc/gq.png old mode 100755 new mode 100644 diff --git a/img/cc/gr.png b/img/cc/gr.png old mode 100755 new mode 100644 diff --git a/img/cc/gs.png b/img/cc/gs.png old mode 100755 new mode 100644 diff --git a/img/cc/gt.png b/img/cc/gt.png old mode 100755 new mode 100644 diff --git a/img/cc/gu.png b/img/cc/gu.png old mode 100755 new mode 100644 diff --git a/img/cc/gw.png b/img/cc/gw.png old mode 100755 new mode 100644 diff --git a/img/cc/gy.png b/img/cc/gy.png old mode 100755 new mode 100644 diff --git a/img/cc/hk.png b/img/cc/hk.png old mode 100755 new mode 100644 diff --git a/img/cc/hm.png b/img/cc/hm.png old mode 100755 new mode 100644 diff --git a/img/cc/hn.png b/img/cc/hn.png old mode 100755 new mode 100644 diff --git a/img/cc/hr.png b/img/cc/hr.png old mode 100755 new mode 100644 diff --git a/img/cc/ht.png b/img/cc/ht.png old mode 100755 new mode 100644 diff --git a/img/cc/hu.png b/img/cc/hu.png old mode 100755 new mode 100644 diff --git a/img/cc/id.png b/img/cc/id.png old mode 100755 new mode 100644 diff --git a/img/cc/ie.png b/img/cc/ie.png old mode 100755 new mode 100644 diff --git a/img/cc/il.png b/img/cc/il.png old mode 100755 new mode 100644 diff --git a/img/cc/in.png b/img/cc/in.png old mode 100755 new mode 100644 diff --git a/img/cc/io.png b/img/cc/io.png old mode 100755 new mode 100644 diff --git a/img/cc/iq.png b/img/cc/iq.png old mode 100755 new mode 100644 diff --git a/img/cc/ir.png b/img/cc/ir.png old mode 100755 new mode 100644 diff --git a/img/cc/is.png b/img/cc/is.png old mode 100755 new mode 100644 diff --git a/img/cc/it.png b/img/cc/it.png old mode 100755 new mode 100644 diff --git a/img/cc/jm.png b/img/cc/jm.png old mode 100755 new mode 100644 diff --git a/img/cc/jo.png b/img/cc/jo.png old mode 100755 new mode 100644 diff --git a/img/cc/jp.png b/img/cc/jp.png old mode 100755 new mode 100644 diff --git a/img/cc/ke.png b/img/cc/ke.png old mode 100755 new mode 100644 diff --git a/img/cc/kg.png b/img/cc/kg.png old mode 100755 new mode 100644 diff --git a/img/cc/kh.png b/img/cc/kh.png old mode 100755 new mode 100644 diff --git a/img/cc/ki.png b/img/cc/ki.png old mode 100755 new mode 100644 diff --git a/img/cc/km.png b/img/cc/km.png old mode 100755 new mode 100644 diff --git a/img/cc/kn.png b/img/cc/kn.png old mode 100755 new mode 100644 diff --git a/img/cc/kp.png b/img/cc/kp.png old mode 100755 new mode 100644 diff --git a/img/cc/kr.png b/img/cc/kr.png old mode 100755 new mode 100644 diff --git a/img/cc/kw.png b/img/cc/kw.png old mode 100755 new mode 100644 diff --git a/img/cc/ky.png b/img/cc/ky.png old mode 100755 new mode 100644 diff --git a/img/cc/kz.png b/img/cc/kz.png old mode 100755 new mode 100644 diff --git a/img/cc/la.png b/img/cc/la.png old mode 100755 new mode 100644 diff --git a/img/cc/lb.png b/img/cc/lb.png old mode 100755 new mode 100644 diff --git a/img/cc/li.png b/img/cc/li.png old mode 100755 new mode 100644 diff --git a/img/cc/lk.png b/img/cc/lk.png old mode 100755 new mode 100644 diff --git a/img/cc/lr.png b/img/cc/lr.png old mode 100755 new mode 100644 diff --git a/img/cc/ls.png b/img/cc/ls.png old mode 100755 new mode 100644 diff --git a/img/cc/lt.png b/img/cc/lt.png old mode 100755 new mode 100644 diff --git a/img/cc/lu.png b/img/cc/lu.png old mode 100755 new mode 100644 diff --git a/img/cc/lv.png b/img/cc/lv.png old mode 100755 new mode 100644 diff --git a/img/cc/ly.png b/img/cc/ly.png old mode 100755 new mode 100644 diff --git a/img/cc/ma.png b/img/cc/ma.png old mode 100755 new mode 100644 diff --git a/img/cc/mc.png b/img/cc/mc.png old mode 100755 new mode 100644 diff --git a/img/cc/md.png b/img/cc/md.png old mode 100755 new mode 100644 diff --git a/img/cc/mg.png b/img/cc/mg.png old mode 100755 new mode 100644 diff --git a/img/cc/mh.png b/img/cc/mh.png old mode 100755 new mode 100644 diff --git a/img/cc/mk.png b/img/cc/mk.png old mode 100755 new mode 100644 diff --git a/img/cc/ml.png b/img/cc/ml.png old mode 100755 new mode 100644 diff --git a/img/cc/mm.png b/img/cc/mm.png old mode 100755 new mode 100644 diff --git a/img/cc/mn.png b/img/cc/mn.png old mode 100755 new mode 100644 diff --git a/img/cc/mo.png b/img/cc/mo.png old mode 100755 new mode 100644 diff --git a/img/cc/mp.png b/img/cc/mp.png old mode 100755 new mode 100644 diff --git a/img/cc/mq.png b/img/cc/mq.png old mode 100755 new mode 100644 diff --git a/img/cc/mr.png b/img/cc/mr.png old mode 100755 new mode 100644 diff --git a/img/cc/ms.png b/img/cc/ms.png old mode 100755 new mode 100644 diff --git a/img/cc/mt.png b/img/cc/mt.png old mode 100755 new mode 100644 diff --git a/img/cc/mu.png b/img/cc/mu.png old mode 100755 new mode 100644 diff --git a/img/cc/mv.png b/img/cc/mv.png old mode 100755 new mode 100644 diff --git a/img/cc/mw.png b/img/cc/mw.png old mode 100755 new mode 100644 diff --git a/img/cc/mx.png b/img/cc/mx.png old mode 100755 new mode 100644 diff --git a/img/cc/my.png b/img/cc/my.png old mode 100755 new mode 100644 diff --git a/img/cc/mz.png b/img/cc/mz.png old mode 100755 new mode 100644 diff --git a/img/cc/na.png b/img/cc/na.png old mode 100755 new mode 100644 diff --git a/img/cc/nc.png b/img/cc/nc.png old mode 100755 new mode 100644 diff --git a/img/cc/ne.png b/img/cc/ne.png old mode 100755 new mode 100644 diff --git a/img/cc/nf.png b/img/cc/nf.png old mode 100755 new mode 100644 diff --git a/img/cc/ng.png b/img/cc/ng.png old mode 100755 new mode 100644 diff --git a/img/cc/ni.png b/img/cc/ni.png old mode 100755 new mode 100644 diff --git a/img/cc/nl.png b/img/cc/nl.png old mode 100755 new mode 100644 diff --git a/img/cc/no.png b/img/cc/no.png old mode 100755 new mode 100644 diff --git a/img/cc/np.png b/img/cc/np.png old mode 100755 new mode 100644 diff --git a/img/cc/nr.png b/img/cc/nr.png old mode 100755 new mode 100644 diff --git a/img/cc/nu.png b/img/cc/nu.png old mode 100755 new mode 100644 diff --git a/img/cc/nz.png b/img/cc/nz.png old mode 100755 new mode 100644 diff --git a/img/cc/om.png b/img/cc/om.png old mode 100755 new mode 100644 diff --git a/img/cc/pa.png b/img/cc/pa.png old mode 100755 new mode 100644 diff --git a/img/cc/pe.png b/img/cc/pe.png old mode 100755 new mode 100644 diff --git a/img/cc/pf.png b/img/cc/pf.png old mode 100755 new mode 100644 diff --git a/img/cc/pg.png b/img/cc/pg.png old mode 100755 new mode 100644 diff --git a/img/cc/ph.png b/img/cc/ph.png old mode 100755 new mode 100644 diff --git a/img/cc/pk.png b/img/cc/pk.png old mode 100755 new mode 100644 diff --git a/img/cc/pl.png b/img/cc/pl.png old mode 100755 new mode 100644 diff --git a/img/cc/pm.png b/img/cc/pm.png old mode 100755 new mode 100644 diff --git a/img/cc/pn.png b/img/cc/pn.png old mode 100755 new mode 100644 diff --git a/img/cc/pr.png b/img/cc/pr.png old mode 100755 new mode 100644 diff --git a/img/cc/ps.png b/img/cc/ps.png old mode 100755 new mode 100644 diff --git a/img/cc/pt.png b/img/cc/pt.png old mode 100755 new mode 100644 diff --git a/img/cc/pw.png b/img/cc/pw.png old mode 100755 new mode 100644 diff --git a/img/cc/py.png b/img/cc/py.png old mode 100755 new mode 100644 diff --git a/img/cc/qa.png b/img/cc/qa.png old mode 100755 new mode 100644 diff --git a/img/cc/re.png b/img/cc/re.png old mode 100755 new mode 100644 diff --git a/img/cc/ro.png b/img/cc/ro.png old mode 100755 new mode 100644 diff --git a/img/cc/ru.png b/img/cc/ru.png old mode 100755 new mode 100644 diff --git a/img/cc/rw.png b/img/cc/rw.png old mode 100755 new mode 100644 diff --git a/img/cc/sa.png b/img/cc/sa.png old mode 100755 new mode 100644 diff --git a/img/cc/sb.png b/img/cc/sb.png old mode 100755 new mode 100644 diff --git a/img/cc/sc.png b/img/cc/sc.png old mode 100755 new mode 100644 diff --git a/img/cc/scotland.png b/img/cc/scotland.png old mode 100755 new mode 100644 diff --git a/img/cc/sd.png b/img/cc/sd.png old mode 100755 new mode 100644 diff --git a/img/cc/se.png b/img/cc/se.png old mode 100755 new mode 100644 diff --git a/img/cc/sg.png b/img/cc/sg.png old mode 100755 new mode 100644 diff --git a/img/cc/sh.png b/img/cc/sh.png old mode 100755 new mode 100644 diff --git a/img/cc/si.png b/img/cc/si.png old mode 100755 new mode 100644 diff --git a/img/cc/sj.png b/img/cc/sj.png old mode 100755 new mode 100644 diff --git a/img/cc/sk.png b/img/cc/sk.png old mode 100755 new mode 100644 diff --git a/img/cc/sl.png b/img/cc/sl.png old mode 100755 new mode 100644 diff --git a/img/cc/sm.png b/img/cc/sm.png old mode 100755 new mode 100644 diff --git a/img/cc/sn.png b/img/cc/sn.png old mode 100755 new mode 100644 diff --git a/img/cc/so.png b/img/cc/so.png old mode 100755 new mode 100644 diff --git a/img/cc/sr.png b/img/cc/sr.png old mode 100755 new mode 100644 diff --git a/img/cc/st.png b/img/cc/st.png old mode 100755 new mode 100644 diff --git a/img/cc/sv.png b/img/cc/sv.png old mode 100755 new mode 100644 diff --git a/img/cc/sy.png b/img/cc/sy.png old mode 100755 new mode 100644 diff --git a/img/cc/sz.png b/img/cc/sz.png old mode 100755 new mode 100644 diff --git a/img/cc/tc.png b/img/cc/tc.png old mode 100755 new mode 100644 diff --git a/img/cc/td.png b/img/cc/td.png old mode 100755 new mode 100644 diff --git a/img/cc/tf.png b/img/cc/tf.png old mode 100755 new mode 100644 diff --git a/img/cc/tg.png b/img/cc/tg.png old mode 100755 new mode 100644 diff --git a/img/cc/th.png b/img/cc/th.png old mode 100755 new mode 100644 diff --git a/img/cc/tj.png b/img/cc/tj.png old mode 100755 new mode 100644 diff --git a/img/cc/tk.png b/img/cc/tk.png old mode 100755 new mode 100644 diff --git a/img/cc/tl.png b/img/cc/tl.png old mode 100755 new mode 100644 diff --git a/img/cc/tm.png b/img/cc/tm.png old mode 100755 new mode 100644 diff --git a/img/cc/tn.png b/img/cc/tn.png old mode 100755 new mode 100644 diff --git a/img/cc/to.png b/img/cc/to.png old mode 100755 new mode 100644 diff --git a/img/cc/tr.png b/img/cc/tr.png old mode 100755 new mode 100644 diff --git a/img/cc/tt.png b/img/cc/tt.png old mode 100755 new mode 100644 diff --git a/img/cc/tv.png b/img/cc/tv.png old mode 100755 new mode 100644 diff --git a/img/cc/tw.png b/img/cc/tw.png old mode 100755 new mode 100644 diff --git a/img/cc/tz.png b/img/cc/tz.png old mode 100755 new mode 100644 diff --git a/img/cc/ua.png b/img/cc/ua.png old mode 100755 new mode 100644 diff --git a/img/cc/ug.png b/img/cc/ug.png old mode 100755 new mode 100644 diff --git a/img/cc/um.png b/img/cc/um.png old mode 100755 new mode 100644 diff --git a/img/cc/us.png b/img/cc/us.png old mode 100755 new mode 100644 diff --git a/img/cc/uy.png b/img/cc/uy.png old mode 100755 new mode 100644 diff --git a/img/cc/uz.png b/img/cc/uz.png old mode 100755 new mode 100644 diff --git a/img/cc/va.png b/img/cc/va.png old mode 100755 new mode 100644 diff --git a/img/cc/vc.png b/img/cc/vc.png old mode 100755 new mode 100644 diff --git a/img/cc/ve.png b/img/cc/ve.png old mode 100755 new mode 100644 diff --git a/img/cc/vg.png b/img/cc/vg.png old mode 100755 new mode 100644 diff --git a/img/cc/vi.png b/img/cc/vi.png old mode 100755 new mode 100644 diff --git a/img/cc/vn.png b/img/cc/vn.png old mode 100755 new mode 100644 diff --git a/img/cc/vu.png b/img/cc/vu.png old mode 100755 new mode 100644 diff --git a/img/cc/wales.png b/img/cc/wales.png old mode 100755 new mode 100644 diff --git a/img/cc/wf.png b/img/cc/wf.png old mode 100755 new mode 100644 diff --git a/img/cc/ws.png b/img/cc/ws.png old mode 100755 new mode 100644 diff --git a/img/cc/ye.png b/img/cc/ye.png old mode 100755 new mode 100644 diff --git a/img/cc/yt.png b/img/cc/yt.png old mode 100755 new mode 100644 diff --git a/img/cc/za.png b/img/cc/za.png old mode 100755 new mode 100644 diff --git a/img/cc/zm.png b/img/cc/zm.png old mode 100755 new mode 100644 diff --git a/img/cc/zw.png b/img/cc/zw.png old mode 100755 new mode 100644

1 0

[atlas/master] Moved "Not recommended"-flag to a new properties column / section
by irl＠torproject.org 15 Apr '17

15 Apr '17

commit 251ba71de9ce116f8380f61fdcf3937038acabb6 Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Fri Mar 10 15:27:42 2017 +0100 Moved "Not recommended"-flag to a new properties column / section --- css/style.css | 4 ++++ img/flags/not_recommended_16x16.png | Bin 323 -> 0 bytes img/properties/not_recommended_16x16.png | Bin 0 -> 260 bytes js/models/relay.js | 6 ------ templates/details/bridge.html | 14 ++++++++++++++ templates/details/router.html | 14 ++++++++++++++ templates/search/do.html | 8 ++++++++ 7 files changed, 40 insertions(+), 6 deletions(-) diff --git a/css/style.css b/css/style.css index 9173215..f0d5326 100644 --- a/css/style.css +++ b/css/style.css @@ -81,6 +81,10 @@ pre { padding: 5px; } +input { + width:150px; +} + @media screen and (max-width: 980px) { .splash h1 { font-size:40px; diff --git a/img/flags/not_recommended_16x16.png b/img/flags/not_recommended_16x16.png deleted file mode 100644 index b8a3634..0000000 Binary files a/img/flags/not_recommended_16x16.png and /dev/null differ diff --git a/img/properties/not_recommended_16x16.png b/img/properties/not_recommended_16x16.png new file mode 100644 index 0000000..8d702c5 Binary files /dev/null and b/img/properties/not_recommended_16x16.png differ diff --git a/js/models/relay.js b/js/models/relay.js index c69288a..a578e99 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -55,9 +55,6 @@ define([ if (flag == "Exit") { output.push([flag,"cloud_download_"+size[0], "This relay is more useful for building general-purpose exit circuits than for relay circuits."]); } - if (flag == "Not Recommended") { - output.push([flag,"not_recommended_"+size[0], "This relay is running a software version that is not recommended by the directory authorities."]); - } }); return output; }, @@ -194,9 +191,6 @@ define([ relay.fingerprint = relay.hashed_fingerprint ? relay.hashed_fingerprint : relay.fingerprint; model.set({badexit: false}); var size = ['16x16', '14x16', '8x16']; - if (relay.recommended_version===false) { - relay.flags.push("Not Recommended"); - } relay.flags = model.parseflags(relay.flags, size); model.set(relay, options); success(model, relay); diff --git a/templates/details/bridge.html b/templates/details/bridge.html index 0398b11..4d4d666 100644 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@ -50,6 +50,20 @@ </span> <% }); %> </dd> + + <dt><span class="tip" title="" data-original-title="Properties">Properties</span></dt> + <dd> + <% var propertyCount = 0; %> + <% if (relay.get('recommended_version') === false) { + propertyCount++; + %> + <span class="tip flags" title="This relay is running a software version that is not recommended by the directory authorities."> + <img class="inline" alt="" src="img/properties/not_recommended_16x16.png"/> + <span class="inline">Not recommended</span> + </span> + <% } %> + <%=propertyCount==0?'none':''%> + </dd> <dt><span class="tip" title="Date and time when the bridge was last (re-)started." data-original-title="Last restarted">Last Restarted</span></dt> <dd><%= relay.get('last_restarted') %></dd> diff --git a/templates/details/router.html b/templates/details/router.html index 24bcb2b..79b4b70 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -82,6 +82,20 @@ </span> <% }); %> </dd> + + <dt><span class="tip" title="" data-original-title="Properties">Properties</span></dt> + <dd> + <% var propertyCount = 0; %> + <% if (relay.get('recommended_version') === false) { + propertyCount++; + %> + <span class="tip flags" title="This relay is running a software version that is not recommended by the directory authorities."> + <img class="inline" alt="" src="img/properties/not_recommended_16x16.png"/> + <span class="inline">Not recommended</span> + </span> + <% } %> + <%=propertyCount==0?'none':''%> + </dd> <dt><span class="tip" title="Country as found in a GeoIP database by resolving the relay's first onion-routing address." data-original-title="Country">Country</span></dt> <dd><% if (relay.get('country')) { %><img class="inline country" title="<%= relay.get('countryname') %>" alt="" src="img/cc/<%= relay.get('country') %>.png"/> <%= relay.get('countryname') %><% } else { %>Unknown<% } %></dd> diff --git a/templates/search/do.html b/templates/search/do.html index cd07a61..8a0a34c 100644 --- a/templates/search/do.html +++ b/templates/search/do.html @@ -60,6 +60,7 @@ <th>Country</th> <th>IP</th> <th>Flags</th> + <th>Properties</th> <th>ORPort</th> <th>DirPort</th> <th>Type</th> @@ -96,6 +97,11 @@ <img class="tip inline flags" src="img/flags/<%= flag[1] %>.png" alt="<%= flag[0] %>" title="<%= flag[0] %><br /><%= flag[2] %>"/> <% }); %> </td> + <td> + <% if (relay.get('recommended_version') === false) { %> + <img class="tip inline flags" src="img/properties/not_recommended_16x16.png" alt="Not recommended" title="Not recommended<br />This relay is running a software version that is not recommended by the directory authorities."/> + <% } %> + </td> <td><%= relay.get('or_port') %></td> <td><%= relay.get('dir_port') %></td> <td> @@ -132,6 +138,8 @@ <th> <input type="text" id="flags" name="flags" placeholder="Flags" class="search_init"> </th> + <th> + </th> <th> <input type="text" id="or_port" name="or_port" placeholder="ORPort" class="search_init span1"> </th>

1 0