Updates to have all videos from top-level folder

wearecollins · May 9, 2016 · b0d91c9 · b0d91c9
1 parent 1fa7ed4
commit b0d91c9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/Webserver/static/anythingmuppets/attract/data.json b/Webserver/static/anythingmuppets/attract/data.json
@@ -1,5 +1,4 @@
 {
 	"name":"attract",
-  	"video":"sm_cut.mp4",
 	"disableTimeout":true
 }
diff --git a/Webserver/static/anythingmuppets/attract/template.hbr b/Webserver/static/anythingmuppets/attract/template.hbr
@@ -1,11 +1,7 @@
 <div id='{{name}}' class='page'>
-  {{!-- 
-    Container for background video
-    * Edit "video" in data.json to change what's loaded below
-  --}}
   <div class='background'>
       <video class="fillContainer attractVideo" autoplay loop muted>
-          <source src="anythingmuppets/{{name}}/{{video}}" type="video/mp4">
+          <source src="video/am_attract.mp4" type="video/mp4">
       </video>
   </div>
   <div class='container fillAbs centeredContainer column noselect' style="z-index:2">

diff --git a/Webserver/static/anythingmuppets/config.json b/Webserver/static/anythingmuppets/config.json
@@ -1 +1 @@
-{"countdownTime":3,"timeout":60,"continuousMode":false,"shareServer":"http://192.168.88.124:8013","aspect":0.5625,"imageWidth":1040,"imageHeight":776,"autoSize":true,"doStream":false,"currentName":67}
+{"countdownTime":3,"timeout":60,"continuousMode":false,"shareServer":"http://192.168.88.124:8013","aspect":0.5625,"imageWidth":1040,"imageHeight":776,"autoSize":true,"doStream":false,"currentName":68}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"countdownTime":3,"timeout":60,"continuousMode":false,"shareServer":"http://192.168.88.124:8013","aspect":0.5625,"imageWidth":1040,"imageHeight":776,"autoSize":true,"doStream":false,"currentName":67}
		{"countdownTime":3,"timeout":60,"continuousMode":false,"shareServer":"http://192.168.88.124:8013","aspect":0.5625,"imageWidth":1040,"imageHeight":776,"autoSize":true,"doStream":false,"currentName":68}