From 119fbd2b8215908b2ace9d4e03c2d594f0c8f124 Mon Sep 17 00:00:00 2001
From: "antoine.mcnabb" <antoine.mc-nabb-baltar.1@ens.etsmtl.ca>
Date: Wed, 11 Nov 2015 23:01:14 -0500
Subject: [PATCH] Fix menu

---
 static/mail/contact_me.php | 2 +-
 templates/index.html       | 9 +++++----
 templates/template.html    | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/static/mail/contact_me.php b/static/mail/contact_me.php
index 9911660..e580c38 100644
--- a/static/mail/contact_me.php
+++ b/static/mail/contact_me.php
@@ -16,7 +16,7 @@ $phone = $_POST['phone'];
 $message = $_POST['message'];
 	
 // Create the email and send the message
-$to = 'conjure@ens.ettsmtl.ca'; // Add your email address inbetween the '' replacing yourname@yourdomain.com - This is where the form will send a message to.
+$to = 'conjure@ens.etsmtl.ca'; // Add your email address inbetween the '' replacing yourname@yourdomain.com - This is where the form will send a message to.
 $email_subject = "Website Contact Form:  $name";
 $email_body = "You have received a new message from your website contact form.\n\n"."Here are the details:\n\nName: $name\n\nEmail: $email_address\n\nPhone: $phone\n\nMessage:\n$message";
 $headers = "From: noreply@yourdomain.com\n"; // This is the email address the generated message will be from. We recommend using something like noreply@yourdomain.com.
diff --git a/templates/index.html b/templates/index.html
index 154d2d5..0ae36bf 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -79,6 +79,10 @@ dont le mandat commun est de promouvoir l’industrie du jeu vidéo</p>
 					<p class="visible-xs">Global Game Jam</p>
                 </div-->
 				<div class="col-sm-3">
+                    <img src="{% static 'img/jams/asylumjam.png' %}" class="hidden-xs img-responsive imgJams" alt="">
+					<p class="visible-xs">Asylum Jam</p>
+                </div>
+				<div class="col-sm-3">
                     <img src="{% static 'img/jams/pixelChalenge.png' %}" class="hidden-xs img-responsive imgJams" alt="">
 					<p class="visible-xs">Pixel Chalenge</p>
                 </div>
@@ -95,10 +99,7 @@ dont le mandat commun est de promouvoir l’industrie du jeu vidéo</p>
                     <img src="{% static 'img/jams/ludumDare.png' %}" class="hidden-xs img-responsive imgJams" alt="">
 					<p class="visible-xs">Ludum Dare</p>
                 </div>
-				<div class="col-sm-3">
-                    <img src="{% static 'img/jams/asylumjam.png' %}" class="hidden-xs img-responsive imgJams" alt="">
-					<p class="visible-xs">Asylum Jam</p>
-                </div>
+
 		</div>
 
 		</div>
diff --git a/templates/template.html b/templates/template.html
index ffeaf80..5b1352c 100644
--- a/templates/template.html
+++ b/templates/template.html
@@ -113,7 +113,8 @@
     <script src="{% static 'js/jquery.js' %}"></script>
 
     <!-- Bootstrap Core JavaScript -->
-    <script src="{% static 'js/bootstrap.min.js' %}"></script>
+	<!-- REACTIVER LORSQUE LE BUG SERA FIX -->
+    <!--script src="{% static 'js/bootstrap.js' %}"></script-->
 
     <!-- Plugin JavaScript -->
     <script src="{% static 'js/jQueryEasing.js' %}"></script>