Commit 7baa2098 authored by chris's avatar chris

lot of bugfixes

parent db965704
...@@ -4,11 +4,16 @@ ...@@ -4,11 +4,16 @@
{% block content %} {% block content %}
<h1>{% trans "Authorization" %}</h1> <h1>{% trans "Authorization" %}</h1>
<p>{% trans "You should login to gain access to all site features. If you have not account" %} <a href="{% url registration_register %}">{% trans "register" %}</a> {% trans "please" %}</p> <p>{% trans "You should login to gain access to all site features. If you have not account" %} <a href="{% url registration_register %}">{% trans "register" %}</a> {% trans "please" %}</p>
<br />
<form class="login-form" method="post"> <form class="login-form" method="post">
<div class="wide">{{ form.as_p }}</div> <div class="wide">{{ form.as_p }}
<p><input type="submit" value="{% trans "login" %}" /></p> <br />
<p><label for="nothing"> &nbsp; </label> <input type="submit" value=" {% trans 'Login' %} " /></p>
<input type="hidden" name="next" value="{{ next }}" /> <input type="hidden" name="next" value="{{ next }}" />
<p><label for="nothing"> &nbsp; </label> <a href="{% url auth_password_reset %}">{% trans "I forgot password" %}</a></p>
</div>
</form> </form>
<a href="{% url auth_password_reset %}">{% trans "I forgot password" %}</a>
<br /><br />
{% endblock %} {% endblock %}
# Django settings for Nuages # Django settings for Nuages
# Shouldn't django autofind the templates folder in the project root folder?
import os import os
from account.settings import * from account.settings import *
from urlauth.settings import * from urlauth.settings import *
...@@ -13,8 +12,9 @@ PROJECT_DIR = os.path.normpath(os.path.dirname(__file__)) ...@@ -13,8 +12,9 @@ PROJECT_DIR = os.path.normpath(os.path.dirname(__file__))
ADMINS = ( ADMINS = (
# ('Your Name', 'your_email@domain.com'), # ('Your Name', 'your_email@domain.com'),
) )
MANAGERS = ADMINS MANAGERS = ADMINS
DEFAULT_FROM_EMAIL = 'nuages@domainepublic.net'
SITE = 'http://nuages.domainepublic.net/'
DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. 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. 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. ...@@ -23,8 +23,6 @@ DATABASE_PASSWORD = '' # Not used with sqlite3.
DATABASE_HOST = '' # Set to empty string for localhost. 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. 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: # Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems. # although not all choices may be available on all operating systems.
......
...@@ -12,8 +12,9 @@ PROJECT_DIR = os.path.normpath(os.path.dirname(__file__)) ...@@ -12,8 +12,9 @@ PROJECT_DIR = os.path.normpath(os.path.dirname(__file__))
ADMINS = ( ADMINS = (
# ('Your Name', 'your_email@domain.com'), # ('Your Name', 'your_email@domain.com'),
) )
MANAGERS = ADMINS 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_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
DATABASE_NAME = 'nuages.sqlite' # Or path to database file if using sqlite3. DATABASE_NAME = 'nuages.sqlite' # Or path to database file if using sqlite3.
...@@ -22,8 +23,6 @@ DATABASE_PASSWORD = '' # Not used with sqlite3. ...@@ -22,8 +23,6 @@ DATABASE_PASSWORD = '' # Not used with sqlite3.
DATABASE_HOST = '' # Set to empty string for localhost. 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. 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: # Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems. # although not all choices may be available on all operating systems.
......
...@@ -74,8 +74,11 @@ form label { ...@@ -74,8 +74,11 @@ form label {
.comment:focus { .comment:focus {
width: 150px; width: 150px;
background-color: #EDF8FA; }
order: 1px solid #666;
input:focus, textarea:focus {
background-color: #f2f1f0; /* #EDF8FA */
border: 1px solid #999;
} }
.adresse { .adresse {
...@@ -86,7 +89,6 @@ form label { ...@@ -86,7 +89,6 @@ form label {
.bigtable td { .bigtable td {
text-align: center; text-align: center;
border: 0px solid #fff;
} }
.instructions { .instructions {
...@@ -105,6 +107,7 @@ form label { ...@@ -105,6 +107,7 @@ form label {
padding: 12px; padding: 12px;
-moz-border-radius: 9px; -moz-border-radius: 9px;
-webkit-border-radius: 9px; -webkit-border-radius: 9px;
line-height: 15px;
} }
.menu { .menu {
...@@ -132,7 +135,7 @@ form label { ...@@ -132,7 +135,7 @@ form label {
} }
.helper { .helper {
width: 158px; width: 156px;
display: none; display: none;
position: absolute; position: absolute;
margin-left: 12%; margin-left: 12%;
...@@ -179,10 +182,11 @@ form label { ...@@ -179,10 +182,11 @@ form label {
-webkit-border-radius: 15px; -webkit-border-radius: 15px;
background-color: #fff; background-color: #fff;
border: 1px solid #def; border: 1px solid #def;
line-height: 21px;
} }
.names { .names {
width: 160px; width: 166px;
} }
.names input { .names input {
...@@ -190,14 +194,14 @@ form label { ...@@ -190,14 +194,14 @@ form label {
} }
.False, .True { .False, .True {
margin-left: 22%; margin: 0 auto;
background-color: #fbb; background-color: #fbb;
width: 19px; width: 19px;
height: 19px; height: 19px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
color: #fff; color: #ccb;
text-align: left; text-align: right;
} }
.True { .True {
......
...@@ -6,17 +6,19 @@ ...@@ -6,17 +6,19 @@
<h2>{% trans "About" %}</h2> <h2>{% trans "About" %}</h2>
<p class="info"> <p class="info">
{% 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." %}
</p>
<p class="info">
{% trans "Feedback and collaboration are welcome at" %} <a href="mailto:">nuages@ domainepublic.net</a>. {% trans "Feedback and collaboration are welcome at" %} <a href="mailto:">nuages@ domainepublic.net</a>.
{% trans "We have a project page at" %} <a href="http://projets.domainepublic.net/projects/nuages/">projets.domainepublic.net</a>. {% trans "We have a project page at" %} <a href="http://projets.domainepublic.net/projects/nuages/">projets.domainepublic.net</a>.
{% trans "Sources are freely available under" %} <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>. {% trans "Sources freely available under" %} <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>.
</p> </p>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<br /><br /> <br />
<div id="notify" class="blue"> <div id="notify" class="blue">
......
...@@ -40,13 +40,20 @@ ...@@ -40,13 +40,20 @@
var this_id = $(this).attr("id"); // current inputs id var this_id = $(this).attr("id"); // current inputs id
var new_id = this_id +1; // a new id var new_id = this_id +1; // a new id
$(this).attr("id", new_id); // change to 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({ $(this).datepicker({
dateFormat: 'dd-mm-yy', dateFormat: 'dd-mm-yy',
//showButtonPanel: true, //showButtonPanel: true,
showOn: 'button', //both showOn: 'button', //both
buttonImage: '/static/images/calendar.png', buttonImage: '/static/images/calendar.png',
buttonImageOnly: true, buttonImageOnly: true,
minDate: '+1d', minDate: mindate,
}); });
// Remove hasDatepicker class: not to be touched next time function is called // Remove hasDatepicker class: not to be touched next time function is called
$(this).removeClass('hasdatepicker'); $(this).removeClass('hasdatepicker');
...@@ -61,10 +68,10 @@ ...@@ -61,10 +68,10 @@
}); });
function post_actions() { function post_actions() {
// New rows datepicker need to be re-initialized
add_calls();
// Auto-fill new date // Auto-fill new date
fill_date(); fill_date();
// New rows datepicker need to be re-initialized
add_calls();
} }
// Init calendars // Init calendars
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{% block menu %} {% block menu %}
{% if has_voted %} {% if has_voted %}
<a title="{% trans "Clear cookie, you will not be able to change your vote." %}" href="/{{object.id}}/clear/">{% trans "Forget me" %}</a> <a title=" {% trans 'Clear cookie, you will not be able to change your vote.' %} " href="/{{object.id}}/clear/">{% trans "Forget me" %}</a>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
...@@ -19,13 +19,12 @@ ...@@ -19,13 +19,12 @@
{% block content %} {% block content %}
{% if object %} {% if object %}
<table class="bigtable"><tr><td> <table class="bigtable">
<table>
<tr><td class='names'></td> <tr><td class='names'></td>
{% for choice in object.choice_set.all %} {% for choice in object.choice_set.all %}
<td class='cell' title="{{ choice.choice|date:"l d F"}}{{ choice.details }}" onmouseover="toggle_visibility('info-{{ choice }}');" onmouseout="toggle_visibility('info-{{ choice }}');"> {{ choice.choice|date:"d-m" }} </td> <td class='cell' title=" {{ choice.choice|date:"l d F"}} {{ choice.details }} " onmouseover="toggle_visibility('info-{{ choice }}');" onmouseout="toggle_visibility('info-{{ choice }}');"> {{ choice.choice|date:"d-m" }} </td>
{% endfor %} {% endfor %}
<td></td> <td></td>
</tr> </tr>
...@@ -34,7 +33,7 @@ ...@@ -34,7 +33,7 @@
{% for bulletin in object.bulletin_set.all %} {% for bulletin in object.bulletin_set.all %}
<tr ><td class='names'>{{ bulletin.voter }}</td> <tr ><td class='names'>{{ bulletin.voter }}</td>
{% for vote in bulletin.vote_set.all|dictsort:'choice.choice' %} {% for vote in bulletin.vote_set.all|dictsort:'choice.choice' %}
<td class='cell' title="{{ vote.comment }}" onmouseover="toggle_visibility('info-{{ vote.choice }}');" onmouseout="toggle_visibility('info-{{ vote.choice }}');"><div class="{{ vote.voice }}">{% if vote.comment %} ° {% endif %}</div></td> <td class='cell' title=" {{ vote.comment }} " onmouseover="toggle_visibility('info-{{ vote.choice }}');" onmouseout="toggle_visibility('info-{{ vote.choice }}');"><div class="{{ vote.voice }}">{% if vote.comment %} ° {% endif %}</div></td>
{% endfor %} {% endfor %}
</tr> </tr>
...@@ -44,20 +43,16 @@ ...@@ -44,20 +43,16 @@
<tr><td class='names'></td> <tr><td class='names'></td>
{% for choice in object.choice_set.all %} {% for choice in object.choice_set.all %}
<td class='cell' title="{{ choice }}"> {{ choice.votecount }} </td> <td class='cell' title=" {{ choice }} "> {{ choice.votecount }} </td>
{% endfor %} {% endfor %}
</tr> </tr>
</table>
</td></tr>
<tr><td>
<tr>
<form action="/{{ object.id }}/vote/" method="post"> <form action="/{{ object.id }}/vote/" method="post">
<table>
<tr><td class='names' title="Fill in your name"> <td class='names' title=" Fill in your name ">
<div class="blue">{% trans "Your name" %}</div> <div class="blue">{% trans "Your name" %}</div>
{{ form.as_p }} {{ form.as_p }}
</td> </td>
...@@ -82,13 +77,9 @@ ...@@ -82,13 +77,9 @@
<td></td> <td></td>
</tr> </tr>
</table>
</td></tr>
</table> </table>
</td></tr></table>
<br /> <br />
<h4>Instructions</h4> <h4>Instructions</h4>
......
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