Conjure/site-2015
6
0
Fork 0
mirror of https://github.com/ConjureETS/site-2015.git synced 2026-03-23 20:11:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from ConjureETS/projet

Browse Source 
Added all templates, fixed medias with dj_static and added requiremen…
This commit is contained in:
Émile Filteau-Tessier 2015-07-21 16:05:10 -04:00
commit 2344d6c189
18 changed files with 93 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conjure/wsgi.py
View File

@ -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()))

BIN
conjure/wsgi.pyc
View File

Binary file not shown.

BIN
db.sqlite3
View File

Binary file not shown.

BIN
medias/projects_downloads/gpa775-gabarit.zip Normal file
View File

Binary file not shown.

BIN
medias/projects_screenshots/Screenshot_from_2015-07-10_082007.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 453 KiB

BIN
member/admin.pyc
View File

Binary file not shown.

BIN
member/forms.pyc
View File

Binary file not shown.

BIN
member/migrations/0003_auto_20150721_1829.pyc
View File

Binary file not shown.

BIN
member/models.pyc
View File

Binary file not shown.

BIN
member/templates/member/.index.html.swp Normal file
View File

Binary file not shown.

4
member/templates/member/index.html
View File

@ -20,7 +20,7 @@
</div>
</div>
{% if admin.photo %}
<img src="{{ admin.photo }}" class="avatar" alt="">
<img src="{{ admin.photo.url }}" class="avatar" alt="">
{% else %}
<img src="{% static 'img/profile.png' %}" class="avatar" alt="">
{% endif %}
@ -49,7 +49,7 @@
</div>
</div>
{% if member.photo %}
<img src="{{ member.photo }}" class="avatar" alt="">
<img src="{{ member.photo.url }}" class="avatar" alt="">
{% else %}
<img src="{% static 'img/profile.png' %}" class="avatar" alt="">
{% endif %}

BIN
member/views.pyc
View File

Binary file not shown.

38
project/templates/project/index.html
View File

@ -1,11 +1,33 @@
{% extends 'template.html' %}
{% load staticfiles %}
{% block content %}
<ul>
{% for project in projects %}
<li>{{ project.name }}</li>
{% endfor %}
</ul>
<!-- projet Grid Section -->
<section id="projet">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="">Projets</h2>
<hr class="star-light">
</div>
</div>
<div class="row">
{% for project in projects %}
<div class="col-sm-4 list-item">
<a href="{% url 'project:show' project.id %}" class="list-link">
<div class="caption">
<div class="caption-content">
<i class="fa fa-search-plus fa-3x"><h3>{{ project.name }}</h3></i>
</div>
</div>
{% if project.screenshot %}
<img src="{{ project.screenshot.url }}" class="img-responsive" alt="">
{% else %}
<img src="{% static 'img/projet/cabin.png' %}" class="img-responsive" alt="">
{% endif %}
</a>
</div>
{% endfor %}
</div>
</div>
</section>
{% endblock %}

50
project/templates/project/projet.html Normal file
View File

@ -0,0 +1,50 @@
{% extends 'template.html' %}
{% load staticfiles %}
{% block content %}
<div class="projet">
<div class="col-lg-12">
<h1>{{ project.name }}</h1>
{% if project.screenshot %}
<img class="img-responsive" src="{{ project.screenshot.url }}" alt="">
{% else %}
<img class="img-responsive" src="http://placehold.it/1100x400" alt="">
{% endif %}
<div class="caption-full">
<h4>Descripiton du projet:</h4>
<p>{{ project.description }}</p>
<a class="btn btn-large" href="{{ project.download }}">Download</a>
</div>
</div>
</div>
<section id="membre">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="">Équipe</h2>
<hr class="star-light">
</div>
</div>
<div class="row">
{% for member in project.members.all %}
<div class="col-sm-4 list-item">
<a href="{% url 'member:show' member.id %}" class="list-link" >
<div class="caption">
<div class="caption-content">
<i class="fa fa-search-plus fa-3x"><h3>{{ member.first_name }} {{ member.last_name }}</h3></i>
</div>
</div>
{% if member.photo %}
<img src="{{ member.photo.url }}" class="avatar" alt="">
{% else %}
<img src="{% static 'img/profile.png' %}" class="avatar" alt="">
{% endif %}
</a>
</div>
{% endfor %}
</div>
</div>
</section>
{% endblock %}

2
project/views.py
View File

@ -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})

BIN
project/views.pyc
View File

Binary file not shown.

7
requirements.txt Normal file
View File

@ -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

2
static/css/style.css
View File

@ -105,4 +105,4 @@ footer {
margin: 0 0 30px;
}
}
}
}