- changed navbar to include logo on the left and time centered.

Miguel Barão
1 parent 29ec441a
Showing 5 changed files with 75 additions and 57 deletions Show diff stats
BUGS.md
serve.py
templates/admin.html
templates/login.html
templates/test.html
 # BUGS
+- config/logger.yaml ainda é do cherrypy...
+- servir imagens das perguntas
+- hints nao funciona
 - fazer renderer para formulas com mathjax serverside (mathjax-node).
 - fazer renderer para imagens, com links /file?ref=xpto;name=zzz.jpg
 - fazer renderer para linguagem assembly mips?
-- servir imagens das perguntas
-- hints nao funciona
-- uniformizar question.py com a de aprendizations...
 - permitir eliminar teste a decorrer
 - eventos unfocus?
 - servidor nao esta a lidar com eventos scroll/resize. ignorar?
@@ -39,6 +39,7 @@
 # FIXED
+- uniformizar question.py com a de aprendizations...
 - qual a diferenca entre md_to_html e md_to_html_review, parece desnecessario haver dois.
 - converter markdown para mistune.
 - como alterar configuracao para mostrar logs de debug?
@@ -321,10 +321,10 @@ class AdminHandler(BaseHandler):
 def main():
     # --- Commandline argument parsing
     argparser = argparse.ArgumentParser(description='Server for online tests. Enrolled students and tests have to be previously configured. Please read the documentation included with this software before running the server.')
-    argparser.add_argument('--debug', action='store_true',
-        help='Show datastructures when rendering questions')
-    argparser.add_argument('--allow-all', action='store_true', help='Students are initially allowed to login (can be denied later)')
     argparser.add_argument('testfile', type=str, nargs='+', help='test/exam in YAML format.') # FIXME only one exam supported at the moment
+    argparser.add_argument('--allow-all', action='store_true', help='Students are initially allowed to login (can be denied later)')
+    argparser.add_argument('--debug', action='store_true',
+        help='Enable debug messages.')
     arg = argparser.parse_args()
     # --- Setup logging
@@ -347,14 +347,14 @@ def main():
     }
     try:
-        app = App(config)
+        testapp = App(config)
     except AppException:
         logging.critical('Failed to start application.')
         sys.exit(1)
     # --- create web application
     try:
-        webapp = WebApplication(app, debug=arg.debug)
+        webapp = WebApplication(testapp, debug=arg.debug)
     except Exception as e:
         logging.critical('Can\'t start application.')
         raise e
@@ -22,7 +22,7 @@
 </head>
 <!-- ===================================================================== -->
 <body>
-<nav class="navbar navbar-expand-sm fixed-top navbar-dark bg-primary">
+<nav class="navbar navbar-expand-sm fixed-top navbar-dark bg-danger">
   <a class="navbar-brand" href="#">Admin</a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
@@ -38,7 +38,7 @@
     <!-- right -->
     <ul class="navbar-nav">
       <li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownAluno" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <a class="nav-link dropdown-toggle  active" href="#" id="navbarDropdownAluno" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           Aluno
         </a>
         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownAluno">
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta charset="utf-8">
-
-    <link rel="icon" href="/static/favicon.ico">
-    <link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css">
-
-    <title>Teste</title>
-  </head>
-<!-- ===================================================================== -->
-  <body>
-    <div class="container-fluid">
-      <div class="card bg-light border-secondary mb-3">
-        <div class="card-body">
-          <div class="row">
-
-            <div class="col-sm-4">
-              <img src="/static/logo_horizontal.png" class="img-responsive" width="60%">
-            </div>
-
-            <div class="col-sm-8">
+<head>
+  <title>Teste</title>
+  <link rel="icon" href="/static/favicon.ico">
+
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+  <link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css">
+
+</head>
+<!-- =================================================================== -->
+<body>
+  <div class="container-fluid">
+    <div class="card bg-light border-secondary mb-3">
+      <div class="card-body">
+        <div class="row">
+
+          <div class="col-sm-4">
+            <img src="/static/logo_horizontal.png" class="img-responsive" width="60%">
+          </div>
+
+          <div class="col-sm-8">
             <h4>Identificação:</h4>
