diff --git a/website/db.sqlite3 b/website/db.sqlite3 index 563cf0ff05ee9dab8e0155268654e4710640551c..7a47f48a587dd450e13e81b8593a8961cd097501 100644 Binary files a/website/db.sqlite3 and b/website/db.sqlite3 differ diff --git a/website/nutriform/admin.py b/website/nutriform/admin.py index 38deb820c2de7843a12adc4c549cf0f9d93101b2..1260f87615861e31b44e2133e2b6b9b7d2d102f7 100644 --- a/website/nutriform/admin.py +++ b/website/nutriform/admin.py @@ -1,7 +1,8 @@ from django.contrib import admin -from .models import Menu, QuestionQuotid, InfosUser +from .models import Menu, QuestionQuotid, InfosUser, Annonce # Register your models here. admin.site.register(Menu) admin.site.register(QuestionQuotid) -admin.site.register(InfosUser) \ No newline at end of file +admin.site.register(InfosUser) +admin.site.register(Annonce) \ No newline at end of file diff --git a/website/nutriform/forms.py b/website/nutriform/forms.py index 6c13105edbdeebc7a1189f909842135d5acc33c5..b5354b522fc178db6f1ec2f786f1674fc6390523 100644 --- a/website/nutriform/forms.py +++ b/website/nutriform/forms.py @@ -56,4 +56,4 @@ for s in SPORT_LIST: SPORT_CHOICES.append((s,s)) class SearchSportForm(forms.Form): - sport_choice = forms.ChoiceField(choices=SPORT_CHOICES) + sport_choice = forms.ChoiceField(choices=SPORT_CHOICES, label="Sport") diff --git a/website/nutriform/static/nutriform/assets/css/main.css b/website/nutriform/static/nutriform/assets/css/main.css index 681b6ea2acd13282418799baf9547d97481f700f..33d99edce490f15cf3a4a838aa8a90fc8d86fe53 100644 --- a/website/nutriform/static/nutriform/assets/css/main.css +++ b/website/nutriform/static/nutriform/assets/css/main.css @@ -3265,4 +3265,10 @@ padding: 0; } + } + + .cardshadow { + box-shadow: white 2px 2px 6px; + background-color: #f32853; + min-height: 300px; } \ No newline at end of file diff --git a/website/nutriform/templates/nutriform/annonces.html b/website/nutriform/templates/nutriform/annonces.html index 3b1eaf5c1eadf22f9e7ce18f36fdd4c09de5228f..f273bc42fe15273b17f5631b96789c6d9238c31e 100644 --- a/website/nutriform/templates/nutriform/annonces.html +++ b/website/nutriform/templates/nutriform/annonces.html @@ -8,18 +8,20 @@ <h2>Participez à des activités sportives communautaires</h2> </header> - <div class="row uniform center"> + <div class="row uniform"> {% for annonce in annonces_list %} - <div class="6u 12u$(xsmall)"> - <ul style="list-style: none;"> - <li>{{ annonce.get_type_annonce_display }}</li> - <li><i>{{ annonce.date }}</i></li> - <li>{{ annonce.sport }}</li> + <div class="6u 12u$(xsmall) cardshadow"> + <ul style="list-style: none; color: white;"> + <li style="color: black;">{{ annonce.get_type_annonce_display }}</li> + <li style="color: lightgray;"><i>{{ annonce.date }}</i></li> <li>{{ annonce.ville }}</li> + <li>{{ annonce.sport }}</li> <li>{{ annonce.description }}</li> </ul> {% if user.is_authenticated and user != annonce.orga %} - <a href="mailto:{{annonce.orga.email}}" class="button">Contacter l'organisateur</a> + <a href="mailto:{{annonce.orga.email}}" class="button" style="margin-bottom: 10px;">Contacter l'organisateur</a> + {% else %} + <a class="button disabled" style="margin-bottom: 10px;">Contacter l'organisateur</a> {% endif %} </div> {% endfor %} diff --git a/website/nutriform/templates/nutriform/carte.html b/website/nutriform/templates/nutriform/carte.html index 7f9bc63f15ce4c4db87d665fab49ae5c29d75706..1e9ff6cbf69dc87412f97a7fcb5e494203cc34a2 100644 --- a/website/nutriform/templates/nutriform/carte.html +++ b/website/nutriform/templates/nutriform/carte.html @@ -15,6 +15,9 @@ </form> <div id="mapid"> + </div> + <div style="height: 100px;"> + </div> <style> diff --git a/website/nutriform/templates/nutriform/compte.html b/website/nutriform/templates/nutriform/compte.html index 0135df261a91f6fec5cb1c6749e5eea1e90d4fdf..cf5416c4bbcc82972354f06a323f750dd5a70213 100644 --- a/website/nutriform/templates/nutriform/compte.html +++ b/website/nutriform/templates/nutriform/compte.html @@ -68,7 +68,8 @@ {% endif %} - <a href="{% url 'questionnaire' %}" class="button">Mon daily report</a> + <a href="{% url 'questionnaire' %}" class="button" style="margin-bottom: 20px;">Mon daily report</a> + </div class="container"> diff --git a/website/nutriform/templates/registration/login.html b/website/nutriform/templates/registration/login.html index 99907d481746303de3b5ca256cb30133f98da1cd..442da5dc7c00d1bfc6201e3109574bfbbfe80754 100644 --- a/website/nutriform/templates/registration/login.html +++ b/website/nutriform/templates/registration/login.html @@ -28,6 +28,7 @@ <input type="submit" value="se connecter" style="margin-top: 5px;"> <input type="hidden" name="next" value="{{ next }}"> <a href="{% url 'register' %}" class="button">S'inscrire</a> +<a href="{% url 'password_reset' %}">Mot de passe oublié ?</a> </form> diff --git a/website/website/settings.py b/website/website/settings.py index 831b34513e97a85adc6fedf5cbd459ee36f13b59..e5da5d7e962b61a036d240be0513532074ac7dfe 100644 --- a/website/website/settings.py +++ b/website/website/settings.py @@ -127,6 +127,8 @@ EMAIL_HOST_USER = 'nutriformpima@gmail.com' EMAIL_HOST_PASSWORD = mdp EMAIL_USE_TLS = True +#EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' + ADMINS = [('Charles', 'charles.anteunis@gmail.com'),]