Commit c16ad5bb authored by Christophe Siraut's avatar Christophe Siraut

Use fancy alerts.

parent 83de328e
...@@ -5,9 +5,8 @@ ...@@ -5,9 +5,8 @@
{% block title %}Nuages - {{object}}{% endblock %} {% block title %}Nuages - {{object}}{% endblock %}
{% block head %} {% block head %}
<script src="{% static 'js/jquery.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/bootstrap-datetimepicker.js' %}"></script>
<link href="{% static 'css/datetimepicker.css' %}" rel="stylesheet" type="text/css"/> <link href="{% static 'css/datetimepicker.css' %}" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="{% static 'js/bootstrap-datetimepicker.js' %}"></script>
{% endblock %} {% endblock %}
{% block main %} {% block main %}
......
...@@ -15,13 +15,11 @@ ...@@ -15,13 +15,11 @@
{% block main %} {% block main %}
<h1>{{object}}</h1> <h1>{{object}}</h1>
<div class="row"> <div>
<div class="span9">
<blockquote> <blockquote>
<p>{{object.description}}</p> <p>{{object.description}}</p>
<small>{% trans "Posted by" %} <em>{% if object.user %}{{object.user}}{% else %}{% trans 'Anonymous' %}{% endif %}</em> {% trans "on" %} {{object.pub_date|date:"d F"}}.</small> <small>{% trans "Posted by" %} <em>{% if object.user %}{{object.user}}{% else %}{% trans 'Anonymous' %}{% endif %}</em> {% trans "on" %} {{object.pub_date|date:"d F"}}.</small>
</blockquote> </blockquote>
</div>
</div> </div>
<table class="bigtable"> <table class="bigtable">
<tr> <tr>
......
...@@ -27,5 +27,5 @@ DATABASES = { ...@@ -27,5 +27,5 @@ DATABASES = {
MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media') MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media')
STATIC_ROOT = os.path.join(PROJECT_DIR, 'staticroot') STATIC_ROOT = os.path.join(PROJECT_DIR, 'staticroot')
INSTALLED_APPS += ( INSTALLED_APPS += (
'debug_toolbar', # 'debug_toolbar',
) )
...@@ -46,7 +46,6 @@ a { ...@@ -46,7 +46,6 @@ a {
} }
h1 { h1 {
font-size: 1.9em;
margin-bottom: 0.1em; margin-bottom: 0.1em;
color: #5c5c49; color: #5c5c49;
} }
......
...@@ -6,7 +6,7 @@ body { ...@@ -6,7 +6,7 @@ body {
font-size: 16px; color: #555; } font-size: 16px; color: #555; }
a { color: #02749C; border-bottom: 1px solid #ddd; text-decoration: none; } a { color: #02749C; border-bottom: 1px solid #ddd; text-decoration: none; }
a:hover { border-bottom: 1px solid #2294aC; text-decoration: none;} a:hover { border-bottom: 1px solid #2294aC; text-decoration: none;}
.container { max-width: 960px; margin: 0 auto; padding: 0 6px 0 12px; } .box { max-width: 960px; margin: 0 auto; }
.lead { font-size: 20px; padding: 12px 24px 0 24px; } .lead { font-size: 20px; padding: 12px 24px 0 24px; }
h1 { font-family: 'Georgia', serif; font-weight: normal; } h1 { font-family: 'Georgia', serif; font-weight: normal; }
.header { height: 165px; } .header { height: 165px; }
...@@ -14,9 +14,11 @@ h1 { font-family: 'Georgia', serif; font-weight: normal; } ...@@ -14,9 +14,11 @@ h1 { font-family: 'Georgia', serif; font-weight: normal; }
font-size: 50px; padding-top: 50px; height: 120px; } font-size: 50px; padding-top: 50px; height: 120px; }
.header h1 span, .header p { display: none; } .header h1 span, .header p { display: none; }
.indent { margin-left: 24px; } .indent { margin-left: 24px; }
h1 { font-size: 30px; } .alert { padding: 12px; font-size: 15px; margin-bottom: 0;}
h2 { font-size: 24px; margin: 25px 0 5px 0; } .alert-dismissable .close, .alert-dismissible .close { right: 5px; }
h3 { font-size: 19px; margin: 25px 0 5px 0; } h1 { font-size: 32px; }
h2 { font-size: 24px; }
h3 { font-size: 19px; }
textarea, code, textarea, code,
pre { font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono', pre { font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono',
'Bitstream Vera Sans Mono', monospace!important; font-size: 15px; 'Bitstream Vera Sans Mono', monospace!important; font-size: 15px;
...@@ -24,14 +26,14 @@ pre { font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono', ...@@ -24,14 +26,14 @@ pre { font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono',
pre { padding: 7px 30px; line-height: 1.3; } pre { padding: 7px 30px; line-height: 1.3; }
.ig { color: #888; } .ig { color: #888; }
p { 1.42857; } p { 1.42857; }
ul { margin: 15px 0 15px 0; padding: 0; list-style: none; line-height: 1.4; } ul { margin: 5px 0 15px 0; padding: 0; list-style: none; line-height: 1.4; }
/*ul li:before { content: "\00BB \0020"; color: #888; position: absolute; margin-left: -19px; }*/ /*ul li:before { content: "\00BB \0020"; color: #888; position: absolute; margin-left: -19px; }*/
ol { line-height: 1.4; margin: 15px 0 15px 30px; padding: 0; } ol { line-height: 1.4; margin: 15px 0 15px 30px; padding: 0; }
blockquote { margin: 15px 0; font-style: italic; color: #444; } blockquote { margin: 15px 0; font-style: italic; color: #444; }
.footer { font-size: 13px; color: #888; text-align: right; margin-top: 25px; } .footer { font-size: 13px; color: #888; text-align: right; margin-top: 25px; }
.more { text-align: right; margin-top: 0; font-size: 0.9em; font-style: italic; } .more { text-align: right; margin-top: 0; font-size: 0.9em; font-style: italic; }
.nav { font-size: 15px; text-align: right; margin: 0 auto;} .navi { font-size: 15px; text-align: right; margin: 0 auto;}
.nav li { display: inline; padding: 0 6px; } .navi li { display: inline; padding: 0 6px; }
table { border: 0; border-collapse: collapse;} table { border: 0; border-collapse: collapse;}
th { font-weight: normal; } th { font-weight: normal; }
td input { border: none; padding: 0; } td input { border: none; padding: 0; }
......
...@@ -6,19 +6,32 @@ ...@@ -6,19 +6,32 @@
<meta name="description" lang="{{ LANGUAGE_CODE }}" content="Nuages, {% trans 'Easy poll sharing' %}. {% trans "Create polls easily, and publish them for your mates, in order to plan meetings and activities." %} " /> <meta name="description" lang="{{ LANGUAGE_CODE }}" content="Nuages, {% trans 'Easy poll sharing' %}. {% trans "Create polls easily, and publish them for your mates, in order to plan meetings and activities." %} " />
<meta name="keywords" lang="{{ LANGUAGE_CODE }}" content="{% trans 'meeting, shared, poll, plan, GPL, alternative, free, django, domaine public' %}" /> <meta name="keywords" lang="{{ LANGUAGE_CODE }}" content="{% trans 'meeting, shared, poll, plan, GPL, alternative, free, django, domaine public' %}" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/r29/html5.min.js"></script>
<![endif]-->
<link rel="stylesheet" type="text/css" href="{% static 'css/normalize.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'css/normalize.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'css/django-messages.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'css/django-messages.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/bootstrap.min.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/bootstrap.min.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'css/tobald.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'css/tobald.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'css/nuages.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'css/nuages.css' %}" />
<!--[if lt IE 9]> <script type="text/javascript" src="{% static 'js/jquery.min.js' %}"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/r29/html5.min.js"></script> <script type="text/javascript" src="{% static 'bootstrap/js/bootstrap.min.js' %}"></script>
<![endif]-->
{% block head %}{% endblock %} {% block head %}{% endblock %}
</head> </head>
<body> <body>
<div class="nav container"> <div>
{% for message in messages %}
<div class="alert{% if message.tags %} alert-{% if message.tags == 'error' %}danger{% else %}{{ message.tags }}{% endif %}{% endif %} alert-dismissable">
<div class="box">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&#215;</button>
{{ message|safe }}
</div>
</div>
{% endfor %}
</div>
<div class="navi box">
<ul> <ul>
<li><a href="{% url 'home' %}" title='{% trans "Homepage" %}'>Nuages</a></li> <li><a href="{% url 'home' %}" title='{% trans "Homepage" %}'>Nuages</a></li>
{% block menu %}{% endblock %} {% block menu %}{% endblock %}
...@@ -30,27 +43,17 @@ ...@@ -30,27 +43,17 @@
</ul> </ul>
</div> </div>
<div class="nav container"> <div class="box">
{% if messages %}
<ul class="messagelist">
{% for message in messages %}
<li{% if message.tags %} class="{{ message.tags }} well"{% endif %}>{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
</div>
<div class="container">
{% block main %}{% endblock %} {% block main %}{% endblock %}
</div> </div>
<br /><br /> <br /><br />
<div class="container nav"> <div class="navi box">
{% block footer %}{% endblock %} {% block footer %}{% endblock %}
<p>{% trans "Nuages is brought to you by" %} <a href="http://www.domainepublic.net">Domaine Public</a>.<p> <p>{% trans "Nuages is brought to you by" %} <a href="http://www.domainepublic.net">Domaine Public</a>.<p>
</div> </div>
{% block js %}{% endblock %}
</body> </body>
</html> </html>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
{% block main %} {% block main %}
<h1><img src="{{ STATIC_URL }}images/nuage_guillaume_boitel.png" alt="Nuages" /> Nuages</h1> <h1><img src="{{ STATIC_URL }}images/nuage_guillaume_boitel.png" alt="Nuages" /> Nuages</h1>
<div class="row indent"> <div class="indent">
<div class="lead"> <div class="lead">
<p> <p>
{% trans "Create polls easily, and publish them for your mates, in order to plan meetings and activities." %} {% trans "Create polls easily, and publish them for your mates, in order to plan meetings and activities." %}
...@@ -16,10 +16,13 @@ ...@@ -16,10 +16,13 @@
</p> </p>
</div> </div>
<div class="indent"> <div class="indent">
<p>
{% trans "Examples" %}: {% trans "Examples" %}:
<a href="{% url 'meetingpoll' 'db3a' %}">Quand allons nous au potager?</a> <a href="{% url 'meetingpoll' 'db3a' %}">Quand allons nous au potager?</a>
</p>
</div> </div>
</div> </div>
<br />
{% block userspecific %} {% block userspecific %}
......
...@@ -2,8 +2,10 @@ ...@@ -2,8 +2,10 @@
{% load staticfiles %} {% load staticfiles %}
{% block main %} {% block main %}
<h2>{% trans "About Nuages" %}</h2> <div style="margin-left: 6px;">
<h2>{% trans "About Nuages" %}</h2>
</div>
<div class="filet"> <div class="filet">
<p> <p>
{% trans "A collaborative meeting poll system, similar to doodle or rdvz. This application was named after Django's famous song and because computer work is easier when its cloudy. It is build in python, using the django framework and a little of javascript." %} {% trans "A collaborative meeting poll system, similar to doodle or rdvz. This application was named after Django's famous song and because computer work is easier when its cloudy. It is build in python, using the django framework and a little of javascript." %}
......
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