video

Ariel Spear & Kallen Millner & Colleen Minor & Stephany Garcia & Ashley Sullins · Ariel Spear & Kallen Millner & Colleen Minor & Stephany Garcia & Ashley Sullins · commit e2d2299ac848 · 2015-09-11T11:22:10.000-07:00
diff --git a/src/main/java/App.java b/src/main/java/App.java
@@ -46,12 +46,10 @@ public static void main(String[] args) {
       return new ModelAndView(model, layout);
     }, new VelocityTemplateEngine());
 
-    get("/loadpage", (request, response) -> {
+    get("/video", (request, response) -> {
       HashMap<String, Object> model = new HashMap<String, Object>();
-      //Get the relevant gems from the params, put into model...
 
-
-      model.put("template", "templates/loadpage.vtl");
+      model.put("template", "templates/video.vtl");
       return new ModelAndView(model, layout);
     }, new VelocityTemplateEngine());
 
diff --git a/src/main/resources/templates/index.vtl b/src/main/resources/templates/index.vtl
@@ -1,5 +1,5 @@
 
 
-<div class="img"><img id = "image" src="/img/start.gif"></div>
+<div class="img"><a href="/video"><img id = "image" src="/img/start.gif"></div></a>
 
 <a href="/gems" button class="sparkley last">Let's make a fusion!</button></a>
diff --git a/src/main/resources/templates/layout.vtl b/src/main/resources/templates/layout.vtl
@@ -207,7 +207,7 @@ function newColour() {
 </script>
   </head>
   <body>
-    <audio controls autoplay hidden="hidden">
+    <audio loop="loop" autoplay="autoplay" controls="controls" hidden="hidden">
       <source src="opening.ogg" type="audio/ogg">
       <source src="opening.mp3" type="audio/mpeg">
     Your browser does not support the audio element.
diff --git a/src/main/resources/templates/video.vtl b/src/main/resources/templates/video.vtl
@@ -0,0 +1,6 @@
+<iframe width="420" height="315" src="https://www.youtube.com/embed/PPxTdZN3xdg?autoplay=1" frameborder="0" allowfullscreen></iframe>
+<br>
+<br>
+<br>
+
+<a href="/gems" button class="sparkley last">Let's make a fusion!</button></a>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`	`2`
`3`		`-<div class="img"><img id = "image" src="/img/start.gif"></div>`
	`3`	`+<div class="img"><a href="/video"><img id = "image" src="/img/start.gif"></div></a>`
`4`	`4`
`5`	`5`	`<a href="/gems" button class="sparkley last">Let's make a fusion!</button></a>`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +<iframe width="420" height="315" src="https://www.youtube.com/embed/PPxTdZN3xdg?autoplay=1" frameborder="0" allowfullscreen></iframe>
 +<br>
 +<br>
 +<br>
++
 +<a href="/gems" button class="sparkley last">Let's make a fusion!</button></a>