- 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	26
27	27	# FIXED
28	28
	29	+- mathjax e jquery no login
29	30	- mostrar erro quando nao consegue importar questions files
30	31	- pacotes exactos usados para instalar.
31	32	- detectar colisoes nas referencias das perguntas.
...	...
...	...	@@ -5,6 +5,7 @@ from hashlib import sha256
5	5	class Database(object):
6	6	def __init__(self, db):
7	7	self.db = db # sqlite3 filename
	8	+ # FIXME check that database exists
8	9
9	10	# get results from previous tests of a student
10	11	def student_grades(self, uid):
...	...
1		-a: dskld
2	1	-
3	2	ref: solar-system-jupiter
4	3	type: radio
...	...	@@ -35,7 +34,7 @@ a: dskld
35	34	hint: It's not red.
36	35	# ---------------------------------------------------------------------------
37	36	-
38		- ref: question-v1
	37	+ ref: question-v2
39	38	type: text_regex
40	39	text: What's my favorite basic color?
41	40	correct: '[bB]lue'
...	...
...	...	@@ -8,6 +8,17 @@
8	8	<meta name="author" content="" />
9	9	<link rel="icon" href="/favicon.ico" />
10	10
	11	+<!-- MathJax -->
	12	+ <script type="text/x-mathjax-config">
	13	+ MathJax.Hub.Config({
	14	+ extensions: ["tex2jax.js"],
	15	+ jax: ["input/TeX","output/HTML-CSS"],
	16	+ tex2jax: {inlineMath: [["$$$","$$$"], ["$","$"], ["\\(","\\)"]]}
	17	+ });
	18	+ </script>
	19	+ <script type="text/javascript" src="/js/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
	20	+ </script>
	21	+
11	22	<title>UEvora</title>
12	23
13	24	<!-- Bootstrap core CSS -->
...	...	@@ -37,28 +48,46 @@
37	48	box-shadow: 0px 2px 10px 3px rgba(0, 0, 0, .2);
38	49	border-radius:5px;
39	50	}
	51	+ .voffset {
	52	+ margin-bottom: 20px;
	53	+ }
40	54	</style>
41	55
42	56	</head>
43	57
44	58	<body>
45		- <div class="container">
	59	+ <div class="container-fluid">
46	60	<div class="well drop-shadow">
47		- <form method="post" action="/auth/login" class="form-signin">
	61	+ <div class="row voffset">
	62	+ <div class="col-xs-4">
	63	+ <img src="/logo_horizontal.png" class="img-responsive" />
	64	+ </div>
	65	+ <div class="col-xs-8">
	66	+ <h4 class="text-right">
	67	+ <small>
	68	+ $\sqrt{2\pi}$
	69	+ </small>
	70	+ </h4>
	71	+ </div>
	72	+ </div>
48	73
49		- <h2 class="form-signin-heading">Sign in</h2>
	74	+ <form method="post" action="/auth/login" class="form-signin">
50	75
	76	+ <div class="row">
51	77	<input type="hidden" name="from_page" value="${from_page}">
52	78
53		- <label for="inputEmail" class="sr-only">Number</label>
54		- <input type="text" name="uid" class="form-control" placeholder="Number, e.g. 99999" required autofocus>
	79	+ <input type="text" name="uid" class="form-control" placeholder="Número" required autofocus>
55	80
56		- <label for="inputPassword" class="sr-only">Password</label>
57	81	<input type="password" name="pw" class="form-control" placeholder="Password" required>
58		-
59		- <button class="btn btn-primary" type="submit">Sign in</button>
	82	+ </div>
	83	+ <div class="row">
	84	+ <button class="btn btn-primary" type="submit">
	85	+ <span class="glyphicon glyphicon-log-in"></span>  Entrar
	86	+ </button>
	87	+ </div>
60	88	</form>
61	89	</div>
	90	+
62	91	</div> <!-- /container -->
63	92	</body>
64	93	</html>
...	...
...	...	@@ -5,7 +5,7 @@
5	5	<meta http-equiv="X-UA-Compatible" content="IE=edge">
6	6	<meta name="viewport" content="width=device-width, initial-scale=1">
7	7	<title> ${t['title']} </title>
8		- <link rel="icon" href="favicon.ico">
	8	+ <link rel="icon" href="/favicon.ico">
9	9
10	10	<!-- MathJax -->
11	11	<script type="text/x-mathjax-config">
...	...	@@ -62,6 +62,7 @@
62	62	<div class="container-fluid drop-shadow">
63	63	<div class="navbar-header">
64	64	<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
	65	+ <!-- <span class="glyphicon glyphicon-menu-hamburger"></span> -->
65	66	<span class="icon-bar"></span>
66	67	<span class="icon-bar"></span>
67	68	<span class="icon-bar"></span>
...	...