diff --git a/db.sqlite3 b/db.sqlite3 index 5a23a3d..4d29e0f 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/member/admin.py b/member/admin.py index 08be2f7..f747b1a 100644 --- a/member/admin.py +++ b/member/admin.py @@ -1,7 +1,8 @@ from django.contrib import admin -from member import models +from member import models, forms @admin.register(models.Member) class MemberAdmin(admin.ModelAdmin): - fields = ['first_name', 'last_name', 'email', 'photo'] - list_display = ['first_name', 'last_name'] + form = forms.MemberAdminForm + fields = ['first_name', 'last_name', 'email', 'photo', 'is_admin', 'position'] + list_display = ['first_name', 'last_name', 'is_admin'] diff --git a/member/admin.pyc b/member/admin.pyc index 4f09131..2124e46 100644 Binary files a/member/admin.pyc and b/member/admin.pyc differ diff --git a/member/forms.py b/member/forms.py new file mode 100644 index 0000000..a75eeaf --- /dev/null +++ b/member/forms.py @@ -0,0 +1,7 @@ +from django import forms +from member import models + +class MemberAdminForm(forms.ModelForm): + photo = forms.ImageField(required=False) + class Meta: + model = models.Member diff --git a/member/forms.pyc b/member/forms.pyc new file mode 100644 index 0000000..74747e9 Binary files /dev/null and b/member/forms.pyc differ diff --git a/member/migrations/0003_auto_20150721_1829.py b/member/migrations/0003_auto_20150721_1829.py new file mode 100644 index 0000000..664f8a5 --- /dev/null +++ b/member/migrations/0003_auto_20150721_1829.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('member', '0002_auto_20150616_2213'), + ] + + operations = [ + migrations.AddField( + model_name='member', + name='is_admin', + field=models.BooleanField(default=False), + preserve_default=True, + ), + migrations.AddField( + model_name='member', + name='position', + field=models.CharField(default=False, max_length=50), + preserve_default=False, + ), + ] diff --git a/member/migrations/0003_auto_20150721_1829.pyc b/member/migrations/0003_auto_20150721_1829.pyc new file mode 100644 index 0000000..674f796 Binary files /dev/null and b/member/migrations/0003_auto_20150721_1829.pyc differ diff --git a/member/models.py b/member/models.py index 411c078..39e8c71 100644 --- a/member/models.py +++ b/member/models.py @@ -5,4 +5,6 @@ class Member(models.Model): first_name = models.CharField(max_length=50) last_name = models.CharField(max_length=50) email = models.CharField(max_length=50) - photo = models.ImageField(upload_to="members") + photo = models.ImageField(upload_to="members", blank=True, null=True) + is_admin = models.BooleanField(default=False) + position = models.CharField(max_length=50) diff --git a/member/models.pyc b/member/models.pyc index 6bf9e52..3feaf81 100644 Binary files a/member/models.pyc and b/member/models.pyc differ diff --git a/member/templates/member/index.html b/member/templates/member/index.html index 53fc7c4..d98b8ac 100644 --- a/member/templates/member/index.html +++ b/member/templates/member/index.html @@ -1,11 +1,62 @@ {% extends 'template.html' %} - +{% load staticfiles %} {% block content %} - - - +
+
+
+
+

Administration

+
+
+
+
+ {% for admin in admins %} +
+

{{ admin.position }}

+ +
+
+

{{ admin.first_name }} {{ admin.last_name }}

 +
+
+ {% if admin.photo %} + + {% else %} + + {% endif %} + +
+ {% endfor %} +
+
+
+ +
+
+
+
+

Membres

+
+
+
+
+ {% for member in members %} +
+ +
+
+

{{ member.first_name }} {{ member.last_name }}

 +
+
+ {% if member.photo %} + + {% else %} + + {% endif %} + +
+ {% endfor %} +
+
+
{% endblock %} diff --git a/member/templates/member/show.html b/member/templates/member/show.html index 637d660..caac62b 100644 --- a/member/templates/member/show.html +++ b/member/templates/member/show.html @@ -3,5 +3,5 @@ {% block content %}

{{ member.first_name }} {{ member.last_name }}

- + {% endblock %} diff --git a/member/views.py b/member/views.py index 31a12ae..69c75b4 100644 --- a/member/views.py +++ b/member/views.py @@ -3,10 +3,10 @@ from member.models import * def index(request): - #TODO : Order By... - members = Member.objects.all() + admins = Member.objects.filter(is_admin=True) + members = Member.objects.filter(is_admin=False) - return render(request, 'member/index.html', {'members': members}) + return render(request, 'member/index.html', {'admins': admins, 'members': members}) def show(request, member_id): diff --git a/member/views.pyc b/member/views.pyc index 6051052..17306ea 100644 Binary files a/member/views.pyc and b/member/views.pyc differ diff --git a/static/fonts/FontAwesome.otf b/static/fonts/FontAwesome.otf new file mode 100644 index 0000000..f7936cc Binary files /dev/null and b/static/fonts/FontAwesome.otf differ diff --git a/static/fonts/fontawesome-webfont.eot b/static/fonts/fontawesome-webfont.eot new file mode 100644 index 0000000..33b2bb8 Binary files /dev/null and b/static/fonts/fontawesome-webfont.eot differ diff --git a/static/fonts/fontawesome-webfont.svg b/static/fonts/fontawesome-webfont.svg new file mode 100644 index 0000000..1ee89d4 --- /dev/null +++ b/static/fonts/fontawesome-webfont.svg @@ -0,0 +1,565 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/fonts/fontawesome-webfont.ttf b/static/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000..ed9372f Binary files /dev/null and b/static/fonts/fontawesome-webfont.ttf differ diff --git a/static/fonts/fontawesome-webfont.woff b/static/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000..8b280b9 Binary files /dev/null and b/static/fonts/fontawesome-webfont.woff differ diff --git a/static/fonts/fontawesome-webfont.woff2 b/static/fonts/fontawesome-webfont.woff2 new file mode 100644 index 0000000..3311d58 Binary files /dev/null and b/static/fonts/fontawesome-webfont.woff2 differ diff --git a/templates/membres.html b/templates/membres.html deleted file mode 100644 index 54bdd7d..0000000 --- a/templates/membres.html +++ /dev/null @@ -1,269 +0,0 @@ - - - - - - - - - - - - - Carousel Template for Bootstrap - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - -
-
-
-
-
-
-

Administration

-
-
-
-
- -
-

Position

- -
-
-

Nom de membres

-
-
- - -
- -
-

Position

- -
-
-

Nom de membres

-
-
- - -
-
-

Position

- -
-
-

Nom de membres

-
-
- - -
-
-

Position

- -
-
-

Nom de membres

-
-
- - -
-
-

Position

- -
-
-

Nom de membres

-
-
- - -
-
-

Position

- -
-
-

Nom de membres

-
-
- - -
-
-
-
- -
-
-
-
-

Membres

-
-
-
-
-
- -
-
-

Nom de membres

-
-
- - -
-
- -
-
-

Nom de membres

-
-
- - -
-
- -
-
-

Nom de membres

-
-
- - -
-
- -
-
-

Nom de membres

-
-
- - -
-
- -
-
-

Nom de membres

-
-
- - -
-
- -
-
-

Nom de membres

-
-
- - -
-
-
-
-
- - - -
- - - - - - - - - - - - - - - - - - - - -