-              <form method="post" action="/login" class="form-signin">
-                {% module xsrf_form_html() %}
-                <div class="form-group">
-                  <input type="text" name="uid" class="form-control" placeholder="Número" required autofocus>
-                  <input type="password" name="pw" class="form-control" placeholder="Password" required>
-                  <p> {{ error }} </p>
-                </div>
-                <button class="btn btn-primary" type="submit">
-                  <i class="fa fa-sign-in" aria-hidden="true"></i> Entrar
-                </button>
-              </form>
-            </div>
+
+            <form method="post" action="/login" class="form-signin">
+              {% module xsrf_form_html() %}
+              <div class="form-group">
+                <input type="text" name="uid" class="form-control" placeholder="Número" required autofocus>
+                <input type="password" name="pw" class="form-control" placeholder="Password" required>
+                <p> {{ error }} </p>
+              </div>
+              <button class="btn btn-primary" type="submit">
+                <i class="fa fa-sign-in" aria-hidden="true"></i> Entrar
+              </button>
+            </form>
           </div>
         </div>
       </div>
-    </div> <!-- container -->
+    </div>
+  </div> <!-- container -->
 <!-- Scripts -->
-    <script src="/static/js/jquery.min.js"></script>
-    <script src="/static/popper/umd/popper.min.js"></script>
-    <script src="/static/bootstrap/js/bootstrap.min.js"></script>
+  <script src="/static/js/jquery.min.js"></script>
+  <script src="/static/popper/umd/popper.min.js"></script>
+  <script src="/static/bootstrap/js/bootstrap.min.js"></script>
-  </body>
+</body>
 </html>
@@ -30,25 +30,40 @@
 <nav class="navbar navbar-expand-sm fixed-top navbar-dark bg-dark">
   <a class="navbar-brand" href="#">
-    <!-- <i class="fa fa-clock-o" aria-hidden="true"></i> -->
-    <span id="clock"> --:-- </span>
+    <img src="/static/logo_navbar.png" height="30" alt="">
   </a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
   <div class="collapse navbar-collapse" id="navbarText">
-    <ul class="navbar-nav mr-auto">
+    <ul class="nav navbar-nav">
+      <li class="nav-item"></li>
     </ul>
-    <span class="navbar-text">
-      <i class="fa fa-user" aria-hidden="true"></i>
-      <span id="name">{{ escape(t['student']['name']) }}</span>
-      (<span id="number">{{ escape(t['student']['number']) }}</span>)
-      <span class="caret"></span>
-    </span>
+    <ul class="nav navbar-nav mx-auto">
+        <li class="nav-item"><h5>
+          <span class="navbar-text" id="clock"> --:-- </span>
+          </h5>
+        </li>
+    </ul>
+
+    <ul class="nav navbar-nav">
+        <li class="nav-item">
+          <span class="navbar-text">
+            <i class="fa fa-user" aria-hidden="true"></i>
+            <span id="name">{{ escape(t['student']['name']) }}</span>
+            (<span id="number">{{ escape(t['student']['number']) }}</span>)
+            <span class="caret"></span>
+          </span>
+        </li>
+    </ul>
   </div>
 </nav>
+
+
+
+<!-- ===================================================================== -->
 <div class="container">
   <div class="jumbotron">
	@@ -22,7 +22,7 @@		@@ -22,7 +22,7 @@
22	</head>	22	</head>
23	<!-- ===================================================================== -->	23	<!-- ===================================================================== -->
24	<body>	24	<body>
25	-<nav class="navbar navbar-expand-sm fixed-top navbar-dark bg-primary">	25	+<nav class="navbar navbar-expand-sm fixed-top navbar-dark bg-danger">
26	<a class="navbar-brand" href="#">Admin</a>	26	<a class="navbar-brand" href="#">Admin</a>
27	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">	27	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
28	<span class="navbar-toggler-icon"></span>	28	<span class="navbar-toggler-icon"></span>
	@@ -38,7 +38,7 @@		@@ -38,7 +38,7 @@
38	<!-- right -->	38	<!-- right -->
39	<ul class="navbar-nav">	39	<ul class="navbar-nav">
40	<li class="nav-item dropdown">	40	<li class="nav-item dropdown">
41	- <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownAluno" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">	41	+ <a class="nav-link dropdown-toggle active" href="#" id="navbarDropdownAluno" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
42	Aluno	42	Aluno
43	</a>	43	</a>
44	<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownAluno">	44	<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownAluno">