From b14bc2d608051adbea3b425a4278e8729b8bd50e Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 23 Apr 2024 17:24:50 +0200 Subject: [PATCH] Favicon added maybe more idk --- slaeforms/app.py | 6 +- slaeforms/static/icons/favicon.ico | Bin 0 -> 5262 bytes slaeforms/static/styles.css | 24 +++- slaeforms/templates/Study1 | 64 +++++++++ slaeforms/templates/data.html | 1 + slaeforms/templates/layout1.html | 1 + slaeforms/templates/layout2.html | 1 + slaeforms/templates/myvideotemplate.html | 162 ++++++++++++----------- slaeforms/templates/templatetest1.html | 16 +++ slaeforms/templates/videorecorder3.html | 2 +- 10 files changed, 192 insertions(+), 85 deletions(-) create mode 100644 slaeforms/static/icons/favicon.ico create mode 100644 slaeforms/templates/Study1 create mode 100644 slaeforms/templates/templatetest1.html diff --git a/slaeforms/app.py b/slaeforms/app.py index add31e7..d90615e 100644 --- a/slaeforms/app.py +++ b/slaeforms/app.py @@ -2,7 +2,7 @@ import sys import json import random import base64 -from flask import Flask, redirect, url_for, request, session, make_response, jsonify +from flask import Flask, redirect, url_for, request, session, make_response, jsonify, send_from_directory from flask import render_template from flask_sqlalchemy import SQLAlchemy from sqlalchemy.orm import DeclarativeBase @@ -224,4 +224,6 @@ def delete_all_entries(): @app.route("/") def blank(): - return "blank page" \ No newline at end of file + return "blank page" + + diff --git a/slaeforms/static/icons/favicon.ico b/slaeforms/static/icons/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..aea1c7cee751699e9dff1ff25edb04ebf924080c GIT binary patch literal 5262 zcmeI0ze)o^5Ql#kDVa1bu?@5o~<|YrE4%UmzgiiabE7 zkiDJE>|7BckUt!x$Se%s?cVIbd~C5Skl+N}s}?iCOAELK;2e17@O}<_@S1b_|0V(Y z7r-^=bU7Y4WS@;@3=j{`r8e{PQuAJm$dJtPOC>}a69W4@)E0W)ws1`c_tIXxcD)~OjV17^Ssm;p0j2AVY>?mW0K+AN#HSf2TO)m2x|;`*qpet|jC-q$dCX literal 0 HcmV?d00001 diff --git a/slaeforms/static/styles.css b/slaeforms/static/styles.css index 456c3c4..eb80696 100644 --- a/slaeforms/static/styles.css +++ b/slaeforms/static/styles.css @@ -8,13 +8,22 @@ body { font-size: 16px; } +.spacer { + clear: both; + box-sizing: border-box; +} + +.buttondisable { + filter: invert(65%); +} + .videocontrols { width: 100px; /* Set a specific width for the buttons */ height: 70px; /* Set a specific height for the buttons */ background-color: #cae4ff; border: none; - border: none; color: white; + padding: 10px 20px; margin: 0 10px; border-radius: 5px; cursor: pointer; @@ -22,6 +31,17 @@ body { display: inline-flex; /* Display button contents as a flexbox */ justify-content: center; /* Center contents horizontally */ align-items: center; /* Center contents vertically */ + text-align: center; +} + +.videocontrols img { + max-width: 65%; + max-height: 65%; + text-align: center; + margin: auto; + width: auto; /* Make the image fill its container */ + height: auto; /* Make the image fill its container */ + display: block; /* Remove any extra space around the image */ } .columncontainer { @@ -106,7 +126,7 @@ input, label { } .likert input:focus + span { - outline: -webkit-focus-ring-color auto 1px; + outline: auto 1px; /*-webkit-focus-ring-color*/ } .likert span:hover { diff --git a/slaeforms/templates/Study1 b/slaeforms/templates/Study1 new file mode 100644 index 0000000..62d6a8f --- /dev/null +++ b/slaeforms/templates/Study1 @@ -0,0 +1,64 @@ + + + + + + + Testform + + + + +

Question: {{ current_question }}

+ {% if (videotype == "single")%} +
+

Video 1

+ +
+ {% elif (videotype == "pairwise")%} +
+
+

Video 1

+ +
+
+

Video 2

+ +
+
+ + {% else %} +

Error: No Videotype could be matched or was given!

+ {% endif %} +
+ {% for block in config["question 1"]["blocks"] %} + {% if (config["question 1"]["blocks"][block]["type"] == "likert") %} +
+
+ + + + + +
+
+ {% elif (config["question 1"]["blocks"][block]["type"] == "textinput") %} + + + {% else %} +

Error: A block could not be loaded!

+ {% endif %} + {% endfor %} +

+
+ + + \ No newline at end of file diff --git a/slaeforms/templates/data.html b/slaeforms/templates/data.html index 12014f4..93d5312 100644 --- a/slaeforms/templates/data.html +++ b/slaeforms/templates/data.html @@ -5,6 +5,7 @@ Testform + diff --git a/slaeforms/templates/layout1.html b/slaeforms/templates/layout1.html index c29eace..3e45e1d 100644 --- a/slaeforms/templates/layout1.html +++ b/slaeforms/templates/layout1.html @@ -5,6 +5,7 @@ Testform + diff --git a/slaeforms/templates/layout2.html b/slaeforms/templates/layout2.html index af65cb0..f3154dc 100644 --- a/slaeforms/templates/layout2.html +++ b/slaeforms/templates/layout2.html @@ -5,6 +5,7 @@ Testform + diff --git a/slaeforms/templates/myvideotemplate.html b/slaeforms/templates/myvideotemplate.html index 551eea0..3c32365 100644 --- a/slaeforms/templates/myvideotemplate.html +++ b/slaeforms/templates/myvideotemplate.html @@ -6,76 +6,44 @@ Testform - +

Gib Feedback als Video

-
- +
- - - - - - -
- -
+
+ +
+
diff --git a/slaeforms/templates/templatetest1.html b/slaeforms/templates/templatetest1.html new file mode 100644 index 0000000..ec97ada --- /dev/null +++ b/slaeforms/templates/templatetest1.html @@ -0,0 +1,16 @@ + + + + + + + Testform + + + + + + + + + \ No newline at end of file diff --git a/slaeforms/templates/videorecorder3.html b/slaeforms/templates/videorecorder3.html index 7bf4b20..1678d01 100644 --- a/slaeforms/templates/videorecorder3.html +++ b/slaeforms/templates/videorecorder3.html @@ -88,7 +88,7 @@ const search = new URLSearchParams({ extname: ".webm", }).toString(); - // this string is literally jsut "extname=.webm", WHY? + // this string is literally just "extname=.webm", WHY? const url = "/api/upload/blob?" + search;