test audio pop up

4 years ago · 0722a4d6bc
4 changed files with 50 additions and 2 deletions
--- a/hello.py
+++ b/hello.py
@ -18,7 +18,7 @@ def dated_url_for(endpoint, **values):

@app.route('/')
 def hello_world():
-    return 'Hello, World!'
+    return 'VVVW'


 # @app.route('/hello/<name>')
@ -28,3 +28,6 @@ def perspectiveB():
@app.route('/perspectiveA/')
 def perspectiveA():
    return render_template('perspectiveA.html')
+@app.route('/perspectiveC/')
+def perspectiveC():
+    return render_template('perspectiveC.html')
--- a/static/css/style.css
+++ b/static/css/style.css
@ -1,7 +1,10 @@
+<<<<<<< HEAD
 html {
  background-color: gray;
 }

+=======
+>>>>>>> 8b9db01a45a2a649684b6c229c428187d4edaf29
 #video1 {
  margin-top: 300px;
 }
@ -25,6 +28,7 @@ img {
  margin-left: 400px;
 }

+<<<<<<< HEAD
 /* audio and pop up images */
 #transcriptWrapper {
  overflow: hidden;
@ -37,4 +41,26 @@ img {

 .speaking {
  font-weight: bold;
+=======
+#background_a {
+  background-image: url("../images/map.png");
+  background-repeat: no-repeat;
+  background-color: silver;
+}
+
+
+#poem1 {
+  width: 40%;
+  margin-left: 400px;
+  margin-top: 50px;
+}
+
+#poem1:hover {
+  background-color: white;
+}
+
+#background_c {
+  background-image: url("../images/test2_opacity.jpeg");
+
+>>>>>>> 8b9db01a45a2a649684b6c229c428187d4edaf29
 }
--- a/templates/perspectiveA.html
+++ b/templates/perspectiveA.html
@ -7,7 +7,8 @@
  <link rel="stylesheet" href="../static/css/style.css?q=1280549780">
  <title>Perspective A</title>
 </head>
-<body>
+<body id="background_a">
+  <div>
  <h1>Perspective A</h1>
  <div id="audio1">
    <audio controls src="../static/audio/turkish_march.ogg" type="audio/ogg"></audio>
--- a/templates/perspectiveC.html
+++ b/templates/perspectiveC.html
@ -0,0 +1,18 @@
+<!doctype html>
+<html>
+<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="../static/js/draggable.js"></script>
+<head>
+  <link rel="stylesheet" href="../static/css/style.css?q=1280549780">
+  <title>Perspective A</title>
+</head>
+<body id="background_c">
+  <div>
+  <h1>Perspective C</h1>
+<div class="draggable">
+<img id="poem1" src="../static/images/poem.png" alt="poem">
+</div>
+</div>
+</body>
+</html>