From f4a563c7a40690fb9825b6bddd5662429a192b60 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Apr 26 2016 10:27:35 +0000 Subject: added master template added a master template, and changed hub.html and groups.html to use the new master tempate --- diff --git a/hubs/templates/groups.html b/hubs/templates/groups.html index 230e54a..0d3bc20 100644 --- a/hubs/templates/groups.html +++ b/hubs/templates/groups.html @@ -1,80 +1,8 @@ - - - Groups - - - - - - -
-
- -
- {% if g.auth.logged_in %} -
- IRC Chats - - User Icon - {# Logged in as #} {{ g.auth.nickname }} - - - -
- {% else %} - Not logged in. Click to login. - {% endif %} -
-
- -
- - - - -
-
-
-
-
- -
@@ -129,8 +57,4 @@
- - - - - +{% endblock %} diff --git a/hubs/templates/hubs.html b/hubs/templates/hubs.html index 5d3891b..f4fa36b 100644 --- a/hubs/templates/hubs.html +++ b/hubs/templates/hubs.html @@ -1,76 +1,7 @@ - - - - {{ hub.name }} - - - - - - - -
-
- -
- {% if g.auth.logged_in %} -
- - User Icon - -
-
Account Information
- Full Name: {{ g.auth.fullname }} - Email: {{ g.auth.email }} -
- Separated link -
-
- IRC Chats - {% else %} - Not logged in. Click to login. - {% endif %} -
-
- -
- - - - -
-
-
-
-
- - +{% block title %}{{ hub.name }}{% endblock %} +{% block content %}
{% if hub.user_hub %}
@@ -229,12 +160,10 @@
-
+{% endblock %} - - +{% block jscripts %} +{{ super() }} @@ -334,5 +263,4 @@ function setup_widgets(widgets) { setup_widgets(); - - +{% endblock %} diff --git a/hubs/templates/master.html b/hubs/templates/master.html new file mode 100644 index 0000000..ba26ba7 --- /dev/null +++ b/hubs/templates/master.html @@ -0,0 +1,85 @@ + + + + {% block title %}{% endblock %} + + + + + + + +
+
+ +
+ {% if g.auth.logged_in %} +
+ + User Icon + +
+
Account Information
+ Full Name: {{ g.auth.fullname }} + Email: {{ g.auth.email }} +
+ Separated link +
+
+ IRC Chats + {% else %} + Not logged in. Click to login. + {% endif %} +
+
+ +
+ + + + +
+
+
+
+
+ + +{% block content %}{% endblock %} + +
+{% block jscripts %} + + +{% endblock %} + + +