From 16b8fb455c5a10613292e58a055c9c93705f3fd0 Mon Sep 17 00:00:00 2001 From: Miguel Barão Date: Tue, 23 Jun 2015 00:07:30 +0100 Subject: [PATCH] - redesigned login, logo-ue and mathjax --- BUGS.md | 1 + database.py | 1 + demo/questions.yaml | 3 +-- static/logo_horizontal.png | Bin 0 -> 23773 bytes templates/login.html | 45 +++++++++++++++++++++++++++++++++++++-------- templates/test.html | 3 ++- 6 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 static/logo_horizontal.png diff --git a/BUGS.md b/BUGS.md index 2c66cf8..8094afa 100644 --- a/BUGS.md +++ b/BUGS.md @@ -26,6 +26,7 @@ # FIXED +- mathjax e jquery no login - mostrar erro quando nao consegue importar questions files - pacotes exactos usados para instalar. - detectar colisoes nas referencias das perguntas. diff --git a/database.py b/database.py index b9efeb1..1d59c52 100644 --- a/database.py +++ b/database.py @@ -5,6 +5,7 @@ from hashlib import sha256 class Database(object): def __init__(self, db): self.db = db # sqlite3 filename + # FIXME check that database exists # get results from previous tests of a student def student_grades(self, uid): diff --git a/demo/questions.yaml b/demo/questions.yaml index 9424747..83e835d 100644 --- a/demo/questions.yaml +++ b/demo/questions.yaml @@ -1,4 +1,3 @@ -a: dskld - ref: solar-system-jupiter type: radio @@ -35,7 +34,7 @@ a: dskld hint: It's not red. # --------------------------------------------------------------------------- - - ref: question-v1 + ref: question-v2 type: text_regex text: What's my favorite basic color? correct: '[bB]lue' diff --git a/static/logo_horizontal.png b/static/logo_horizontal.png new file mode 100644 index 0000000..b1f3db6 Binary files /dev/null and b/static/logo_horizontal.png differ diff --git a/templates/login.html b/templates/login.html index 1962bd2..2f8454c 100644 --- a/templates/login.html +++ b/templates/login.html @@ -8,6 +8,17 @@ + + + + UEvora @@ -37,28 +48,46 @@ box-shadow: 0px 2px 10px 3px rgba(0, 0, 0, .2); border-radius:5px; } + .voffset { + margin-bottom: 20px; + } -
+
-
+
diff --git a/templates/test.html b/templates/test.html index 9a50348..53b0e86 100644 --- a/templates/test.html +++ b/templates/test.html @@ -5,7 +5,7 @@ ${t['title']} - +