diff --git a/account/templates/account/login.html b/account/templates/account/login.html
index a0f4d31e12e3e8968ed5fad303a7882b953b434f..bd5445ecc880af6f0a7f45095cdc456a3214804d 100644
--- a/account/templates/account/login.html
+++ b/account/templates/account/login.html
@@ -4,11 +4,16 @@
{% block content %}
{% trans "Authorization" %}
{% trans "You should login to gain access to all site features. If you have not account" %} {% trans "register" %} {% trans "please" %}
+
-{% trans "I forgot password" %}
+
+
{% endblock %}
diff --git a/apache/settings.py-dp b/apache/settings.py-dp
index 5940ef1e7e3553b2ba7294d2e52a871591d89995..7191f980564e9269872a38ed15c30d0291eac500 100644
--- a/apache/settings.py-dp
+++ b/apache/settings.py-dp
@@ -1,6 +1,5 @@
# Django settings for Nuages
-# Shouldn't django autofind the templates folder in the project root folder?
import os
from account.settings import *
from urlauth.settings import *
@@ -13,8 +12,9 @@ PROJECT_DIR = os.path.normpath(os.path.dirname(__file__))
ADMINS = (
# ('Your Name', 'your_email@domain.com'),
)
-
MANAGERS = ADMINS
+DEFAULT_FROM_EMAIL = 'nuages@domainepublic.net'
+SITE = 'http://nuages.domainepublic.net/'
DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
DATABASE_NAME = '/home/chris/django/nuages/nuages.sqlite' # Or path to database file if using sqlite3.
@@ -23,8 +23,6 @@ DATABASE_PASSWORD = '' # Not used with sqlite3.
DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
-SITE = 'http://nuages.domainepublic.net/'
-
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
diff --git a/settings.py b/settings.py
index ffaa5b3e0e035f26cfcd1521e260b116515046a8..b8cbe5c7409417aecf966ab8e6f1e8cfc0ad68b9 100644
--- a/settings.py
+++ b/settings.py
@@ -12,8 +12,9 @@ PROJECT_DIR = os.path.normpath(os.path.dirname(__file__))
ADMINS = (
# ('Your Name', 'your_email@domain.com'),
)
-
MANAGERS = ADMINS
+DEFAULT_FROM_EMAIL = 'nuages@domainepublic.net'
+SITE = 'http://127.0.0.1:8000/'
DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
DATABASE_NAME = 'nuages.sqlite' # Or path to database file if using sqlite3.
@@ -22,8 +23,6 @@ DATABASE_PASSWORD = '' # Not used with sqlite3.
DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
-SITE = 'http://127.0.0.1:8000/'
-
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
diff --git a/static/css/nuages.css b/static/css/nuages.css
index e8f8cf133d40298c07ae292b4927f5d318e77749..92c609a5f10a048e1cab726d8c03690e978f7c44 100644
--- a/static/css/nuages.css
+++ b/static/css/nuages.css
@@ -74,8 +74,11 @@ form label {
.comment:focus {
width: 150px;
- background-color: #EDF8FA;
- order: 1px solid #666;
+}
+
+input:focus, textarea:focus {
+ background-color: #f2f1f0; /* #EDF8FA */
+ border: 1px solid #999;
}
.adresse {
@@ -86,7 +89,6 @@ form label {
.bigtable td {
text-align: center;
- border: 0px solid #fff;
}
.instructions {
@@ -105,6 +107,7 @@ form label {
padding: 12px;
-moz-border-radius: 9px;
-webkit-border-radius: 9px;
+ line-height: 15px;
}
.menu {
@@ -132,7 +135,7 @@ form label {
}
.helper {
- width: 158px;
+ width: 156px;
display: none;
position: absolute;
margin-left: 12%;
@@ -179,10 +182,11 @@ form label {
-webkit-border-radius: 15px;
background-color: #fff;
border: 1px solid #def;
+ line-height: 21px;
}
.names {
- width: 160px;
+ width: 166px;
}
.names input {
@@ -190,14 +194,14 @@ form label {
}
.False, .True {
- margin-left: 22%;
+ margin: 0 auto;
background-color: #fbb;
width: 19px;
height: 19px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
- color: #fff;
- text-align: left;
+ color: #ccb;
+ text-align: right;
}
.True {
diff --git a/templates/nuages.html b/templates/nuages.html
index 8904f665fdb022804ffdca1e0e8724b6c68b7b95..fefdfd5ce94ce357a8507c8388192d1ad375188a 100644
--- a/templates/nuages.html
+++ b/templates/nuages.html
@@ -6,17 +6,19 @@
{% trans "About" %}
- {% trans "A collaborative meeting poll system, similar to doodle or rdvz. It is build in python, using the django framework and a little of javascript. This application was named after Django's famous song and because working is easier when its cloudy." %}
+ {% trans "A collaborative meeting poll system, similar to doodle or rdvz. It is build in python, using the django framework and a little of javascript. This application was named after Django's famous song and because computer work is easier when its cloudy." %}
+
+
{% trans "Feedback and collaboration are welcome at" %} nuages@ domainepublic.net.
{% trans "We have a project page at" %} projets.domainepublic.net.
- {% trans "Sources are freely available under" %} GPL.
+ {% trans "Sources freely available under" %} GPL.
{% endblock %}
{% block content %}
-
+
diff --git a/templates/sondage/choice_form.html b/templates/sondage/choice_form.html
index 43cd4871f62cd4fecf10d1fca3218657214dd39a..3c80330d9177ff8945955905a1ef957190cdd6f6 100644
--- a/templates/sondage/choice_form.html
+++ b/templates/sondage/choice_form.html
@@ -40,13 +40,20 @@
var this_id = $(this).attr("id"); // current inputs id
var new_id = this_id +1; // a new id
$(this).attr("id", new_id); // change to new id
+ // The following if allows calendar to start at given date
+ var data = $(this).val()
+ if (data) {
+ var mindate = data.convertToDate();
+ } else {
+ var mindate = '+1d'
+ }
$(this).datepicker({
dateFormat: 'dd-mm-yy',
//showButtonPanel: true,
showOn: 'button', //both
buttonImage: '/static/images/calendar.png',
buttonImageOnly: true,
- minDate: '+1d',
+ minDate: mindate,
});
// Remove hasDatepicker class: not to be touched next time function is called
$(this).removeClass('hasdatepicker');
@@ -61,10 +68,10 @@
});
function post_actions() {
- // New rows datepicker need to be re-initialized
- add_calls();
// Auto-fill new date
fill_date();
+ // New rows datepicker need to be re-initialized
+ add_calls();
}
// Init calendars
diff --git a/templates/sondage/poll_detail.html b/templates/sondage/poll_detail.html
index f4d00cdc25c17035a4475e69696c622644535984..7db3382ef367a6289b406aab741b77ede2f4aedc 100644
--- a/templates/sondage/poll_detail.html
+++ b/templates/sondage/poll_detail.html
@@ -3,7 +3,7 @@
{% block menu %}
{% if has_voted %}
-
{% trans "Forget me" %}
+
{% trans "Forget me" %}
{% endif %}
{% endblock %}
@@ -19,13 +19,12 @@
{% block content %}
{% if object %}
-
+
-
|
{% for choice in object.choice_set.all %}
- {{ choice.choice|date:"d-m" }} |
+ {{ choice.choice|date:"d-m" }} |
{% endfor %}
|
@@ -34,7 +33,7 @@
{% for bulletin in object.bulletin_set.all %}
| {{ bulletin.voter }} |
{% for vote in bulletin.vote_set.all|dictsort:'choice.choice' %}
- {% if vote.comment %} ° {% endif %} |
+ {% if vote.comment %} ° {% endif %} |
{% endfor %}
@@ -44,20 +43,16 @@
|
{% for choice in object.choice_set.all %}
- {{ choice.votecount }} |
+ {{ choice.votecount }} |
{% endfor %}
-
-
-
-|
+ |
- |
-
Instructions