Commit ffdb5e3f authored by root's avatar root
Browse files

Merge branch 'master' of http://github.com/Cynddl/nnmon

Conflicts:
	media/css/style.css
parents 8855aa3d 93df2de5
......@@ -43,7 +43,7 @@ p label { width: 7em; display: inline-block; }
table.listing, .pagination { width: 90%; margin: auto; }
table.listing thead td { font-weight: bold; border-bottom: 1px solid black; }
table.listing div.confirm_popup { right: 0; text-align: right; }
div#latest3 div.confirm_popup { left: 0; }
#content div.confirm_popup { left: 0; }
.cell-link { display: block; text-decoration: none; color: #000; }
......@@ -156,6 +156,11 @@ blockquote {
margin: 0 auto;
background: #f9f9f9;
}
#header a {
color: #222;
text-decoration: none;
}
h1 {
margin: 25px 0 0 0; padding: 30px 0;
font-family: 'DroidSansBold', Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif;
......@@ -267,7 +272,7 @@ h1 span {
#global {
position: relative;
width: 960px;
margin: 25px auto 0 auto;
margin: 25px auto 50px auto;
}
/* Content */
......@@ -295,6 +300,20 @@ h1 span {
font-weight: normal;
}
/* View page */
div#comments {
border: 5px solid #f0f0f0;
padding: 0.5em;
}
dl#comments {
background-color: #f5f5f5;
padding: 0.5em;
}
/* Infrigement form */
#addForm.index {
......
......@@ -108,8 +108,6 @@ $(document).ready(function(){
<h2>{% trans "On Internet, you decide what you do, right? Not anymore!" %}</h2>
<p>{% trans "We all rely more and more on our access to Internet to do serious things like find jobs and fun things like chat with friends. But telco's are increasingly trying to control your behavior online, by restricting the things you are doing on the internet. Now you have a chance to do something about that!" %}</p>
<p>{% trans "Help us chart all the ways that internet providers are violating our online freedom: Is your operator blocking or throttling your Internet communications, for instance by making it impossible to use chat programs or charging extra for Internet telephony? Let us know by filling up this form (it takes less than two minutes!). We will make sure that the relevant authorities are informed, so that we can put an end to this." %}</p>
</div>
<div id='latest3'>
<h2>{% trans "Latest Infringements" %}</h2>
<table>
<thead>
......
......@@ -74,6 +74,7 @@ $(document).ready(function() {
</ul>
{%endif%}
{% if not key %}
<div id="comments">
<h3>{% trans "Comments" %}</h3>
{% render_comment_list for v %}
<div class="toggle button">{% trans "Add comment" %}</div>
......@@ -83,6 +84,7 @@ $(document).ready(function() {
{% else %}
<a class="button" href='/moderate/?key={{key}}&action=approve'>Approve Submission</a>
<a class="button" href='/moderate/?key={{key}}&action=delete'>Delete Submission</a>
</div>
{% endif %}
</div>
{%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