From e878bb0ba0609b838482583e5ad92f8b2e44ab72 Mon Sep 17 00:00:00 2001
From: bruneau2017 <valentin.bruneau@ensiie.fr>
Date: Wed, 24 Oct 2018 18:34:01 +0200
Subject: [PATCH] Modif affichage accueil + test javascript

---
 src/WebApp/application/views/accueil.php  |  9 ++++++++-
 src/WebApp/application/views/getMovie.php | 15 +--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/WebApp/application/views/accueil.php b/src/WebApp/application/views/accueil.php
index 24210ed..d7982e5 100644
--- a/src/WebApp/application/views/accueil.php
+++ b/src/WebApp/application/views/accueil.php
@@ -9,6 +9,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
     
     <script src="<?php echo base_url(); ?>assets/vendor/jquery/jquery.min.js"></script>
     <script src="<?php echo base_url(); ?>assets/js/grayscale.min.js"></script>
+    <script src="<?php echo base_url(); ?>assets/js/new_film.js"></script>
 
     <link href="<?php echo base_url(); ?>assets/vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Varela+Round" rel="stylesheet">
@@ -44,12 +45,18 @@ defined('BASEPATH') OR exit('No direct script access allowed');
     </nav>
 
     <!-- Header -->
+    <?php include('getMovie.php') ?>
     <header class="masthead">
       <div class="container d-flex h-100 align-items-center">
         <div class="mx-auto text-center">
           <h1 class="mx-auto my-0 text-uppercase">BingeWatcher</h1>
           <h2 class="text-white-50 mx-auto mt-2 mb-5">Découvrez des films, sans aucune limite</h2>
-          <a href="index.php/welcome/test" class="btn btn-primary js-scroll-trigger">Cliquez ici pour générer un film aléatoire</a>
+          <form>
+              <div class="form-group">
+                  <label for="film"><input type="text" size="60" name="film" id="film" value="<?php echo(getRandomMovie())?>">
+                      <a class="btn btn-primary js-scroll-trigger" href="javascript:generate_film('film')" >Cliquez ici pour générer un film aléatoire</a> </label>
+              </div>
+          </form>
         </div>
       </div>
     </header>
diff --git a/src/WebApp/application/views/getMovie.php b/src/WebApp/application/views/getMovie.php
index 8ab6f12..f5147e3 100644
--- a/src/WebApp/application/views/getMovie.php
+++ b/src/WebApp/application/views/getMovie.php
@@ -20,17 +20,4 @@ function getRandomMovie()
 }
 $title = getRandomMovie();
 
-?>
-<html>
-    <head>
-        <meta charset="utf-8"/>
-        <title>BingeWatcher</title>
-</head>
-        <body>
-            <?php
-            echo $title;
-            ?>
-            
-        
-</body>
-</html>
\ No newline at end of file
+?>
\ No newline at end of file
-- 
GitLab