Commit 82402758 authored by stef's avatar stef
Browse files

Merge branch 'master' of /home/stf/file.bundle

parents 4d86d16d c1523891
......@@ -22,7 +22,7 @@ class AddViolation(forms.Form):
contract = forms.CharField(required=True, max_length=256, help_text=_('The specific contract at the ISP provider. (please be as specific as possible)'))
media = forms.ChoiceField(required=False, choices=(('',''),)+tuple(sorted(MEDIA,key=itemgetter(1))), label=_('Is the Internet connection over mobile or fixed line?'))
comment = forms.CharField(required=True, widget=AdvancedEditor(), label=_('Please describe the symptoms you are experiencing. What service or site, or person is unavailable or seems artificially slowed down.'))
email = forms.EmailField(required=True, help_text=_("We need your email to validate your report. We're not abusing your trust."))
email = forms.EmailField(required=True, help_text=_("We need your email to validate your report. Your email address is obligatory, but we willl never use your personal data for anything else than checking the submission."))
nick = forms.CharField(required=False, help_text=_("We need some name to display that instead of an email address."))
attachments = MultiFileField(required=False, label=_("Attach screenshot, document or any other relevant information."))
resource = forms.ChoiceField(required=False, choices=(('',''),)+tuple(sorted(RESOURCES,key=itemgetter(1))), label=_('What is the affected resource.'))
......@@ -32,4 +32,4 @@ class AddViolation(forms.Form):
loophole = forms.BooleanField(required=False, label=_('Is there another offer provided by this Operator which removes this restriction?'))
contractual = forms.BooleanField(required=False, label=_('Is the restriction described in the users contract?'))
contract_excerpt = forms.CharField(required=False, widget=AdvancedEditor(), label=_('Please copy the relevant section describing the restriction from the user contract.'))
captcha = CaptchaField(label=_("Unfortunately we must protect against automatic attacks, please forgive us this inconvenience."))
captcha = CaptchaField(label=_("Unfortunately we must protect against automatic attacks, please forgive us this inconvenience. (note the + and the * are somewhat confusing)"))
......@@ -483,4 +483,80 @@ h1 span {
color: #fff;
background: rgba(0, 0, 0, .9);
}
#content table {
border-collapse: collapse;
border-spacing: 0;
}
#content table {
width: 100%;
margin-bottom: 18px;
padding: 0;
border-collapse: separate;
*border-collapse: collapse;
font-size: 13px;
border: 1px solid #ddd;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
#content table th, table td {
padding: 10px 10px 9px;
line-height: 18px;
text-align: left;
}
#content table th {
padding-top: 9px;
font-weight: bold;
vertical-align: middle;
border-bottom: 1px solid #ddd;
}
#content table td {
vertical-align: top;
}
#content table th + th, table td + td {
border-left: 1px solid #ddd;
}
#content table tr + tr td {
border-top: 1px solid #ddd;
}
#content table tbody tr:first-child td:first-child {
-webkit-border-radius: 4px 0 0 0;
-moz-border-radius: 4px 0 0 0;
border-radius: 4px 0 0 0;
}
#content table tbody tr:first-child td:last-child {
-webkit-border-radius: 0 4px 0 0;
-moz-border-radius: 0 4px 0 0;
border-radius: 0 4px 0 0;
}
#content table tbody tr:last-child td:first-child {
-webkit-border-radius: 0 0 0 4px;
-moz-border-radius: 0 0 0 4px;
border-radius: 0 0 0 4px;
}
#content table tbody tr:last-child td:last-child {
-webkit-border-radius: 0 0 4px 0;
-moz-border-radius: 0 0 4px 0;
border-radius: 0 0 4px 0;
}
#content .zebra-striped tbody tr:nth-child(odd) td {
background-color: #f9f9f9;
}
#content .zebra-striped tbody tr:hover td {
background-color: #f5f5f5;
}
#content .zebra-striped .header {
cursor: pointer;
}
#content .zebra-striped .header:after {
content: "";
float: right;
margin-top: 7px;
border-width: 0 4px 4px;
border-style: solid;
border-color: #000 transparent;
visibility: hidden;
}
/* Infrigement form */
......@@ -20,7 +20,7 @@
<div id="wrapper">
<div id="header-container">
<div id="header">
<h1>NNMon <span>Net Neutrality Monitor</span></h1>
<h1><a href="/">NNMon <span>Net Neutrality Monitor</span></a></h1>
<div id="user"><p>
{% if user.is_authenticated %}
......
......@@ -92,7 +92,7 @@ $(document).ready(function(){
{% for field in form %}
{% if field.html_name = 'resource' %}<div id="show_optionals">{% trans "Provide optional details" %}</div><div id="optional">{%endif%}
<div class="fieldWrapper">
<span class="help_text">{{ field.help_text }}</span>
{% if field.help_text %}<span class="help_text">{{ field.help_text }}</span>{% endif %}
<span class="innerfield">
{{ field.errors }}
{{ field.label_tag }} {{ field }}
......
......@@ -23,7 +23,7 @@ function bindPostCommentHandler() {
cache: false,
dataType: "html",
success: function(html, textStatus) {
$('#comment_form form').replaceWith(html);
$('#comment_form form').replaceWith(html+"It will appear here after moderation.");
bindPostCommentHandler();
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
......
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