Skip to content
GitLab
Commit 120b5ef1 authored by okhin's avatar okhin 🚴
Browse files

Merge branch 'master' into 'feat_52' 

# Conflicts:
#   bt/admin.py
#   nnmon/urls.py
parents 937ea70a e67ab765
Hide whitespace changes
Inline Side-by-side
README.md
View file @ 120b5ef1
......@@ -14,6 +14,8 @@ uwsgi.
You need to install some development package to activate al the needed python
modules.
On Debian or Ubuntu, this will be done with the following command:
sudo apt-get install libxml2-dev libxslt-dev build-essential python-dev libsqlite3-dev libjpeg-dev zlib1g-dev libapache2-mod-uwsgi libapache2-mod-wsgi uwsgi-plugin-python libfreetype6-dev uwsgi
## Create a virtualenv
......@@ -28,7 +30,7 @@ application from there.
You need to git clone the repository:
git clone http:/git.laquadrature.net/la-quadrature-du-net/respect-my-net.git respect-my-net
git clone gitlab@git.laquadrature.net/la-quadrature-du-net/respect-my-net.git respect-my-net
## Install the module dependencies
......@@ -54,8 +56,8 @@ To run server, just do:
## Set-up uwsgi
You need to create an application for uwsgi. Create a file in
/etc/uwsgi/apps-available with the fllowing content. Adapat to your needs and
read the documentation:
`/etc/uwsgi/apps-available` with the following content. Adapt to your needs
and read the documentation:
[uwsgi]
plugins = python
......@@ -79,7 +81,7 @@ repository), chdir is the same path. Home, is the path of the virtualenv created
above.
Now you need to activate the apps by creating a symoblic link into
/etc/uwsgi/apps-enabled, and to restart uwsgi.
`/etc/uwsgi/apps-enabled`, and to restart uwsgi.
cd /etc/uwsgi/apps-enabled
ln -s ../apps-available/nnmond.conf
......@@ -94,7 +96,7 @@ need to actvivate the uwsgi module:
service apache2 restart
And now you need to create a VirtualHost in
/etc/apache2/sites-availabe/nnmon.conf
`/etc/apache2/sites-availabe/nnmon.conf`
<virtualhost *:80>
ServerName rmn.example.com
......@@ -114,4 +116,3 @@ production use, you should use a TLS VirtualHost.
a2ensite nnmon
service apache2 reload
bt/admin.py
View file @ 120b5ef1
from django.contrib import admin
from django.contrib.admin import AdminSite
from bt import models
class CommentInline(admin.TabularInline):
......@@ -8,7 +6,7 @@ class CommentInline(admin.TabularInline):
max_num = 1
class ViolationAdmin(admin.ModelAdmin):
list_display = ('state', 'country', 'operator', 'contract', 'resource_name', 'media', 'activationid', 'old')
list_display = ('state', 'country', 'operator', 'contract', 'resource_name', 'media', 'activationid', 'old', 'creation_date')
list_filter = ('state', 'operator_ref', 'contract', 'resource_name', 'media', 'country', 'old')
inlines = [CommentInline, ]
admin.site.register(models.Violation, ViolationAdmin)
......@@ -35,9 +33,4 @@ class OperatorAdmin(admin.ModelAdmin):
list_display = ("__unicode__", "reported_violations")
search_fields = ('name', )
pass
admin.site.register(models.Operator, OperatorAdmin)
class ManagerSite(AdminSite):
site_header = 'Manager Site'
manager_site = ManagerSite(name='manager')
admin.site.register(models.Operator, OperatorAdmin)
\ No newline at end of file
bt/forms.py
View file @ 120b5ef1
from django import forms
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext as _
from haystack.forms import SearchForm
from haystack.query import SearchQuerySet
from bt.models import Violation, COUNTRIES, RESOURCES, TYPES, MEDIA
......
nnmon/static/img/noise.png
View replaced file @ 937ea70a View file @ 120b5ef1
nnmon/static/img/noise.png

22.5 KB | W: | H:

nnmon/static/img/noise.png

22.5 KB | W: | H:

nnmon/static/img/noise.png
nnmon/static/img/noise.png
nnmon/static/img/noise.png
nnmon/static/img/noise.png
  • 2-up
  • Swipe
  • Onion skin
nnmon/templates/base.html
View file @ 120b5ef1
......@@ -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>
nnmon/templates/index.html
View file @ 120b5ef1
......@@ -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>
......
nnmon/urls.py
View file @ 120b5ef1
......@@ -2,11 +2,10 @@ from django.conf.urls import patterns, include, url
from django.views.generic import TemplateView, RedirectView
from django.conf import settings
from django.contrib import admin
from bt import views as bt
from bt.feeds import RssSiteNewsFeed, AtomSiteNewsFeed
from bt.api import APIResource, OperatorResource
from bt.admin import manager_site
api_resource = APIResource()
operator_api_resource = OperatorResource()
......@@ -85,9 +84,6 @@ urlpatterns = patterns('',
bt.ViolationSearchView.as_view(template_name='search/search.html')),
# Language switch
url(r'^i18n/', include('django.conf.urls.i18n')),
# Manager admin site
url(r'^manager/', manager_site.urls),
)
if settings.DEV_SERVER == True:
......@@ -95,4 +91,4 @@ if settings.DEV_SERVER == True:
(r'^site_media/(?P<path>.*)$',
'django.views.static.serve',
{'document_root': settings.MEDIA_PATH}),
)
)
\ No newline at end of file
Supports Markdown
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