diff --git a/cloudbot/web/main.py b/cloudbot/web/main.py index 5834986db..1f3cd8503 100644 --- a/cloudbot/web/main.py +++ b/cloudbot/web/main.py @@ -33,7 +33,7 @@ def get(self): class WebInterface(): - def __init__(self, bot, port=8080, address="0.0.0.0"): + def __init__(self, bot, port=8090, address="0.0.0.0"): self.bot = bot self.port = port self.address = address diff --git a/cloudbot/web/templates/basic.html b/cloudbot/web/templates/basic.html index 702c88425..94aed6cbb 100644 --- a/cloudbot/web/templates/basic.html +++ b/cloudbot/web/templates/basic.html @@ -1,4 +1,5 @@ {% extends "layout.html" %} +{% set active_page = "index" %} {% block title %}{{ heading }} - {{ super() }}{% endblock %} {% block content %}
diff --git a/cloudbot/web/templates/layout.html b/cloudbot/web/templates/layout.html index 6bd2c12f4..3d70cf4b6 100644 --- a/cloudbot/web/templates/layout.html +++ b/cloudbot/web/templates/layout.html @@ -1,26 +1,30 @@ +{% set navigation_bar = [ + ('/', 'index', 'Status'), + ('/commands/', 'commands', 'Commands'), + ('/factoids/', 'factoids', 'Factoids') +] -%} +{% set active_page = active_page|default('index') -%} {% block head %} - - - - - - - + + + + + + - {% block title %}{{ main_title }}{% endblock %} + {% block title %}{{ main_title }}{% endblock %} - - - + + - - + + {% endblock %} @@ -40,9 +44,10 @@
@@ -52,12 +57,8 @@
{% block content %}{% endblock %}
- - - - +