mirror of
https://github.com/ConjureETS/site-2015.git
synced 2026-03-23 20:11:24 +00:00
Version 1.
This commit is contained in:
antoine.mcnabb
parent
80c3501b9f
commit
0d7ca3b4a4
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -12,10 +12,10 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
{% for admin in admins %}
|
||||
<div class="col-sm-4 list-item">
|
||||
<div class="col-sm-4 list-item membre">
|
||||
<h3 class="text-center">{{ admin.position }}</h3>
|
||||
<a href="{% url 'member:show' admin.id %}" class="list-link">
|
||||
<div class="caption">
|
||||
<a data-toggle="modal" href="{% url 'member:show' admin.id %}" data-target="#myModal" class="list-link membre">
|
||||
<div class="caption membre bordered">
|
||||
<div class="caption-content">
|
||||
<i class="fa fa-search-plus fa-3x"><h3>{{ admin.first_name }} {{ admin.last_name }}</h3></i>
|
||||
</div>
|
||||
@ -27,6 +27,7 @@
|
||||
{% endif %}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
@ -43,21 +44,38 @@
|
||||
<div class="row">
|
||||
{% for member in members %}
|
||||
<div class="col-sm-4 list-item">
|
||||
<a href="{% url 'member:show' member.id %}" class="list-link" >
|
||||
<div class="caption">
|
||||
<a data-toggle="modal" href="{% url 'member:show' member.id %}" data-target="#myModal" class="list-link membre">
|
||||
|
||||
<div class="caption membre bordered">
|
||||
<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="">
|
||||
<img src="{{ admin.photo.url }}" class="avatar" alt="">
|
||||
{% else %}
|
||||
<img src="{% static 'img/profile.png' %}" class="avatar" alt="">
|
||||
{% endif %}
|
||||
</a>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
<h4 class="modal-title">Modal title</h4>
|
||||
|
||||
</div>
|
||||
<div class="modal-body"><div class="te"></div></div>
|
||||
</div>
|
||||
<!-- /.modal-content -->
|
||||
</div>
|
||||
<!-- /.modal-dialog -->
|
||||
</div>
|
||||
<!-- /.modal -->
|
||||
{% endblock %}
|
||||
|
||||
@ -1,7 +1,31 @@
|
||||
{% extends 'template.html' %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{{ member.first_name }} {{ member.last_name }}</h1>
|
||||
|
||||
{% load staticfiles %}
|
||||
<div id="modalWindow">
|
||||
|
||||
|
||||
<h3 class="modal-title">{{ member.first_name }} {{ member.last_name }}</h3>
|
||||
<table class="table table-user-information">
|
||||
<tr>
|
||||
<td rowspan=3>
|
||||
|
||||
{% if member.photo %}
|
||||
<img src="{{ admin.photo.url }}" class="avatar" alt="">
|
||||
{% else %}
|
||||
<img src="{% static 'img/profile.png' %}" class="avatar" alt="">
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% if member.is_admin %}
|
||||
<tr>
|
||||
<td><p>Position :</p></td>
|
||||
<td><p>{{ member.position}}</p></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
<tr>
|
||||
<td><p>Email :</p></td>
|
||||
<td><a href="mailto:info@support.com">{{ member.email}}</a></td>
|
||||
</tr>
|
||||
</table>
|
||||
<div>
|
||||
{% endblock %}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -2,7 +2,6 @@
|
||||
{% load staticfiles %}
|
||||
{% block content %}
|
||||
<!-- projet Grid Section -->
|
||||
|
||||
<section id="projet">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
@ -14,16 +13,16 @@
|
||||
<div class="row">
|
||||
{% for project in projects %}
|
||||
<div class="col-sm-4 list-item">
|
||||
<a href="{% url 'project:show' project.id %}" class="list-link">
|
||||
<a href="{% url 'project:show' project.id %}" class="list-link projet bordered">
|
||||
<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="projet" alt="">
|
||||
<img src="{{ project.screenshot.url }}" alt=""/>
|
||||
{% else %}
|
||||
<img src="{% static 'img/projet/cabin.png' %}" class="projet" alt="">
|
||||
<img src="{% static 'img/projet/cabin.png' %}" alt=""/>
|
||||
{% endif %}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@ -1,27 +1,26 @@
|
||||
{% extends 'template.html' %}
|
||||
{% load staticfiles %}
|
||||
{% block content %}
|
||||
<div class="boxContent">
|
||||
<div class="projet">
|
||||
<div class="col-lg-12">
|
||||
<section id="projet">
|
||||
<div class="boxContent">
|
||||
<h1>{{ project.name }}</h1>
|
||||
|
||||
{% if project.screenshot %}
|
||||
<img class="img-responsive" src="{{ project.screenshot.url }}" alt="">
|
||||
<img class="img-responsive projectImage" src="{{ project.screenshot.url }}" alt="">
|
||||
{% else %}
|
||||
<img class="img-responsive" src="http://placehold.it/1100x400" alt="">
|
||||
<img class="img-responsive projectImage" 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>
|
||||
<p id = "descriptionProjet">{{ project.description }}</p>
|
||||
|
||||
<a class="btn btn-large right" href="{{ project.download }}" download="{{ project.download }}" >Download</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section id="membre">
|
||||
|
||||
<div class="container">
|
||||
<div class="boxContent">
|
||||
<div class="row">
|
||||
<div class="col-lg-12 text-center">
|
||||
<h2 class="">Équipe</h2>
|
||||
@ -30,19 +29,20 @@
|
||||
</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 class="col-sm-4 list-item">
|
||||
<a class="list-link membre">
|
||||
|
||||
<div class="caption membre bordered">
|
||||
<div class="caption-content">
|
||||
<i class="fa fa-search-plus fa-3x"><h3>{{ member.first_name }} {{ member.last_name }}</h3></i>
|
||||
</div>
|
||||
</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>
|
||||
{% if member.photo %}
|
||||
<img src="{{ admin.photo.url }}" class="avatar" alt="">
|
||||
{% else %}
|
||||
<img src="{% static 'img/profile.png' %}" class="avatar" alt="">
|
||||
{% endif %}
|
||||
</a>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
html {
|
||||
position: relative;
|
||||
min-height: 1054px;
|
||||
height: 100%;
|
||||
}
|
||||
p,a
|
||||
{
|
||||
font-family: 'Ubuntu', serif;
|
||||
font-size:15px;
|
||||
font-weight:bold;
|
||||
}
|
||||
html {
|
||||
position: relative;
|
||||
min-height: 100%;
|
||||
}
|
||||
body {
|
||||
/*min-height:1200px;
|
||||
max-height:1200px;*/
|
||||
@ -69,7 +70,7 @@ hr.star-primary:after {
|
||||
height:52px;
|
||||
}
|
||||
|
||||
.navbar-wrapper .container {
|
||||
.container {
|
||||
width:100%;
|
||||
}
|
||||
|
||||
@ -92,6 +93,7 @@ hr.star-primary:after {
|
||||
*/
|
||||
#projet
|
||||
{
|
||||
margin-left:10px;
|
||||
background-color:#1A7AC5;
|
||||
}
|
||||
.nouvelle
|
||||
@ -116,23 +118,41 @@ footer {
|
||||
/* Not required for template or sticky footer method. */
|
||||
|
||||
.avatar {
|
||||
width: 250px;
|
||||
height: 250px;
|
||||
width: 200px;
|
||||
height: 200px;
|
||||
min-width:200px;
|
||||
max-width: 250px;
|
||||
min-height:200px;
|
||||
max-height: 250px;
|
||||
-webkit-border-radius: 50%;
|
||||
-moz-border-radius: 50%;
|
||||
border-radius: 50%;
|
||||
border: 5px solid rgba(255,255,255,0.5);
|
||||
}
|
||||
.projet
|
||||
{
|
||||
border: 5px solid rgba(255,255,255,0.5);
|
||||
min-width:300px;
|
||||
max-width:300px;
|
||||
min-height:200px;
|
||||
min-width:400px;
|
||||
max-width:400px;
|
||||
min-height:300px;
|
||||
max-height:300px;
|
||||
|
||||
}
|
||||
.projet img
|
||||
{
|
||||
|
||||
height:100%;
|
||||
width:100%;
|
||||
}
|
||||
.bordered
|
||||
{
|
||||
border: 5px solid rgba(255,255,255,0.5);
|
||||
}
|
||||
.projectImage
|
||||
{
|
||||
width:100%;
|
||||
height:50%;
|
||||
min-width:800px;
|
||||
max-width:1000px;
|
||||
max-height:400px;
|
||||
}
|
||||
.list-item .list-link {
|
||||
display: block;
|
||||
@ -165,45 +185,35 @@ footer {
|
||||
font-size: 15px;
|
||||
color: #fff;
|
||||
}
|
||||
#membre .list-item .list-link .caption{
|
||||
.list-item .list-link a:active a:visited;
|
||||
{
|
||||
border-style:none;
|
||||
}
|
||||
.membre{
|
||||
-webkit-border-radius: 50%;
|
||||
-moz-border-radius: 50%;
|
||||
border-radius: 50%;
|
||||
width:200px;
|
||||
min-width:200px;
|
||||
max-width:250px;
|
||||
|
||||
}
|
||||
|
||||
#projet .list-item .list-link .caption:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
#projet .list-item .list-link .caption .caption-content {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
width: 100%;
|
||||
height: 20px;
|
||||
margin-top: -12px;
|
||||
text-align: center;
|
||||
font-size: 20px;
|
||||
color: #fff;
|
||||
|
||||
}
|
||||
.list-item .list-link .caption:hover {
|
||||
opacity: 1;
|
||||
|
||||
}
|
||||
#projet * {
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
.infobox
|
||||
{
|
||||
padding-top:15px;
|
||||
height:40%;
|
||||
padding-top:10px;
|
||||
min-height:400px;
|
||||
height:30%;
|
||||
max-height:400px;
|
||||
-webkit-box-shadow: 0px 1px 5px 0px rgba(0,0,0,1);
|
||||
-moz-box-shadow: 0px 1px 5px 0px rgba(0,0,0,1);
|
||||
box-shadow: 0px 1px 5px 0px rgba(0,0,0,1);
|
||||
font-family: 'Ubuntu', serif;
|
||||
font-size:15px;
|
||||
font-size:20px;
|
||||
font-weight:bold;
|
||||
}
|
||||
.boxContent
|
||||
@ -211,6 +221,10 @@ footer {
|
||||
padding-left:25%;
|
||||
padding-right:25%;
|
||||
}
|
||||
#descriptionProjet
|
||||
{
|
||||
color:white;
|
||||
}
|
||||
#jams li
|
||||
{
|
||||
display:inline;
|
||||
@ -218,7 +232,7 @@ footer {
|
||||
}
|
||||
#mtlgamejam
|
||||
{
|
||||
background-color:#f8f8f8;
|
||||
background-color:#f8f8f8;
|
||||
color:black;
|
||||
}
|
||||
#mtlgamejam h1
|
||||
@ -231,14 +245,16 @@ footer {
|
||||
}
|
||||
#jams
|
||||
{
|
||||
|
||||
color:white;
|
||||
}
|
||||
|
||||
#contact
|
||||
{
|
||||
background-color:#f8f8f8;
|
||||
max-height:125px;
|
||||
min-height:125px;
|
||||
height:10%;
|
||||
max-height:150px;
|
||||
min-height:150px;
|
||||
color:black;
|
||||
}
|
||||
#contact .boxContent
|
||||
@ -251,7 +267,6 @@ footer {
|
||||
}
|
||||
#contact li
|
||||
{
|
||||
|
||||
display:block;
|
||||
padding:5px;
|
||||
}
|
||||
@ -260,10 +275,15 @@ footer {
|
||||
color:white;
|
||||
}
|
||||
.sectionImage
|
||||
{
|
||||
float:left;
|
||||
height:300px;
|
||||
width:300px;
|
||||
{ min-height:350px;
|
||||
max-height:350px;
|
||||
min-width:300px;
|
||||
max-width:350px;
|
||||
height:35%;
|
||||
width:35%;
|
||||
|
||||
padding:0px;
|
||||
margin:1%;
|
||||
-webkit-border-radius: 50%;
|
||||
-moz-border-radius: 50%;
|
||||
border-radius: 50%;
|
||||
@ -271,6 +291,16 @@ footer {
|
||||
-moz-box-shadow: 0px 1px 5px 0px rgba(0,0,0,1);
|
||||
box-shadow: 0px 1px 5px 0px rgba(0,0,0,1);
|
||||
}
|
||||
.sectionImage .left
|
||||
{
|
||||
margin-right:3%;
|
||||
margin-left:3%;
|
||||
}
|
||||
.sectionImage.right
|
||||
{
|
||||
margin-right:3%;
|
||||
margin-left:3%;
|
||||
}
|
||||
.imgJams
|
||||
{
|
||||
height:30%;
|
||||
@ -299,4 +329,26 @@ footer {
|
||||
margin: 0 0 30px;
|
||||
}
|
||||
}
|
||||
#modalWindow h3,table,td
|
||||
{
|
||||
color:black;
|
||||
}
|
||||
#modalWindow h3
|
||||
{
|
||||
margin-left:10px;
|
||||
}
|
||||
.modal
|
||||
{
|
||||
padding-top:15%;
|
||||
}
|
||||
#pageAcceuil p,a
|
||||
{
|
||||
font-size:20px;
|
||||
}
|
||||
.modal-dialog
|
||||
{
|
||||
height:50%;
|
||||
width:50%;
|
||||
min-width:500px;
|
||||
min-height:250px;
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 59 KiB |
6
static/js/modalWindow.js
Normal file
6
static/js/modalWindow.js
Normal file
@ -0,0 +1,6 @@
|
||||
$('#myModal').on('show.bs.modal', function (event) {
|
||||
console.log("show !!")
|
||||
})
|
||||
$('#myModal').on('hide.bs.modal', function (event) {
|
||||
console.log("show !!")
|
||||
})
|
||||
@ -1,24 +1,25 @@
|
||||
{% extends 'template.html' %}
|
||||
{% load staticfiles %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
<div class="content">
|
||||
<div class="content" id="pageAcceuil">
|
||||
<div class="infobox" id="conjure">
|
||||
<img class="sectionImage" src={% static 'img/conjureMiniLogo.png' %}>
|
||||
<img class="sectionImage left" src={% static 'img/conjureMiniLogo.png' %}>
|
||||
<div class="boxContent">
|
||||
<h1>Le Club</h1>
|
||||
<p>
|
||||
Conjure est le club de développement de jeux vidéo de l’École des Technologie Supérieure. Nos membres ont comme projet le développement d’un jeu qu’ils ont choisi ou qu’ils veulent réalisé dans une équipe de gens avec la même motivation en utilisant des outils présentement utilisé dans l’industrie.Ils participent aussi à plusieurs évenements reliés à l’industrie du jeu vidéo telle que des compétitions et des conférences. Conjure est d’ailleurs le fondateur de l’un de ces évènements, le Montréal Game Jam, qui est une compétition de développement de jeux vidéo en 48h. Venez rejoindre notre équipe de gens motivé et passioné pour vivre votre passion de création de jeux vidéo..
|
||||
Objectifs.Encadrer le développement des jeux vidéo réalisés par les étudiants de l’École de technologie supérieure.
|
||||
Favoriser la croissance du talent créatif et des compétences techniques de la relève de l’industrie par la formation des étudiants.
|
||||
Faire la promotion de la culture et de l’industrie du jeu au Québec à travers nos activités.</p>
|
||||
Conjure est le club de développement de jeux vidéo de l’École des Technologie Supérieure.
|
||||
Nos membres ont comme projet le développement d’un jeu de leur choix.Les outils utilisée sont les outils utilisée dans l'industrie du jeu.
|
||||
Ils participent aussi à plusieurs évenements reliés à l’industrie du jeu vidéo telle que des compétitions et des conférences.
|
||||
Conjure est d’ailleurs le fondateur de l’un de ces évènements, le Montréal Game Jam, qui est une compétition de développement de jeux vidéo en 48h.
|
||||
Venez rejoindre notre équipe de gens motivé et passioné pour vivre votre passion de création de jeux vidéo.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="infobox" id="mtlgamejam">
|
||||
<img class="sectionImage" src={% static 'img/MTLGJ_logo.png' %}>
|
||||
<img class="sectionImage right" src={% static 'img/MTLGJ_logo.png' %}>
|
||||
<div class="boxContent">
|
||||
<h1>Le Montreal Game Jam</h1>
|
||||
<p>
|
||||
Le Montreal Game Jam est le chapitre Montréalais pour le Global Game Jam.
|
||||
Cet événement international donne comme défi aux participants de réaliser un
|
||||
prototype de jeu basé sur une thématique spécifique pendant une période de 48 heures.
|
||||
@ -51,14 +52,14 @@ Voici quelque Game Jam auquel Conjure participe:
|
||||
</div>
|
||||
</div>
|
||||
<div class="infobox" id="contact">
|
||||
<p><ul class="right"><li>local A-1744</li>
|
||||
<li>Conjure@ens.etsmtl.ca</li>
|
||||
<li>(514) 396-8800 poste: #7713</li>
|
||||
<ul class="left"><li><p>local A-1744</p></li>
|
||||
<li><a href="mailto:Conjure@ens.etsmtl.ca">Conjure@ens.etsmtl.ca</a></li>
|
||||
<li><p>(514) 396-8800 poste: #7713</p></li>
|
||||
</ul>
|
||||
<ul class="left">
|
||||
<ul class="right">
|
||||
<li><a href="https://www.facebook.com/ConjureETS"><img src={% static 'img/fblogo.png' %} class="logo"/>ConjureETS</a></li>
|
||||
<li><a href="https://www.youtube.com/user/ConjureETS"><img src={% static 'img/ytlogo.png' %} class="logo"/>Youtube</a></li>
|
||||
</ul></p>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#"><img src="{% static 'img/conjure_logo.png' %}" height="40px"></a>
|
||||
<a class="navbar-brand" href="{% url 'index' %}"><img src="{% static 'img/conjure_logo.png' %}" height="40px"></a>
|
||||
</div>
|
||||
<div id="navbar" class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
@ -64,12 +64,8 @@
|
||||
<script src="{% static 'js/bootstrap.min.js' %}"></script>
|
||||
<script src="{% static 'js/jquery.js' %}"></script>
|
||||
<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script>
|
||||
<script src="{% static 'js/classie.js' %}"></script>
|
||||
<script src="{% static 'js/cbpAnimatedHeader.js' %}"></script>
|
||||
<script src="{% static 'js/jqBootstrapValidation.js' %}"></script>
|
||||
<script src="{% static 'js/contact_me.js' %}"></script>
|
||||
<script src="{% static 'js/freelancer.js' %}"></script>
|
||||
<script src="{% static 'js/timeline.js' %}"></script>
|
||||
<script src="{% static 'js/timelinemod.js' %}"></script>
|
||||
<script src="{% static 'js/modalWindow.js' %}"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user