- redesigned login, logo-ue and mathjax

Miguel Barão
1 parent e529c8a8
Showing 6 changed files with 42 additions and 11 deletions Show diff stats
BUGS.md
database.py
demo/questions.yaml
static/logo_horizontal.png
templates/login.html
templates/test.html
@@ -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.
@@ -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):
-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'
@@ -8,6 +8,17 @@
     <meta name="author" content="" />
     <link rel="icon" href="/favicon.ico" />
+<!-- MathJax -->
+    <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+            extensions: ["tex2jax.js"],
+            jax: ["input/TeX","output/HTML-CSS"],
+            tex2jax: {inlineMath: [["$$$","$$$"], ["$","$"], ["\\(","\\)"]]}
+        });
+    </script>
+    <script type="text/javascript" src="/js/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+    </script>
+
     <title>UEvora</title>
     <!-- Bootstrap core CSS -->
@@ -37,28 +48,46 @@
           box-shadow: 0px 2px 10px 3px rgba(0, 0, 0, .2);
           border-radius:5px;
       }
+      .voffset {
+        margin-bottom: 20px;
+      }
     </style>
   </head>
   <body>
-    <div class="container">
+    <div class="container-fluid">
       <div class="well drop-shadow">
-        <form method="post" action="/auth/login" class="form-signin">
+        <div class="row voffset">
+          <div class="col-xs-4">
+            <img src="/logo_horizontal.png" class="img-responsive" />
+          </div>
+          <div class="col-xs-8">
+            <h4 class="text-right">
+            <small>
+              $\sqrt{2\pi}$
+            </small>
+            </h4>
+          </div>
+        </div>
-          <h2 class="form-signin-heading">Sign in</h2>
+        <form method="post" action="/auth/login" class="form-signin">
+        <div class="row">
           <input type="hidden" name="from_page" value="${from_page}">
-          <label for="inputEmail" class="sr-only">Number</label>
-          <input type="text" name="uid" class="form-control" placeholder="Number, e.g. 99999" required autofocus>
+          <input type="text" name="uid" class="form-control" placeholder="Número" required autofocus>
-          <label for="inputPassword" class="sr-only">Password</label>
           <input type="password" name="pw" class="form-control" placeholder="Password" required>
-
-          <button class="btn btn-primary" type="submit">Sign in</button>
+        </div>
+        <div class="row">
+          <button class="btn btn-primary" type="submit">
+            <span class="glyphicon glyphicon-log-in"></span>&nbsp; Entrar
+          </button>
+        </div>
         </form>
       </div>
+
     </div> <!-- /container -->
   </body>
 </html>
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title> ${t['title']} </title>
-    <link rel="icon" href="favicon.ico">
+    <link rel="icon" href="/favicon.ico">
 <!-- MathJax -->
     <script type="text/x-mathjax-config">
@@ -62,6 +62,7 @@
   <div class="container-fluid drop-shadow">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
+        <!-- <span class="glyphicon glyphicon-menu-hamburger"></span> -->
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
	@@ -26,6 +26,7 @@		@@ -26,6 +26,7 @@
26		26
27	# FIXED	27	# FIXED
28		28
		29	+- mathjax e jquery no login
29	- mostrar erro quando nao consegue importar questions files	30	- mostrar erro quando nao consegue importar questions files
30	- pacotes exactos usados para instalar.	31	- pacotes exactos usados para instalar.
31	- detectar colisoes nas referencias das perguntas.	32	- detectar colisoes nas referencias das perguntas.
	@@ -5,6 +5,7 @@ from hashlib import sha256		@@ -5,6 +5,7 @@ from hashlib import sha256
5	class Database(object):	5	class Database(object):
6	def __init__(self, db):	6	def __init__(self, db):
7	self.db = db # sqlite3 filename	7	self.db = db # sqlite3 filename
		8	+ # FIXME check that database exists
8		9
9	# get results from previous tests of a student	10	# get results from previous tests of a student
10	def student_grades(self, uid):	11	def student_grades(self, uid):