diff --git a/Timeline/TODO.txt b/Timeline/TODO.txt
index 7ea7a5b0368cfc4ee250482350296e959210adbb..d47876085f2c464ce2948380706b6a45e32547ac 100755
--- a/Timeline/TODO.txt
+++ b/Timeline/TODO.txt
@@ -23,6 +23,8 @@ Refonte CSS :
TO DO :
- click photo utilisateur -> affichage profil
+- ses wins
+- ses machins blabla
TO DO LATER :
- boutons j'aime, vote, et ajout commentaire sur click photo
diff --git a/Timeline/mes_identifications.php b/Timeline/mes_identifications.php
index 286ac10dff3c523cd953b7a72942b829f75870a0..4242f87a7f2ff03e7842c84d6d31dfceab061aa8 100755
--- a/Timeline/mes_identifications.php
+++ b/Timeline/mes_identifications.php
@@ -6,7 +6,7 @@
function getPhotosMesIdentifications($db) {
$id=$_SESSION['login'];
- $stmt = $db->query("SELECT soiree.annee, soiree.name, photo.idphoto, photo.extension, photo.composteur, soiree.theme FROM photo INNER JOIN soiree ON photo.idsoiree=soiree.idsoiree INNER JOIN identification ON photo.idphoto=identification.idphoto WHERE identification.idutilisateur='$id'");
+ $stmt = $db->query("SELECT soiree.annee, soiree.name, photo.idphoto, photo.extension, photo.composteur, soiree.theme, soiree.idsoiree FROM photo INNER JOIN soiree ON photo.idsoiree=soiree.idsoiree INNER JOIN identification ON photo.idphoto=identification.idphoto WHERE identification.idutilisateur='$id'");
$stmt->setFetchMode(PDO::FETCH_NUM);
$result = $stmt->fetchAll();
return $result;
@@ -54,10 +54,12 @@
<!-- Js carousel -->
<script src="js/carousel.js"></script>
+ <script type="text/javascript" src="js/modal.js"></script>
<!-- fichier css perso -->
<link rel="stylesheet" href="css/menu.css">
<link rel="stylesheet" href="css/mes_posts.css">
+ <link rel="stylesheet" type="text/css" href="css/modal.css">
</head>
@@ -80,4 +82,6 @@
?>
+ <?php include 'modal.php'; ?>
+
<?php include 'footer.php'; ?>
diff --git a/Timeline/mes_posts.php b/Timeline/mes_posts.php
index 206ea42337f5c01dff3898cd537a59a1268606ba..d77f9ca3b1d55d9188343b9c68588d58fee15d83 100755
--- a/Timeline/mes_posts.php
+++ b/Timeline/mes_posts.php
@@ -89,74 +89,8 @@
?>
- <div id="myModal" class="modal fade" role="dialog">
- <div class="modal-dialog modal-lg">
-
- <div class="modal-content">
-
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal">×</button>
- <h4 class="modal-title"></h4>
- </div>
-
- <div class="modal-body">
- <div class="row">
- <div class="col-lg-12 col-sm-12" id="image-content">
- <!-- Va contenir l'image -->
- </div>
- <div class="col-lg-12 col-sm-12 hidden-xs">
- <div>
- <div id="com-content" class="container-fluid">
- <div class="row">
-
- <div class="comment-tabs">
- <ul class="nav nav-tabs" role="tablist">
- <li class="active"><a href="#list-comment" role="tab" data-toggle="tab"><h4>Commentaires</h4></a></li>
- <li><a href="#add-comment" role="tab" data-toggle="tab"><h4>Ajouter un commentaire</h4></a></li>
- </ul>
- <div class="tab-content">
- <div class="tab-pane active" id="list-comment">
- <ul class="media-list" style="overflow-y: scroll; max-height: 240px;">
-
- </ul>
- </div>
- <div class="tab-pane" id="add-comment">
- <form action="#" method="post" class="form-horizontal" id="commentForm" role="form">
- <div class="form-group">
- <label for="email" class="col-sm-2 control-label">Commentaire</label>
- <div class="col-sm-10">
- <textarea class="form-control" name="addComment" id="addComment" rows="5"></textarea>
- </div>
- </div>
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
- <button class="btn btn-success btn-circle text-uppercase" type="submit" id="submitComment"><span class="glyphicon glyphicon-send"></span>Envoyer</button>
- </div>
- </div>
- </form>
- </div>
-
- </div>
- </div>
- </div>
- </div>
- </div>
-
- </div>
-
- </div>
- </div> <!-- close modal body -->
-
- <div class="modal-footer">
- <button class='btn btn-primary vote' data-toggle='tooltip' title='Vote pour la photo la plus trash'>Trash<span class='badge'>15</span></button>
- <button class='btn btn-primary vote' data-toggle='tooltip' title='Vote pour la photo où ça pécho sec'>Love<span class='badge'>15</span></button>
- <button class='btn btn-primary vote' data-toggle='tooltip' title='Photo de toute beauté'>Like<span class='badge'>15</span></button>
- </div>
-
- </div>
-
- </div>
- </div>
+
+ <?php include 'modal.php'; ?>
<?php include 'footer.php'; ?>
diff --git a/Timeline/modal.php b/Timeline/modal.php
new file mode 100755
index 0000000000000000000000000000000000000000..e027a75e8e7bd95a5187de4efaa40b2fbcd114e9
--- /dev/null
+++ b/Timeline/modal.php
@@ -0,0 +1,72 @@
+<?php
+
+echo '<div id="myModal" class="modal fade" role="dialog">';
+echo '<div class="modal-dialog modal-lg">';
+
+echo '<div class="modal-content">';
+
+echo '<div class="modal-header">';
+echo '<button type="button" class="close" data-dismiss="modal">×</button>';
+echo '<h4 class="modal-title"></h4>';
+echo '</div>';
+
+echo '<div class="modal-body">';
+echo '<div class="row">';
+echo '<div class="col-lg-12 col-sm-12" id="image-content">';
+
+echo '</div>';
+echo '<div class="col-lg-12 col-sm-12 hidden-xs">';
+echo '<div>';
+echo '<div id="com-content" class="container-fluid">';
+echo '<div class="row">';
+
+echo '<div class="comment-tabs">';
+echo '<ul class="nav nav-tabs" role="tablist">';
+echo '<li class="active"><a href="#list-comment" role="tab" data-toggle="tab"><h4>Commentaires</h4></a></li>';
+echo '<li><a href="#add-comment" role="tab" data-toggle="tab"><h4>Ajouter un commentaire</h4></a></li>';
+echo '</ul>';
+echo '<div class="tab-content"> ';
+echo '<div class="tab-pane active" id="list-comment">';
+echo '<ul class="media-list" style="overflow-y: scroll; max-height: 240px;">';
+
+echo '</ul>';
+echo '</div>';
+echo '<div class="tab-pane" id="add-comment">';
+echo '<form action="#" method="post" class="form-horizontal" id="commentForm" role="form">';
+echo '<div class="form-group">';
+echo '<label for="email" class="col-sm-2 control-label">Commentaire</label>';
+echo '<div class="col-sm-10">';
+echo '<textarea class="form-control" name="addComment" id="addComment" rows="5"></textarea>';
+echo '</div>';
+echo '</div>';
+echo '<div class="form-group">';
+echo '<div class="col-sm-offset-2 col-sm-10">';
+echo '<button class="btn btn-success btn-circle text-uppercase" type="submit" id="submitComment"><span class="glyphicon glyphicon-send"></span>Envoyer</button>';
+echo '</div>';
+echo '</div>';
+echo '</form>';
+echo '</div>';
+
+echo '</div>';
+echo '</div>';
+echo '</div>';
+echo '</div>';
+echo '</div>';
+
+echo '</div>';
+
+echo '</div>';
+echo '</div>';
+
+echo '<div class="modal-footer">';
+echo '<button class="btn btn-primary vote" data-toggle="tooltip" title="Vote pour la photo la plus trash">Trash<span class="badge">15</span></button>';
+echo '<button class="btn btn-primary vote" data-toggle="tooltip" title="Vote pour la photo où ça pécho sec">Love<span class="badge">15</span></button>';
+echo '<button class="btn btn-primary vote" data-toggle="tooltip" title="Photo de toute beauté">Like<span class="badge">15</span></button>';
+echo '</div>';
+
+echo '</div>';
+
+echo '</div>';
+echo '</div>';
+
+?>
\ No newline at end of file
diff --git a/Timeline/timeline.php b/Timeline/timeline.php
index dc4b77d80e8a25b36fd27a7430d0d392489b422f..61af0369f94c47c899b4a4ec20021140d7e95987 100755
--- a/Timeline/timeline.php
+++ b/Timeline/timeline.php
@@ -260,75 +260,8 @@
</div>
</div>
- <div id="myModal" class="modal fade" role="dialog">
- <div class="modal-dialog modal-lg">
-
- <div class="modal-content">
-
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal">×</button>
- <h4 class="modal-title"></h4>
- </div>
-
- <div class="modal-body">
- <div class="row">
- <div class="col-lg-12 col-sm-12" id="image-content">
- <!-- Va contenir l'image -->
- </div>
- <div class="col-lg-12 col-sm-12 hidden-xs">
- <div >
- <div id="com-content" class="container-fluid">
- <div class="row">
-
- <div class="comment-tabs">
- <ul class="nav nav-tabs" role="tablist">
- <li class="active"><a href="#list-comment" role="tab" data-toggle="tab"><h4>Commentaires</h4></a></li>
- <li><a href="#add-comment" role="tab" data-toggle="tab"><h4>Ajouter un commentaire</h4></a></li>
- </ul>
- <div class="tab-content">
- <div class="tab-pane active" id="list-comment">
- <ul class="media-list" style="overflow-y: scroll; max-height: 240px;">
-
- </ul>
- </div>
- <div class="tab-pane" id="add-comment">
- <form action="#" method="post" class="form-horizontal" id="commentForm" role="form">
- <div class="form-group">
- <label for="email" class="col-sm-2 control-label">Commentaire</label>
- <div class="col-sm-10">
- <textarea class="form-control" name="addComment" id="addComment" rows="5"></textarea>
- </div>
- </div>
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
- <button class="btn btn-success btn-circle text-uppercase" type="submit" id="submitComment"><span class="glyphicon glyphicon-send"></span> Envoyer </button>
- </div>
- </div>
- </form>
- </div>
-
- </div>
- </div>
- </div>
- </div>
- </div>
-
- </div>
-
- </div>
- </div> <!-- close modal body -->
-
- <div class="modal-footer">
- <button class='btn btn-primary vote' data-toggle='tooltip' title='Vote pour la photo la plus trash'>Trash<span class='badge'>15</span></button>
- <button class='btn btn-primary vote' data-toggle='tooltip' title='Vote pour la photo où ça pécho sec'>Love<span class='badge'>15</span></button>
- <button class='btn btn-primary vote' data-toggle='tooltip' title='Photo de toute beauté'>Like<span class='badge'>15</span></button>
- </div>
-
- </div>
-
- </div>
- </div>
+ <?php include 'modal.php'; ?>
<!-- End of content : script JS -->
<script type="text/javascript" src="js/jquery_library.js"></script>