web: Fix log page

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/base.html b/src/templates/base.html
index 6e60f28da3e0142a092a28417c83c0483ba14f4f..06b23d67d345a4322ddc7d0af4237559ecb8c70f 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -52,6 +52,9 @@
                                                                                                <a href="/users">{{ _("Users") }}</a>
                                                                                        </li>
                                                                                {% end %}
+                                                                               <li>
+                                                                                       <a href="/log">{{ _("Log") }}</a>
+                                                                               </li>
                                                                        </ul>
                                                                </li>
                                                        </ul>

diff --git a/src/templates/log.html b/src/templates/log.html
index 48a68fc052912707d1b35d4f69f9f0b5b5de05c7..774dec38a2dfb0aef662388e46868f6339bf6f66 100644 (file)
--- a/src/templates/log.html
+++ b/src/templates/log.html
@@ -1,7 +1,20 @@
 {% extends "base.html" %}
 
-{% block body %}
-       <h1>{{ _("Log") }}</h1>
+{% block title %}{{ _("Log") }}{% end block %}
 
-       {% module LogTable(log) %}
+{% block container %}
+       <nav aria-label="{{ _("You are here:") }}" role="navigation">
+               <ul class="breadcrumbs">
+                       <li>
+                               <a href="/">{{ _("Home") }}</a>
+                       </li>
+                       <li>
+                               <span class="show-for-sr">{{ _("Current") }}: </span> {{ _("Log") }}
+                       </li>
+               </ul>
+       </nav>
+
+       <h1 class="text-center">{{ _("Log") }}</h1>
+
+       {% module EventsList() %}
 {% end %}

diff --git a/src/web/__init__.py b/src/web/__init__.py
index b8110b3d8b976f46496500a900b305ad5e8c94f6..9e44840ec5ae90f3b8950135edd18e66fafbd478 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -201,7 +201,7 @@ class Application(tornado.web.Application):
                        (r"/search", search.SearchHandler),
 
                        # Log
-                       (r"/log", LogHandler),
+                       (r"/log", handlers.LogHandler),
                ], default_handler_class=errors.Error404Handler, **settings)
 
                # Launch backend

diff --git a/src/web/handlers.py b/src/web/handlers.py
index 94624e220f10fd07c039eb3f9073ac2d1bb5c5c7..2f3baa4e5b2e17f5261364a13e95e494c1441d48 100644 (file)
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -21,7 +21,7 @@ class FileDetailHandler(base.BaseHandler):
 
 class LogHandler(base.BaseHandler):
        def get(self):
-               self.render("log.html", log=self.backend.log)
+               self.render("log.html")
 
 
 class RepoActionHandler(base.BaseHandler):