Commit 0fce2a6f authored by Baptiste Jonglez's avatar Baptiste Jonglez

Conflict

parents cc21e577 7ee269a0
......@@ -665,6 +665,7 @@ ul.messages {
#legend li { padding: .1em; display: inline; }
#map { float: right; }
.logo-org { display: inline-block; width: 114px; text-align: center; vertical-align: top; }
/*tr.new-status td { background: green !important; }
tr.duplicate-status td { background: #999 !important; }
......
......@@ -11,5 +11,14 @@
<li>{% trans "France" %}: <a href="http://www.laquadrature.net/">La Quadrature du Net</a> &ndash; contact[a]laquadrature.net</li>
<li>{% trans "Netherlands" %}: <a href="https://www.bof.nl/">Bits of Freedom</a> &ndash; info[a]bof.nl</li>
</ul>
<h3>Initiators</h3>
<ul>
<li class="logo-org"><img alt="BoF logo" src="{%media_url%}/img/bof.png" /><a href="http://www.bof.nl">Bits of Freedom</a></li>
<li class="logo-org"><img alt="LQDN logo" src="{%media_url%}/img/lqdn.png" /><a href="https://www.laquadrature.net/">La Quadrature du Net</a></li>
</ul>
<h3>Supporters</h3>
<ul>
<li class="logo-org"><img alt="ORG logo" src="{%media_url%}/img/org.png" /><a href="http://www.openrightsgroup.org/">OpenRightsGroup</a></li>
</ul>
</div>
{% endblock %}
......@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="{{LANGUAGE_CODE}}" xml:lang="{{LANGUAGE_CODE}}">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
<meta http-equiv="content-language" content="en" />
<meta name="description" content="The Internet bugtracker" />
<meta name="keywords" content="internet network neutrality" />
......
......@@ -2,7 +2,7 @@
{% load bt %}
{% load i18n %}
{% block styles %}
<style type="text/css">
<style type="text/css" media="all">
.map { margin: 0 0 1em 0; float: right; }
.map-eu { border: thin solid black; display: block; }
#europe-map {margin-left: 1.5em;}
......@@ -32,9 +32,9 @@
$('#sortedlist').tableFilter();
$('.confirm_form').submit(function() {
var self=this;
var email=$(this).children('input:first').attr('value');
var email=$(this).find('input:first').attr('value');
if( email.length>0) {
$.ajax({url: '/confirm/'+$(this).attr('id')+'/'+email, success: function(data) { $(self).html(data); }});
$.ajax({url: '/confirm/'+$(this).attr('id').slice(1)+'/'+email, success: function(data) { $(self).html(data); }});
} else {
$(this).find('[type=text]').focus();
}
......@@ -61,17 +61,7 @@
{% endif %}
{% if countries %}
<div id="map">
<svg id="europe-map" class="map map-eu" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xml:space="preserve" height="260" width="340" version="1.0" viewBox="1754 161 9938 7945">
<metadata>
<rdf:RDF>
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title>Countries of Europe</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<svg id="europe-map" class="map map-eu" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" height="260" width="340" version="1.0" viewBox="1754 161 9938 7945">
<rect id="ocean" height="7935" width="12386" y="162.75" x="-340.66"/>
<g id="outlines" stroke-linejoin="round" stroke-linecap="round">
<rect id="rect3096" height="8316.9" width="11049" stroke="#fff" y="-64.132" x="1334" stroke-width="16.018"/>
......@@ -270,14 +260,17 @@
<td>
<div class="confirm"><a class="button">{% trans "confirm" %}</a>
<div class="info-validate float-confirm">
<form method="get" id="{{ violation.pk }}" class="confirm_form" >
<form method="get" action="" id="i{{ violation.pk }}" class="confirm_form" >
<div>
<label>{% trans "In order to <strong>validate your confirmation</strong> of this case, please enter your email address" %}</label>
<input type="text" name="email" />
<input type="hidden" value="{{ violation.pk }}" />
<input type="submit" value="{% trans "OK" %}" />
</div>
</form>
<input class="cancel-button" type="button" value="{% trans "Close" %}" />
</div>
</div>
</td>
</tr>
{% endfor %}
......
......@@ -49,6 +49,7 @@ $(document).ready(function() {
}
return false;
});
$('span').hover(function(){$('span#'+this.id+'_tooltip').fadeIn();}, function(){$('span#'+this.id+'_tooltip').hide();});
});
</script>
{% endblock %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment