Commit 4c5ebdee authored by stef's avatar stef
Browse files

[enh] added design

parent 17ea215b
...@@ -82,3 +82,182 @@ table.tablesorter thead tr .headerSortDown { ...@@ -82,3 +82,182 @@ table.tablesorter thead tr .headerSortDown {
table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
background-color: #8dbdd8; background-color: #8dbdd8;
} }
/* Main and bug fix
---------------------------*/
html {
font-size: 100%;
}
body {
margin: 0; padding: 0;
font-family: Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif;
font-size: .9em;
line-height: 1.4;
color: #231f20;
background: #fff;
}
img {
border: 0;
vertical-align: middle;
}
h1, h2, h3, h4, div, ul {
margin: 0; padding: 0;
}
blockquote {
font-style: italic;
}
/* Header
---------------------------*/
#header-container {
background: url('../images/background.png') repeat-x bottom #f9f9f9;
}
#header {
max-width: 960px;
margin: 0 auto;
background: #f9f9f9;
}
h1 {
margin: 25px 0 0 0; padding: .8em 0;
}
h1 span {
display: block;
font-size: .8em;
font-weight: normal;
}
/* User */
#user {
position: absolute;
top: 0; right: 0;
width: 100%;
margin: 0; padding: .3em 0;
color: #fff;
background: #2d2d2d;
}
#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;
}
/* Navigation menu */
#nav {
height: 36px;
margin: 0; padding: 0;
list-style-type: none;
border-bottom: 1px solid #ddd;
}
#nav li {
display: inline-block;
}
#nav #current {
color: #231f20;
background: #fff;
border: 1px solid #ddd;
border-bottom: 1px solid #fff;
}
#nav #current:hover,
#nav #current:active,
#nav #current:focus {
font-weight: bold;
}
#nav a {
display: block;
height: 19px;
padding: 8px 1em;
text-decoration: none;
color: #ccc;
border: 1px solid #f0f0f0;
border-bottom-color: #ddd;
-moz-border-radius: 2px 2px 0 0;
-webkit-border-radius: 2px 2px 0 0;
-o-border-radius: 2px 2px 0 0;
border-radius: 2px 2px 0 0;
}
#nav a:hover,
#nav a:active,
#nav a:focus {
color: #231f20;
background: #fff;
border: 1px solid #ddd;
border-bottom-color: #fff;
outline: none;
}
/* Content layout
---------------------------*/
#global {
position: relative;
width: 960px;
margin: 25px auto 0 auto;
}
/* Content */
#content {
width: 610px;
}
#content a {
color: #4183c4;
text-decoration: none;
}
#content a:hover,
#content a:active,
#content a:focus {
text-decoration: underline;
outline: none;
}
/* Infrigement form */
#report, #addForm.index {
position: absolute;
top: -62px; right: 0;
width: 300px;
padding: 1em;
background: #e9f1f4;
border: 1px solid #d8dee2;
border-bottom-width: 2px;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
-o-border-radius: 2px;
border-radius: 2px;
}
#report h2 {
margin: 0;
}
...@@ -140,6 +140,14 @@ INSTALLED_APPS = ( ...@@ -140,6 +140,14 @@ INSTALLED_APPS = (
# 'django.contrib.admindocs', # 'django.contrib.admindocs',
) )
TEMPLATE_CONTEXT_PROCESSORS = ("django.contrib.auth.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
"django.core.context_processors.static",
'django.core.context_processors.request',
"django.contrib.messages.context_processors.messages")
# A sample logging configuration. The only tangible logging # A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to # performed by this configuration is to send an email to
# the site admins on every HTTP 500 error. # the site admins on every HTTP 500 error.
......
{% load i18n %}{% load bt %}<?xml version="1.0" encoding="utf-8"?> {% load i18n %}{% load bt %}<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="hu" xml:lang="hu"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="content-language" content="en" /> <meta http-equiv="content-language" content="en" />
...@@ -12,39 +12,46 @@ ...@@ -12,39 +12,46 @@
<link rel="alternate" type="application/rss+xml" title="RSS feed" href="/rss/"> <link rel="alternate" type="application/rss+xml" title="RSS feed" href="/rss/">
{% block rss %} {% block rss %}
{% endblock %} {% endblock %}
{% block scripts %}
{% endblock %}
<link rel="stylesheet" type="text/css" media="all" href="{% media_url %}/css/style.css" /> <link rel="stylesheet" type="text/css" media="all" href="{% media_url %}/css/style.css" />
{% block styles %} {% block styles %}
{% endblock %} {% endblock %}
</head> </head>
<body> <body>
<div id="wrapper">
<div id="header-container">
<div id="header">
<h1>NNMon <span>Net Neutrality Monitor</span></h1>
<div id="user"><p>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<div id="auth" class="menu"> {{ user.username }},
{{ user.username }}
<a href="{%root_url%}/accounts/logout">{% trans "Logout" %}</a> <a href="{%root_url%}/accounts/logout">{% trans "Logout" %}</a>
<span>or</span>
<a href="{%root_url%}/admin/">{% trans "Admin" %}</a> <a href="{%root_url%}/admin/">{% trans "Admin" %}</a>
</div> {% else %}
{% endif %} <a href="#" id="login">{% trans "Login" %}</a>
<div id="menu" class="menu"> {% endif %}
<a href="{%root_url%}/">{% trans "Home" %}</a> </p></div>
<a href="{%root_url%}/list">{% trans "Infringements" %}</a>
<a href="{%root_url%}/about">{% trans "What's Net Neutrality" %}</a> <ul id="nav">
<a href="{%root_url%}/start">{% trans "Start Monitoring" %}</a> <li><a {% if request.path == '/' %}id="current" {% endif %}href="{%root_url%}/">{% trans "Home" %}</a></li>
<a href="{%root_url%}/contact/">{% trans "Contact" %}</a> <li><a {% if request.path == '/list/' %}id="current" {% endif %}href="{%root_url%}/list">{% trans "Infringements" %}</a></li>
</div> <li><a {% if request.path == '/about/' %}id="current" {% endif %}href="{%root_url%}/about">{% trans "What's Net Neutrality" %}</a></li>
<li><a {% if request.path == '/start/' %}id="current" {% endif %}href="{%root_url%}/start">{% trans "Start Monitoring" %}</a></li>
<li><a {% if request.path == '/contact/' %}id="current" {% endif %}href="{%root_url%}/contact">{% trans "Contact" %}</a></li>
</ul></div>
</div>
</div>
{% block content %} {% block content %}
{% endblock %} {% endblock %}
{% block other_content %} {% block other_content %}
{% endblock %} {% endblock %}
<hr style="clear: both" />
<div id='footer'> <div id='footer'>
{% if not user.is_authenticated %}
<a href="{%root_url%}/accounts/login">{% trans "Login" %}</a>
{% endif %}
{% block footer %} {% block footer %}
{% endblock %} {% endblock %}
</div> </div>
{% block scripts %}
{% endblock %}
</body> </body>
</html> </html>
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
{% block styles %} {% block styles %}
<link rel="stylesheet" type="text/css" media="all" href="{% media_url %}/css/jquery.autocomplete.css" /> <link rel="stylesheet" type="text/css" media="all" href="{% media_url %}/css/jquery.autocomplete.css" />
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript" src="{%media_url%}/js/tinymce/tiny_mce.js"></script> <script type="text/javascript" src="{%media_url%}/js/tinymce/tiny_mce.js"></script>
<script type="text/javascript" src="{%media_url%}/js/jquery.1.4.2.min.js"></script> <script type="text/javascript" src="{%media_url%}/js/jquery.1.4.2.min.js"></script>
...@@ -71,7 +72,7 @@ $(document).ready(function(){ ...@@ -71,7 +72,7 @@ $(document).ready(function(){
{% endblock %} {% endblock %}
{%block content%} {%block content%}
<div id='container'> <div id='global'>
{% if messages %} {% if messages %}
<ul class="messages"> <ul class="messages">
{% for message in messages %} {% for message in messages %}
...@@ -96,24 +97,24 @@ $(document).ready(function(){ ...@@ -96,24 +97,24 @@ $(document).ready(function(){
{% csrf_token %} {% csrf_token %}
<input id="save_button" type="submit" value="{% trans "save" %}" /> <input id="save_button" type="submit" value="{% trans "save" %}" />
</form> </form>
</div> </div>
<div id='content'> <div id='content'>
<h2>{% trans "On Internet, you decide what you do, right? Not anymore!" %}</h2> <h2>{% trans "On Internet, you decide what you do, right? Not anymore!" %}</h2>
<p>{% trans "Large telecommunication providers want to control what you do online. They want to block and throttle some of your communications, and charge you for using some online services, content and applications." %}</p> <p>{% trans "Large telecommunication providers want to control what you do online. They want to block and throttle some of your communications, and charge you for using some online services, content and applications." %}</p>
<p>{% trans "Now is the time to fight back!" %}</p> <p>{% trans "Now is the time to fight back!" %}</p>
<p>{% trans "Help us chart all the ways that internet providers are violating our online freedom. Tell us about how *your* landline or mobile Internet provider restricts your connection. You can do so in less than two minutes!" %}</p> <p>{% trans "Help us chart all the ways that internet providers are violating our online freedom. Tell us about how *your* landline or mobile Internet provider restricts your connection. You can do so in less than two minutes!" %}</p>
<p>{% trans "We will report these violations to the European Commission and national authorities and require action to address them." %}</p> <p>{% trans "We will report these violations to the European Commission and national authorities and require action to address them." %}</p>
</div> </div>
<div id='latest3'> <div id='latest3'>
<h2>{% trans "Latest Infringements" %}</h2> <h2>{% trans "Latest Infringements" %}</h2>
<table> <table>
<thead> <thead>
<tr> <tr>
<th>{% trans "Infringing offering" %}</th> <th>{% trans "Infringing offering" %}</th>
<th>{% trans "Confirmed" %}</th> <th>{% trans "Confirmed" %}</th>
<th>{% trans "I Confirm" %}</th> <th>{% trans "I Confirm" %}</th>
</tr> </tr>
</thead> </thead>
{% for violation in violations %} {% for violation in violations %}
<tbody> <tbody>
<tr> <tr>
......
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