diff --git a/CTFd/themes/admin/templates/base.html b/CTFd/themes/admin/templates/base.html
index fc2849a2fe4ae74dae561a8ca567950fe4335d04..3f7df87a5615ee1a0978f1e04880cae794ce1d1d 100644
--- a/CTFd/themes/admin/templates/base.html
+++ b/CTFd/themes/admin/templates/base.html
@@ -46,7 +46,7 @@
<body>
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
<div class="container">
- <a href="{{ url_for('views.static_html', route='/') }}" class="navbar-brand"><img class="img-responsive ctf_logo" src="{{ url_for('views.themes', theme='core', path='img/favicon.ico') }}" height="25" alt="{{ Configs.ctf_name }}">PolyScav</a>
+ <a href="{{ url_for('views.static_html', route='/scoreboard') }}" class="navbar-brand"><img class="img-responsive ctf_logo" src="{{ url_for('views.themes', theme='core', path='img/favicon.ico') }}" height="25" alt="{{ Configs.ctf_name }}">PolyScav</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#base-navbars"
aria-controls="base-navbars" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
@@ -54,6 +54,13 @@
<div class="collapse navbar-collapse" id="base-navbars">
<ul class="navbar-nav mr-auto">
<li class="nav-item"><a class="nav-link" href="{{ url_for('admin.statistics') }}">Statistiques</a></li>
+ <li class="nav-item dropdown">
+ <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="true">Pages</a>
+ <div class="dropdown-menu">
+ <a class="dropdown-item" href="{{ url_for('admin.pages_listing') }}">All Pages</a>
+ <a class="dropdown-item" href="{{ url_for('admin.pages_new') }}">New Page</a>
+ </div>
+ </li>
<li class="nav-item"><a class="nav-link" href="{{ url_for('admin.notifications') }}">Notifications</a>
</li>
diff --git a/CTFd/themes/core-beta/templates/components/navbar.html b/CTFd/themes/core-beta/templates/components/navbar.html
index c761c30aefd1c1ab73f6f75b466456769e2101d6..abf806cc4d1fb2a57f9d25c9c263290bf0df837d 100644
--- a/CTFd/themes/core-beta/templates/components/navbar.html
+++ b/CTFd/themes/core-beta/templates/components/navbar.html
@@ -1,6 +1,6 @@
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
<div class="container">
- <a href="{{ url_for('views.static_html', route='/') }}" class="navbar-brand">
+ <a href="{{ url_for('views.static_html', route='/scoreboard') }}" class="navbar-brand">
<img class="img-responsive ctf_logo" src="/themes/core/static/img/favicon.ico?d=3eb0ea16" height="25" alt="PolyScav">
PolyScav
<!-- {% if Configs.ctf_logo %}
diff --git a/CTFd/themes/core/templates/components/navbar.html b/CTFd/themes/core/templates/components/navbar.html
index 4a6394c5ba8610504cab79f1059971fb607e7b4c..7248ae2bd0fa76532e27200cf480441ea9669585 100644
--- a/CTFd/themes/core/templates/components/navbar.html
+++ b/CTFd/themes/core/templates/components/navbar.html
@@ -1,6 +1,6 @@
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
<div class="container">
- <a href="{{ url_for('views.static_html', route='/') }}" class="navbar-brand">
+ <a href="{{ url_for('views.static_html', route='/scoreboard') }}" class="navbar-brand">
{% if Configs.ctf_logo %}
<img class="img-responsive ctf_logo" src="{{ url_for('views.files', path=Configs.ctf_logo) }}" height="25" alt="{{ Configs.ctf_name }}">
{% else %}
diff --git a/CTFd/views.py b/CTFd/views.py
index 59b281633fd8033032288ebd46abd7e6f2195140..c921a2ed2126d1b53da9712e852d7a8fd010ba05 100644
--- a/CTFd/views.py
+++ b/CTFd/views.py
@@ -412,14 +412,18 @@ def static_html(route):
"""
page = get_page(route)
if page is None:
- abort(404)
+ return redirect(url_for("scoreboard.listing", next=request.full_path))
else:
if page.auth_required and authed() is False:
return redirect(url_for("auth.login", next=request.full_path))
-
- splash_visibility = splash_visible()
- print("splash_visibility: " + str(splash_visibility))
- return render_template("scoreboard.html", splash_visibility=splash_visibility)
+
+ if route == "scoreboard":
+ splash_visibility = splash_visible()
+ print("splash_visibility: " + str(splash_visibility))
+ return render_template("scoreboard.html", splash_visibility=splash_visibility)
+
+ return render_template("page.html", content=page.html, title=page.title)
+
@views.route("/tos")