diff --git a/slaeforms/app.py b/slaeforms/app.py index d37bae7..2b99ffd 100644 --- a/slaeforms/app.py +++ b/slaeforms/app.py @@ -644,6 +644,11 @@ def deleteuploads(): return redirect("/all_links") +@app.route("/task3") +def task3(): + return render_template("task3.html") + + # Root page ----------------------------- diff --git a/slaeforms/static/styles.css b/slaeforms/static/styles.css index 61d567d..6081c81 100644 --- a/slaeforms/static/styles.css +++ b/slaeforms/static/styles.css @@ -88,7 +88,7 @@ dialog .iframe-container { max-width: 1690px; /* Maximum width to keep it from getting too wide on large screens */ padding: 20px; - background-color: #7b8cdb; + background-color: #b6c3ff; /* used to be 7b8cdb */ /* Just for visual differentiation */ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); } @@ -143,6 +143,10 @@ label { width: 60%; } +button { + border: 1px solid #000; +} + /* buttons */ .buttondisable { filter: invert(65%); @@ -160,6 +164,7 @@ label { /* Optional: rounds the corners of the button */ width: auto; float: right; + border: 1px solid #000; } #submitbutton:hover { @@ -219,7 +224,7 @@ h2 { height: 70px; /* Set a specific height for the buttons */ background-color: #cae4ff; - border: none; + border: 1px solid #000; color: white; padding: 10px 20px; margin: 0 10px; @@ -269,6 +274,7 @@ video { width: auto; height: auto; margin: auto auto; + display: block; } iframe { @@ -286,8 +292,10 @@ iframe { .iframe-container { position: relative; - padding-bottom: 56.25%; + /*padding-bottom: 56.25%;*/ /* 16:9 */ + padding-bottom: 100%; + /* 1:1 */ height: 0; } diff --git a/slaeforms/static/videos/0009-inflected.mp4 b/slaeforms/static/videos/0009-inflected.mp4 index d4ebf52..2e382d1 100644 Binary files a/slaeforms/static/videos/0009-inflected.mp4 and b/slaeforms/static/videos/0009-inflected.mp4 differ diff --git a/slaeforms/static/videos/0009-intro-inflected.mp4 b/slaeforms/static/videos/0009-intro-inflected.mp4 new file mode 100644 index 0000000..f61b587 Binary files /dev/null and b/slaeforms/static/videos/0009-intro-inflected.mp4 differ diff --git a/slaeforms/static/videos/0009-mocap.mp4 b/slaeforms/static/videos/0009-mocap.mp4 index d673e96..b4198d3 100644 Binary files a/slaeforms/static/videos/0009-mocap.mp4 and b/slaeforms/static/videos/0009-mocap.mp4 differ diff --git a/slaeforms/static/videos/0009-simple.mp4 b/slaeforms/static/videos/0009-simple.mp4 index c044ad9..5265510 100644 Binary files a/slaeforms/static/videos/0009-simple.mp4 and b/slaeforms/static/videos/0009-simple.mp4 differ diff --git a/slaeforms/static/videos/0009-variation-inflected.mp4 b/slaeforms/static/videos/0009-variation-inflected.mp4 new file mode 100644 index 0000000..2bbbc09 Binary files /dev/null and b/slaeforms/static/videos/0009-variation-inflected.mp4 differ diff --git a/slaeforms/static/videos/0009-variation-wide.mp4 b/slaeforms/static/videos/0009-variation-wide.mp4 deleted file mode 100644 index 1e4bbda..0000000 Binary files a/slaeforms/static/videos/0009-variation-wide.mp4 and /dev/null differ diff --git a/slaeforms/static/videos/0018-inflected.mp4 b/slaeforms/static/videos/0018-inflected.mp4 index c99ec70..878b8b1 100644 Binary files a/slaeforms/static/videos/0018-inflected.mp4 and b/slaeforms/static/videos/0018-inflected.mp4 differ diff --git a/slaeforms/static/videos/0018-mocap.mp4 b/slaeforms/static/videos/0018-mocap.mp4 index 90c12db..d8fb38d 100644 Binary files a/slaeforms/static/videos/0018-mocap.mp4 and b/slaeforms/static/videos/0018-mocap.mp4 differ diff --git a/slaeforms/static/videos/0018-simple.mp4 b/slaeforms/static/videos/0018-simple.mp4 index 463cebf..69228d4 100644 Binary files a/slaeforms/static/videos/0018-simple.mp4 and b/slaeforms/static/videos/0018-simple.mp4 differ diff --git a/slaeforms/static/videos/0020-inflected.mp4 b/slaeforms/static/videos/0020-inflected.mp4 index 52f8101..96d04de 100644 Binary files a/slaeforms/static/videos/0020-inflected.mp4 and b/slaeforms/static/videos/0020-inflected.mp4 differ diff --git a/slaeforms/static/videos/0020-mocap.mp4 b/slaeforms/static/videos/0020-mocap.mp4 index 9724011..8bfde84 100644 Binary files a/slaeforms/static/videos/0020-mocap.mp4 and b/slaeforms/static/videos/0020-mocap.mp4 differ diff --git a/slaeforms/static/videos/0020-simple.mp4 b/slaeforms/static/videos/0020-simple.mp4 index c20dadb..b83592d 100644 Binary files a/slaeforms/static/videos/0020-simple.mp4 and b/slaeforms/static/videos/0020-simple.mp4 differ diff --git a/slaeforms/static/videos/0021-inflected.mp4 b/slaeforms/static/videos/0021-inflected.mp4 index 9a2bc5b..763fd81 100644 Binary files a/slaeforms/static/videos/0021-inflected.mp4 and b/slaeforms/static/videos/0021-inflected.mp4 differ diff --git a/slaeforms/static/videos/0021-mocap.mp4 b/slaeforms/static/videos/0021-mocap.mp4 index d752987..90a961d 100644 Binary files a/slaeforms/static/videos/0021-mocap.mp4 and b/slaeforms/static/videos/0021-mocap.mp4 differ diff --git a/slaeforms/static/videos/0021-simple.mp4 b/slaeforms/static/videos/0021-simple.mp4 index 5e71308..95b5e4d 100644 Binary files a/slaeforms/static/videos/0021-simple.mp4 and b/slaeforms/static/videos/0021-simple.mp4 differ diff --git a/slaeforms/static/videos/0022-inflected.mp4 b/slaeforms/static/videos/0022-inflected.mp4 index 2c189d4..4f84461 100644 Binary files a/slaeforms/static/videos/0022-inflected.mp4 and b/slaeforms/static/videos/0022-inflected.mp4 differ diff --git a/slaeforms/static/videos/0022-mocap.mp4 b/slaeforms/static/videos/0022-mocap.mp4 index c4b3d04..b8b0203 100644 Binary files a/slaeforms/static/videos/0022-mocap.mp4 and b/slaeforms/static/videos/0022-mocap.mp4 differ diff --git a/slaeforms/static/videos/0022-simple.mp4 b/slaeforms/static/videos/0022-simple.mp4 index c54758d..37186a6 100644 Binary files a/slaeforms/static/videos/0022-simple.mp4 and b/slaeforms/static/videos/0022-simple.mp4 differ diff --git a/slaeforms/static/videos/0044-inflected.mp4 b/slaeforms/static/videos/0044-inflected.mp4 new file mode 100644 index 0000000..3206997 Binary files /dev/null and b/slaeforms/static/videos/0044-inflected.mp4 differ diff --git a/slaeforms/static/videos/0044-mocap.mp4 b/slaeforms/static/videos/0044-mocap.mp4 new file mode 100644 index 0000000..5a1ef8d Binary files /dev/null and b/slaeforms/static/videos/0044-mocap.mp4 differ diff --git a/slaeforms/static/videos/0044-simple.mp4 b/slaeforms/static/videos/0044-simple.mp4 new file mode 100644 index 0000000..1ff6ce0 Binary files /dev/null and b/slaeforms/static/videos/0044-simple.mp4 differ diff --git a/slaeforms/templates/p2infos.html b/slaeforms/templates/p2infos.html index ebed027..83aa299 100644 --- a/slaeforms/templates/p2infos.html +++ b/slaeforms/templates/p2infos.html @@ -1,7 +1,7 @@
Studie Teil 2:
Im Folgenden sehen Sie zwei Videos, in denen der gleiche Satz mit unterschiedlichen Formulierungen gebärdet wird.
-Der folgende Satz wird gebärdet: Gleis 18, Einfahrt RE 77 Richtung Köln Hauptbahnhof über Hannover, Abfahrt 3:44 Uhr.
+Der folgende Satz wird gebärdet: Einfahrt RE 77 Richtung Köln Hauptbahnhof über Hannover, Abfahrt 3:44 Uhr.
Bitte verwenden Sie die Punkteskala, um zu bewerten, welches der beiden Videos Sie besser finden.