Commit 7dca041a authored by Stefan Marsiske's avatar Stefan Marsiske
Browse files

Merge pull request #14 from Cynddl/master

3 commits w/ css evolution
parents 1dda265e 3df00fd7
......@@ -14,8 +14,32 @@ li { list-style: none; }
#add_attach { cursor: pointer; }
#show_optionals { text-decoration: underline; color: blue; cursor: pointer; clear: both; }
#optional { clear: both; }
#report dt { display: inline-block; width: 10em; }
#report dd { display: inline; padding: 0; }
#report {
background: #f5f5f5;
padding: 0.5em;
margin-bottom: 1em;
}
#report dt {
float: left;
clear: left;
width: 160px;
text-align: right;
font-weight: bold;
}
#report dt:after {
content: ":";
}
#report dd {
margin: 0 0 0 170px;
padding: 0 0 0.5em 0;
}
#report dd p { margin: 0;}
#auth { float: right; clear: both; }
#container { margin: 2em; }
......@@ -24,9 +48,9 @@ li { list-style: none; }
#addForm.index .help_text { font-size: 0.7em; width: 30%; position: relative; float: right; left: 0; }
.index #add_attach { cursor: pointer; }
#id_captcha_1 { width: 2em; }
.innerfield { display: inline-block; }
.innerfield { display: inline-block; margin-top: 0.5em;}
.align-right { text-align: right;}
dd.text { width: 30%; display: block !important; }
dd.text { width: 50%; display: block !important; }
p label { width: 7em; display: inline-block; }
.button, #add_attach {
background: #eee;
......@@ -39,6 +63,8 @@ p label { width: 7em; display: inline-block; }
#global ol li { list-style: decimal; }
#global ul.with-disc li { list-style: disc; margin-left: 2em; }
.confirm { display: inline; position: relative; }
/*.confirm:hover > div { display: block; }*/
.confirm_popup { position: fixed; top: 0; left: 0; width: 100%; height: 100%; z-index: 20; opacity: 30%; }
......@@ -50,7 +76,13 @@ p label { width: 7em; display: inline-block; }
.errorlist { font-size: .8em; color: red; }
table.listing, .pagination { width: 90%; margin: auto; }
table.listing thead td { font-weight: bold; border-bottom: 1px solid black; }
table.listing thead {
background: #ddd;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#dddddd');
background: -webkit-gradient(linear, left top, left bottom, from(white), to(#dddddd));
background: -moz-linear-gradient(top, #fff, #dddddd);
}
table.listing thead td { font-weight: bold; }
table.listing div.confirm_popup { right: 0; text-align: right; }
#content div.confirm_popup { left: 0; }
......@@ -86,7 +118,6 @@ table.tablesorter tr th, table.tablesorter tr td {
}
table.tablesorter tr th {
background-color: #f5f5f5;
border: 1px solid #ccc;
text-transform: capitalize;
font-weight: normal;
......@@ -132,11 +163,11 @@ table.tablesorter thead tr .headerSortDown {
background-image: url(/site_media/img/desc.gif);
}
table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
background-color: #8dbdd8;
background-color: #ddd;
}
table tr.filters {
background: #ddd;
background: #eee;
}
table tr.filters td{
......@@ -219,52 +250,36 @@ h1 span {
font-family: 'DroidSansRegular', Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif;
font-size: .8em;
font-weight: normal;
color: orange;
}
/* User */
#user {
#header #user {
position: absolute;
top: 0; right: 0;
width: 100%;
margin: 0; padding: .3em 0;
margin: 0;
padding: .3em 0;
background: #3d3d3d;
}
#user a {
color: #fff;
background: #2d2d2d;
font-size: 16px;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
}
#user p {
width: 960px;
margin: 0 auto;
text-align: right;
}
#user span,
#user a {
padding: .2em .5em;
}
#user a {
text-decoration: none;
color: #fff;
}
#user a:hover,
#user a:active,
#user a:focus {
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
-o-border-radius: 2px;
border-radius: 2px;
outline: none;
}
#user #login {
background: orange;
}
#user #login:hover,
#user #login:active,
#user #login:focus {
background: #ff6c00;
}
#user #register:hover,
#user #register:active,
#user #register:focus {
background: #6a6a6a;
#user a:hover {
color: orange;
}
/* Navigation menu */
......@@ -354,6 +369,11 @@ h1 span {
font-weight: normal;
}
#global h3 {
font: 24px 'DroidSansRegular', Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif;
margin-top: 1em;
}
/* View page */
......@@ -417,11 +437,9 @@ div.comment {
-o-border-radius: 2px;
border-radius: 2px;
}
#report h2 {
margin: 0 0 .9em 0; padding: 0;
font-family: 'DroidSansBold', Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif;
font-size: 20px;
font-weight: normal;
#description h3, #comments h3 {
margin: 0.5em 0;
color: orange;
}
#addForm.index input,
#addForm.index select,
......@@ -496,11 +514,11 @@ div.comment {
);
border-color: #444444;
}
#addForm.index label {
font-weight: bold;
}
#addForm.index p {
position: relative;
border-bottom: 1px solid #ccc;
padding-bottom: 1em;
}
#addForm.index .help_text {
position: absolute;
......@@ -705,11 +723,14 @@ ul.messages {
.mceToolbar { display:none; }
ul#report li#description {
margin: 1em 0;
padding: .8em 1em;
}
#comments {
margin-top: 1em;
padding: .8em 1em;
}
input[type="text"], input[type="textarea"] {
border: 1px solid #ccc;
border-radius: 2px;
box-shadow: 0 1px 2px rgba(0, 0, 0, .15) inset;
padding: 0.5em;
}
\ No newline at end of file
......@@ -7,9 +7,9 @@
<p>{% trans "This platform is a joint project by La Quadrature du Net, Bits of Freedom and individual contributors. It was launched on September 22nd, 2011." %}</p>
<p>{% trans "Organisations will submit reports to national and EU regulatory authorities if appropriate." %}</p>
<p>{% trans "For enquiries about the project, please contact:" %}</p>
<ul>
<li>{% trans "France" %}: <a href="http://www.laquadrature.net/">La Quadrature du Net</a>. Contact: contact[a]laquadrature.net</li>
<li>{% trans "Netherlands" %}: <a href="https://www.bof.nl/">Bits of Freedom</a>. Contact: info[a]bof.nl</li>
<ul class="with-disc">
<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>
</div>
{% endblock %}
......@@ -3,15 +3,15 @@
{% load i18n %}
{% block content %}
<div id='global'>
<p>{% trans "On the Internet, <strong>you</strong> decide what you do, right? <em>Not anymore!</em>" %}</p>
<h3>{% trans "On the Internet, <strong>you</strong> decide what you do, right? <em>Not anymore!</em>" %}</h3>
<p>{% trans "Large telecommunication providers want to control what you do online. They want to restrict access to internet telephony in order to force you to use their telephone services. They want to charge you for viewing of videos. They want to prohibit the use of specific software on their networks, or throttle innovative applications such as peer-to-peer filesharing." %}</p>
<p>{% trans "This must stop. We want to ensure that your freedom online is protected and that you decide which content you access, and which applications and services you use. Net neutrality is about your freedom online." %}</p>
<p>{% trans "Violations on Net Neutrality are bad for freedom of communication, freedom of choice, innovation and communication costs. They lead to a situation where the provider can decide what you do online, not you, and this restricts your freedom. It becomes more difficult for innovative companies to offer their services via the internet, because they may be blocked or slowed down by providers. And it leads to higher communication costs because you may have to pay extra to use cheap services such as internet telephony." %}</p>
<p>{% trans "We need to ensure that the Internet remains free, open and accessible for all. This is what Net Neutrality is about. The European Commission and national regulators need to prohibit providers from restricting your online traffic and do so before it is too late. In order to convince them about the urgency of this problem, we aim to create a comprehensive report of Net Neutrality violations in Europe. This website is the way to report these violations." %}</p>
<h3><a id="guidelines">{% trans "Guidelines for reporting cases" %}</a></h3>
<h3>{% trans "Guidelines for reporting cases" %}</h3>
<p>{% trans "In reporting violations of Net Neutrality on RespectMyNet.eu, please describe only connection issues that are related to traffic discrimination, that is to say cases where Internet access providers discriminate traffic according to the source, destination, type or actual content of the data transmitted over the network (i.e. if your provider blocks traffic coming from YouTube or slows down Usenet traffic). If possible, please verify whether indeed the provider can be blamed: sometimes it is just the server itself which is not working (i.e. if a website is down, this is obviously not the fault of the internet access provider)." %}</p>
<p>{% trans "Sample of common ISP issues that DO NOT require a formal complaint (from: <a href='http://www.ispreview.co.uk/new/complain/complain.shtml'>http://www.ispreview.co.uk/new/complain/complain.shtml</a>)" %}</p>
<ul>
<ul class="with-disc">
<li>
<p>{% trans "<b>Brief and Uncommon Critical Service (Email, Website Browsing etc.) Outages.</b>" %}</p>
<p>{% trans "Sadly, ISPs experience occasional problems with online services, such as email access. These are usually resolved after a few minutes or hours, an only very occasionally will they last longer than a day. Don't get too frustrated, inform them of your problem and allow some time for it to be resolved." %}</p>
......
......@@ -7,7 +7,7 @@
<p> {% trans "There are a lot of tools which make life easier for you. Here is a short selection." %}</p>
<h3>{% trans "Recommended tools" %}</h3>
<p>{% trans "These tools are probably the most helpful when it comes to tracking traffic discrimination." %}</p>
<ul>
<ul class="with-disc">
<li><h4><a href="http://www.neubot.org/">neubot</a></h4>
<p>{% trans "<em>Available for Mac OS X, Ubuntu (GNU/Linux) and Windows.</em>" %}</p>
<p>{% trans "Neubot is a research project on network neutrality of the NEXA Center for Internet & Society at Politecnico di Torino. The project is based on a lightweight open-source program that interested users can download and install on their computers. The program runs in background and periodically performs transmission tests with some test servers and with other instances of the program itself. These transmission tests probe the Internet using various application level protocols. The program saves tests results locally and uploads them on the project servers. The collected dataset contains samples from various Providers and allows to monitor network neutrality." %}</p>
......@@ -20,7 +20,7 @@
</ul>
<h3>{% trans "Additional tools" %}</h3>
<p>{% trans "These tools are interesting to test the overall quality of your Internet connections." %}</p>
<ul>
<ul class="with-disc">
<li><h4><a href="http://www.measurementlab.net/measurement-lab-tools#tool1">Network diagnostic tool</a></h4>
<p>{% trans "<em>Runs on any browser and on <a href='http://ndt.googlecode.com/files/AndroidNdt-1.0b1.apk'>Android</a>.</em>" %}</p>
<p>{% trans "Test your connection speed and receive sophisticated diagnosis of problems limiting speed." %}</p>
......
......@@ -77,16 +77,18 @@ $(document).ready(function() {
{%block content%}
<div id='global'>
<h2>{{v.operator}} ({{v.country}}) {{v.contract}}</h2>
<ul id="report">
{%if v.resource_name%}<li><dl><dt>{% trans "Resource" %}</dt><dd>{{v.resource_name}}</dd></dl></li>{%endif%}
{%if v.type%}<li><dl><dt>{% trans "Type" %}</dt><dd>{{v.type}}</dd></dl></li>{%endif%}
{%if v.media%}<li><dl><dt>{% trans "Media" %}</dt><dd>{{v.media}}</dd></dl></li>{%endif%}
{%if v.temporary%}<li><dl><dt>{% trans "Temporary restriction" %}</dt><dd>{{v.temporary}}</dd></dl></li>{%endif%}
{%if v.loophole%}<li><dl><dt>{% trans "Loophole offering" %}</dt><dd>{% trans "yes" %}</dd></dl></li>{%endif%}
{%if v.contractual%}<li><dl><dt>{% trans "Contractual restriction" %}</dt><dd>{% trans "yes" %}</dd></dl></li>{%endif%}
{%if v.contract_excerpt%}<li><dl><dt>{% trans "Contract excerpt" %}</dt><dd class='text'>{{v.contract_excerpt|safe}}</dd></dl></li>{%endif%}
{%if v.comment_set.all%}
<li id="description" class='round-box'>
<div id="report">
<dl>{%if v.resource_name%}<dt>{% trans "Resource" %}</dt><dd>{{v.resource_name}}</dd>{%endif%}
{%if v.type%}<dt>{% trans "Type" %}</dt><dd>{{v.type}}</dd>{%endif%}
{%if v.media%}<dt>{% trans "Media" %}</dt><dd>{{v.media}}</dd>{%endif%}
{%if v.temporary%}<dt>{% trans "Temporary restriction" %}</dt><dd>{{v.temporary}}</dd>{%endif%}
{%if v.loophole%}<dt>{% trans "Loophole offering" %}</dt><dd>{% trans "yes" %}</dd>{%endif%}
{%if v.contractual%}<dt>{% trans "Contractual restriction" %}</dt><dd>{% trans "yes" %}</dd>{%endif%}
{%if v.contract_excerpt%}<dt>{% trans "Contract excerpt" %}</dt><dd class='text'>{{v.contract_excerpt|safe}}</dd>{%endif%}
{%if v.comment_set.all%}</dl>
</div>
<div id="description" class='round-box'>
<h3>{%trans "Description" %}</h3>
{%for c in v.comment_set.all%}
<div class="description-node">
......@@ -104,8 +106,9 @@ $(document).ready(function() {
{%endif%}
</div>
{%endfor%}
</li>
</ul>
</div>
<h3>{%trans "Confirm this restriction if you experience it as well" %}</h3>
<div class="info-validate" style="display: inline-block;">
<form method="get" id="{{ v.pk }}" class="confirm_form" >
......
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