diff --git a/conjure/wsgi.py b/conjure/wsgi.py index ef48aa5..5ddc8ed 100644 --- a/conjure/wsgi.py +++ b/conjure/wsgi.py @@ -8,7 +8,8 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/ """ import os +from dj_static import Cling, MediaCling os.environ.setdefault("DJANGO_SETTINGS_MODULE", "conjure.settings") from django.core.wsgi import get_wsgi_application -application = get_wsgi_application() +application = Cling(MediaCling(get_wsgi_application())) diff --git a/conjure/wsgi.pyc b/conjure/wsgi.pyc index 70db39d..566af3f 100644 Binary files a/conjure/wsgi.pyc and b/conjure/wsgi.pyc differ diff --git a/db.sqlite3 b/db.sqlite3 index 4d29e0f..925770b 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/medias/projects_downloads/gpa775-gabarit.zip b/medias/projects_downloads/gpa775-gabarit.zip new file mode 100644 index 0000000..de93929 Binary files /dev/null and b/medias/projects_downloads/gpa775-gabarit.zip differ diff --git a/medias/projects_screenshots/Screenshot_from_2015-07-10_082007.png b/medias/projects_screenshots/Screenshot_from_2015-07-10_082007.png new file mode 100644 index 0000000..9e281a4 Binary files /dev/null and b/medias/projects_screenshots/Screenshot_from_2015-07-10_082007.png differ diff --git a/member/admin.pyc b/member/admin.pyc index 2124e46..11d8381 100644 Binary files a/member/admin.pyc and b/member/admin.pyc differ diff --git a/member/forms.pyc b/member/forms.pyc index 74747e9..cf5a2fc 100644 Binary files a/member/forms.pyc and b/member/forms.pyc differ diff --git a/member/migrations/0003_auto_20150721_1829.pyc b/member/migrations/0003_auto_20150721_1829.pyc index 674f796..a3b00c9 100644 Binary files a/member/migrations/0003_auto_20150721_1829.pyc and b/member/migrations/0003_auto_20150721_1829.pyc differ diff --git a/member/models.pyc b/member/models.pyc index 3feaf81..2d4d47f 100644 Binary files a/member/models.pyc and b/member/models.pyc differ diff --git a/member/templates/member/.index.html.swp b/member/templates/member/.index.html.swp new file mode 100644 index 0000000..e3e89ff Binary files /dev/null and b/member/templates/member/.index.html.swp differ diff --git a/member/templates/member/index.html b/member/templates/member/index.html index d98b8ac..f1e790b 100644 --- a/member/templates/member/index.html +++ b/member/templates/member/index.html @@ -20,7 +20,7 @@ {% if admin.photo %} - + {% else %} {% endif %} @@ -49,7 +49,7 @@ {% if member.photo %} - + {% else %} {% endif %} diff --git a/member/views.pyc b/member/views.pyc index 17306ea..48f8ca6 100644 Binary files a/member/views.pyc and b/member/views.pyc differ diff --git a/project/templates/project/index.html b/project/templates/project/index.html index 890661d..448b08f 100644 --- a/project/templates/project/index.html +++ b/project/templates/project/index.html @@ -1,11 +1,33 @@ {% extends 'template.html' %} - +{% load staticfiles %} {% block content %} - - - + +
+
+
+
+

Projets

+
+
+
+
+ {% for project in projects %} +
+ +
+
+

{{ project.name }}

 +
+
+ {% if project.screenshot %} + + {% else %} + + {% endif %} + +
+ {% endfor %} +
+
+
{% endblock %} diff --git a/project/templates/project/projet.html b/project/templates/project/projet.html new file mode 100644 index 0000000..72886dd --- /dev/null +++ b/project/templates/project/projet.html @@ -0,0 +1,50 @@ +{% extends 'template.html' %} +{% load staticfiles %} +{% block content %} +
+
+

{{ project.name }}

+ + {% if project.screenshot %} + + {% else %} + + {% endif %} + +
+

Descripiton du projet:

+

{{ project.description }}

+ Download +
+
+
+
+ +
+
+
+

Équipe

+
+
+
+
+ {% for member in project.members.all %} +
+ +
+
+

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

 +
+
+ {% if member.photo %} + + {% else %} + + {% endif %} + +
+ {% endfor %} +
+
+
+{% endblock %} diff --git a/project/views.py b/project/views.py index 7dee1a2..d15b815 100644 --- a/project/views.py +++ b/project/views.py @@ -11,4 +11,4 @@ def index(request): def show(request, project_id): project = Project.objects.get(pk=project_id) - return render(request, 'project/show.html', {'project': project}) + return render(request, 'project/projet.html', {'project': project}) diff --git a/project/views.pyc b/project/views.pyc index 524447c..49b4e7f 100644 Binary files a/project/views.pyc and b/project/views.pyc differ diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..fbaad2b --- /dev/null +++ b/requirements.txt @@ -0,0 +1,7 @@ +Django==1.8.2 +Pillow==2.8.2 +argparse==1.2.1 +dj-static==0.0.6 +django-ckeditor==4.4.8 +static3==0.6.1 +wsgiref==0.1.2 diff --git a/static/css/style.css b/static/css/style.css index e7c41f6..50ef354 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -105,4 +105,4 @@ footer { margin: 0 0 30px; } } -} \ No newline at end of file +}