Commit e67ab765 authored by okhin's avatar okhin 🚴

Merge branch '62-there-is-unwished-and-unneeded-scrolling-on-the-homepage' into 'master'

Fix the unneeded horizontal scrolling on the homepage

Closes #62

See merge request !49
parents 75bd5c90 180afaf5
Pipeline #987 passed with stage
in 8 seconds
......@@ -106,94 +106,96 @@
</div>
</nav>
{% if messages %}
{% for message in messages %}
<div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
<button tye="button" class="close" data-dismiss="alert" aria-lable={% trans "Close" %}><span aria-hidden="true">&times;</span></button>
{{message|safe}}
</div>
{% endfor %}
{% endif %}
<div id="wrapper">
<div class="container-fluid">
<div class="row">
<div class="col-xs-12 col-md-8 col-md-offset-2">
{% block content %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-8 col-md-offset-2">
{% block other_content %}
{% endblock %}
</div>
{% if messages %}
{% for message in messages %}
<div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
<button tye="button" class="close" data-dismiss="alert" aria-lable={% trans "Close" %}><span aria-hidden="true">&times;</span></button>
{{message|safe}}
</div>
{% endfor %}
{% endif %}
<div id="wrapper">
<div class="container-fluid">
<div class="row">
<div class="col-xs-12 col-md-8 col-md-offset-2">
{% block content %}
{% endblock %}
</div>
</div>
</div>
<div id="footer" class="container-fluid">
<div class="row">
<div class="col-md-10 col-md-offset-1">
<p style="padding:25px 5% 10px 5%;">{% trans "RespectMyNet.eu is an online platform enabling citizens to report net neutrality violations. Everyone is invited to report blocking or throttling of their Internet access or unfair discrimination between online services. This will help to shed light on those harmful practices and provide evidence to the telecom regulators to do their duty to defend the open and innovative Internet in Europe." %}</p>
<ul>
<li class="logo-org">
<a href="https://www.accessnow.org/"> <img alt="Access Now logo" src="/static/img/logos/accessnow.png" /><br> Access Now </a>
</li>
<li class="logo-org">
<a href="https://www.laquadrature.net/"> <img alt="LQDN logo" src="/static/img/logos/la-quadrature-du-net.png" /><br> La Quadrature du Net </a>
</li>
<li class="logo-org">
<a href="https://www.bof.nl/"> <img alt="BoF logo" src="/static/img/logos/Bits-of-Freedom.png" /><br> Bits of Freedom </a>
</li>
<li class="logo-org">
<a href="https://digitalegesellschaft.de"> <img alt="Digitale Gesellschaft logo" src="/static/img/logos/digitalegesellschaft.png" /><br> Digitale Gesellschaft </a>
</li>
<li class="logo-org">
<a href="https://edri.org/"> <img alt="EDRI logo" src="/static/img/logos/edri.png" /><br> European Digital Rights </a>
</li>
<li class="logo-org">
<a href="https://epicenter.works/"> <img alt="epicenter.works logo" src="/static/img/logos/epicenterworks.png" /><br> epicenter.works </a>
</li>
<li class="logo-org">
<a href="https://itpol.dk/"> <img alt="IT-Politisk Forening logo" src="/static/img/logos/ITpollogo.png" /><br> IT-Politisk Forening </a>
</li>
<li class="logo-org">
<a href="http://nurpa.be/"> <img alt="NURPA logo" src="/static/img/logos/nurpa.png" /><br> Nurpa </a>
</li>
<li class="logo-org">
<a href="https://www.openrightsgroup.org/"> <img alt="ORG logo" src="/static/img/logos/org.png" /><br> Open Rights Group </a>
</li>
<li class="logo-org">
<a href="https://xnet-x.net"> <img alt="Xnet logo" src="/static/img/logos/Xnet.png" /><br> Xnet </a>
</li>
<li class="logo-org">
<a href="https://www.digitale-gesellschaft.ch"> <img alt="Digitale Gesellschaft logo" src="/static/img/digitale.png" /><br> Digitale Gesellschaft Schweiz</a>
</li>
</ul>
</div>
{% block footer %}
{% endblock %}
<div class="row">
<hr/>
</div>
<div class="row">
<div class="col-xs-10 col-xs-offset-1">
<p>Respect My Net is licenced under the <a rel="licence" href="https://www.gnu.org/licenses/agpl.html"><img src="https://www.gnu.org/graphics/agplv3-88x31.png">GNU Affero GPL v3.0+</a>, the code is available under the git repository <a href="https://git.laquadrature.net/la-quadrature-du-net/respect-my-net">https://git.laquadrature.net/la-quadrature-du-net/respect-my-net</a></p>
<p><a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/80x15.png" /></a>User submitted content (comments and cases) is licenced under the term of the <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>, their original author needs to be credited.</p>
</div>
<div class="col-xs-12 col-md-8 col-md-offset-2">
{% block other_content %}
{% endblock %}
</div>
</div>
<script type="text/javascript" src="/static/js/tinymce/tinyMCE/tinymce.min.js"></script>
<script type="text/javascript" src="/static/js/jquery.min.js"></script>
<script type="text/javascript" src="/static/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="/static/js/jquery.tablesorter.js"> </script>
<script type="text/javascript" src="/static/js/jquery.tablesorter.widgets.js"></script>
<script type="text/javascript" src="/static/js/picnet.table.filter.min.js"></script>
<script type="text/javascript" src='/static/js/d3.min.js'></script>
<script type="text/javascript" src='/static/js/topojson.min.js'></script>
<script type="text/javascript" src='/static/js/datamaps.js'></script>
<script type="text/javascript" src="/static/js/nnmon.js"></script>
<script type="text/javascript" src="/static/js/bootstrap.js"></script>
{% block scripts %}
{% endblock %}
</div>
</div>
<div id="footer" class="container-fluid">
<div class="row">
<div class="col-md-10 col-md-offset-1">
<p style="padding:25px 5% 10px 5%;">{% trans "RespectMyNet.eu is an online platform enabling citizens to report net neutrality violations. Everyone is invited to report blocking or throttling of their Internet access or unfair discrimination between online services. This will help to shed light on those harmful practices and provide evidence to the telecom regulators to do their duty to defend the open and innovative Internet in Europe." %}</p>
<ul>
<li class="logo-org">
<a href="https://www.accessnow.org/"> <img alt="Access Now logo" src="/static/img/logos/accessnow.png" /><br> Access Now </a>
</li>
<li class="logo-org">
<a href="https://www.laquadrature.net/"> <img alt="LQDN logo" src="/static/img/logos/la-quadrature-du-net.png" /><br> La Quadrature du Net </a>
</li>
<li class="logo-org">
<a href="https://www.bof.nl/"> <img alt="BoF logo" src="/static/img/logos/Bits-of-Freedom.png" /><br> Bits of Freedom </a>
</li>
<li class="logo-org">
<a href="https://digitalegesellschaft.de"> <img alt="Digitale Gesellschaft logo" src="/static/img/logos/digitalegesellschaft.png" /><br> Digitale Gesellschaft </a>
</li>
<li class="logo-org">
<a href="https://edri.org/"> <img alt="EDRI logo" src="/static/img/logos/edri.png" /><br> European Digital Rights </a>
</li>
<li class="logo-org">
<a href="https://epicenter.works/"> <img alt="epicenter.works logo" src="/static/img/logos/epicenterworks.png" /><br> epicenter.works </a>
</li>
<li class="logo-org">
<a href="https://itpol.dk/"> <img alt="IT-Politisk Forening logo" src="/static/img/logos/ITpollogo.png" /><br> IT-Politisk Forening </a>
</li>
<li class="logo-org">
<a href="http://nurpa.be/"> <img alt="NURPA logo" src="/static/img/logos/nurpa.png" /><br> Nurpa </a>
</li>
<li class="logo-org">
<a href="https://www.openrightsgroup.org/"> <img alt="ORG logo" src="/static/img/logos/org.png" /><br> Open Rights Group </a>
</li>
<li class="logo-org">
<a href="https://xnet-x.net"> <img alt="Xnet logo" src="/static/img/logos/Xnet.png" /><br> Xnet </a>
</li>
<li class="logo-org">
<a href="https://www.digitale-gesellschaft.ch"> <img alt="Digitale Gesellschaft logo" src="/static/img/digitale.png" /><br> Digitale Gesellschaft Schweiz</a>
</li>
</ul>
</div>
</div>
{% block footer %}
{% endblock %}
<div class="row">
<hr/>
</div>
<div class="row">
<div class="col-xs-10 col-xs-offset-1">
<p>Respect My Net is licenced under the <a rel="licence" href="https://www.gnu.org/licenses/agpl.html"><img src="https://www.gnu.org/graphics/agplv3-88x31.png">GNU Affero GPL v3.0+</a>, the code is available under the git repository <a href="https://git.laquadrature.net/la-quadrature-du-net/respect-my-net">https://git.laquadrature.net/la-quadrature-du-net/respect-my-net</a></p>
<p><a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/80x15.png" /></a>User submitted content (comments and cases) is licenced under the term of the <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>, their original author needs to be credited.</p>
</div>
</div>
</div>
<script type="text/javascript" src="/static/js/tinymce/tinyMCE/tinymce.min.js"></script>
<script type="text/javascript" src="/static/js/jquery.min.js"></script>
<script type="text/javascript" src="/static/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="/static/js/jquery.tablesorter.js"> </script>
<script type="text/javascript" src="/static/js/jquery.tablesorter.widgets.js"></script>
<script type="text/javascript" src="/static/js/picnet.table.filter.min.js"></script>
<script type="text/javascript" src='/static/js/d3.min.js'></script>
<script type="text/javascript" src='/static/js/topojson.min.js'></script>
<script type="text/javascript" src='/static/js/datamaps.js'></script>
<script type="text/javascript" src="/static/js/nnmon.js"></script>
<script type="text/javascript" src="/static/js/bootstrap.js"></script>
{% block scripts %}
{% endblock %}
</body>
</html>
......@@ -135,7 +135,7 @@ $("#btn_dismiss").click(function(event) {
<input type="email" id="email-{{ violation.pk }}" class="form-control" name="email" placeholder="Email"/>
<input type="hidden" id="id-{{ violation.pk }}" value="{{ violation.pk }}" />
<div class="btn-group" role="group" aria-label="confirm-deny">
<button class="btn btn-success">{% trans "OK" %}</ button>
<button class="btn btn-success">{% trans "OK" %}</button>
<button data-toggle="collapse" data-target="#info-{{ violation.pk}}" aria-expanded="false" aria-controls="info-{{ volation.pk }}" type="button" class="btn btn-danger" >{% trans "Cancel" %}</button>
</div>
</div>
......@@ -226,7 +226,6 @@ $("#btn_dismiss").click(function(event) {
<p>{% trans "Those are cases that might be similar to yours, please feel free to add your input on those cases instead of adding yours if they overlap." %}</p>
<dl id="modal-list">
</dl>
</table>
</div>
<div class="modal-footer">
<button type="button" id="btn_dismiss" class="btn btn-default" data-dismiss="modal">{% trans "Dismiss" %}</button>
......
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