From e2760f8f805625ecfbcfed8624c0b6807a47b01d Mon Sep 17 00:00:00 2001
From: KF7EEL <kf7eel@qsl.net>
Date: Fri, 6 Aug 2021 19:54:11 -0700
Subject: [PATCH] move to bootstrap navbar
---
web/templates/flask_user_layout.html | 134 +++++++++++++--------------
1 file changed, 65 insertions(+), 69 deletions(-)
diff --git a/web/templates/flask_user_layout.html b/web/templates/flask_user_layout.html
index 459ca17..a80388e 100644
--- a/web/templates/flask_user_layout.html
+++ b/web/templates/flask_user_layout.html
@@ -30,81 +30,77 @@
<body>
-<h1 style="text-align: center;">{{ user_manager.USER_APP_NAME }}</h1>
- <p><img style="display: block; margin-left: auto; margin-right: auto;" src="{{ url_for('static', filename='HBnet.png') }}" alt="Logo" width="300" height="144" /></p>
-<h1 style="text-align: center;">{{title}}</h1>
-<hr />
-<table style="width: 900px; margin-left: auto; margin-right: auto;" border="black" cellspacing="3" cellpadding="3">
-<tbody>
-<tr>
-
-<td style="text-align: center;"><a href={{url}}/> Home </a></td>
-<td style="text-align: center;"><a href={{url}}/news> News </a></td>
-<td style="text-align: center;"><a href={{url}}/talkgroups> Talkgroups </a></td>
+
+ <nav class="navbar navbar-default">
+ <div class="container-fluid">
+ <div class="navbar-header">
+ <a class="navbar-brand">{{ user_manager.USER_APP_NAME }}</a>
+ </div>
+ <ul class="nav navbar-nav">
+ <li><a href="/">Home</a></li>
+ <li><a href="{{url}}/talkgroups">Talkgroups</a></li>
+ <li><a href="{{url}}/news">News</a></li>
+ <li><a href="{{url}}/help">Help</a></li>
+ </ul>
+ <ul class="nav navbar-nav navbar-right">
+ {% if not call_or_get(current_user.is_authenticated) %}
+ <li><a href="{{ url_for('user.login') }}"><span class="glyphicon glyphicon-log-in"></span> Sign In</a></li>
+ <li><a href="{{ url_for('user.register') }}"><span class="glyphicon glyphicon-user"></span> Register</a></li>
+ {% endif %}
+ {% if call_or_get(current_user.is_authenticated) %}
+ <li><a href="{{url}}/generate_passphrase"><span class="glyphicon glyphicon-lock"></span> Passphrase(s)</a></li>
+ <li><a href="{{ url_for('user.edit_user_profile') }}"><span class="glyphicon glyphicon-user"></span> Edit {{ current_user.username or current_user.email }}</a></li>
+ <li><a href="{{ url_for('user.logout') }}"><span class="glyphicon glyphicon-remove"></span> Sign Out</a></li>
- {% if not call_or_get(current_user.is_authenticated) %}
-<td style="text-align: center;"><a href={{ url_for('user.register') }}> Register </a></td>
-<td style="text-align: center;"><a href={{ url_for('user.login') }}> Sign in </a></td>
- {% endif %}
+ </ul>
+ {% endif%}
+
+<!--Admin Menu -->
{% if call_or_get(current_user.is_authenticated) %}
{% if call_or_get(current_user.has_roles('Admin')) %}
- <td style="text-align: center;"><a href={{url}}/add_user><strong> Add a User </strong></a></td>
- <td style="text-align: center;"><a href={{url}}/list_users><strong> Edit Users </strong></a></td>
- <td style="text-align: center;"><a href={{url}}/approve_users><strong> Waiting Approval </strong></a></td>
- <td style="text-align: center;"><a href={{url}}/auth_log><strong> Auth Log </strong></a></td>
+ <ul class="nav navbar-nav navbar-right">
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">MMDVM Admin
+ <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="{{url}}/manage_servers">Manage Servers</a></li>
+ <li><a href="{{url}}/manage_peers">Manage Peers</a></li>
+ <li><a href="{{url}}/manage_masters">Manage Masters</a></li>
+ <li><a href="{{url}}/manage_rules">Manage Rules</a></li>
+ </ul>
+ </li>
- {% endif %}
-<td style="text-align: center;"><a href={{url}}/help>Help</a></td>
-<td style="text-align: center;"><a href={{url}}/generate_passphrase> Passphrase(s) </a></td>
-<!-- <td style="text-align: center;"><a href={{url}}/user_tg> Current TGs </a></td> -->
-<td style="text-align: center;"><a href="{{ url_for('user.edit_user_profile') }}"> Edit {{ current_user.username or current_user.email }} </a></td>
-<td style="text-align: center;"><a href={{ url_for('user.logout') }}> Sign out </a></td>
- {% endif %}
-</tr>
-</tbody>
-</table>
-
-{% if call_or_get(current_user.is_authenticated) %}
- {% if call_or_get(current_user.has_roles('Admin')) %}
-<table style="width: 900px; margin-left: auto; margin-right: auto;" border="black" cellspacing="3" cellpadding="3">
-<tbody>
-<tr>
-<td style="text-align: center;"><a href={{url}}/manage_servers> Manage Servers </a></td>
-<td style="text-align: center;"><a href={{url}}/manage_peers> Manage Peers </a></td>
-<td style="text-align: center;"><a href={{url}}/manage_masters> Manage Masters </a></td>
-<td style="text-align: center;"><a href={{url}}/manage_rules> Manage Rules </a></td>
-<td style="text-align: center;"><a href={{url}}/manage_news> Manage News </a></td>
-<td style="text-align: center;"><a href={{url}}/misc_settings> Misc Options </a></td>
-
-
-</tr>
-</tbody>
-</table>
- {% endif %}
- {% endif %}
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">User Admin
+ <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="{{url}}/add_user">Add User</a></li>
+ <li><a href="{{url}}/list_users">Manage Users</a></li>
+ <li><a href="{{url}}/approve_users">Waiting Approval</a></li>
+ <li><a href="{{url}}/auth_log">Authorization Log</a></li>
+ </ul>
+ </li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Other
+ <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="{{url}}/manage_news">Manage News</a></li>
+ <li><a href="{{url}}/misc_settings">Misc Options</a></li>
+ </ul>
+ </li>
+
+ </ul>
+ {% endif %}
+ {% endif %}
+ </div>
+</nav>
+ <p><img style="display: block; margin-left: auto; margin-right: auto;" src="{{ url_for('static', filename='HBnet.png') }}" alt="Logo" width="300" height="144" /></p>
<hr />
- {% block body %}
-<!--
- <div id="header-div" class="clearfix with-margins">
- <div class="pull-left"><a href="/"><h1 class="no-margins">{{ user_manager.USER_APP_NAME }}</h1></a></div>
- <div class="pull-right">
- {% if call_or_get(current_user.is_authenticated) %}
- <a href="{{ url_for('user.edit_user_profile') }}">{{ current_user.username or current_user.email }}</a>
- |
- <a href="{{ url_for('user.logout') }}">{%trans%}Sign out{%endtrans%}</a>
- {% else %}
- <a href="{{ url_for('user.login') }}">{%trans%}Sign in{%endtrans%}</a>
- {% endif %}
- </div>
- </div>
- {% block menu %}
- <div id="menu-div" class="with-margins">
- <a href="/">{%trans%}Home page{%endtrans%}</a>
- </div>
- {% endblock %}
--->
+
+ {% block body %}
+
<hr class="no-margins"/>
<div id="main-div" class="with-margins">
@@ -134,7 +130,7 @@
<br/>
<hr class="no-margins"/>
<div id="footer-div" class="clearfix with-margins">
- <p style="text-align: center;"><strong>{{ user_manager.USER_APP_NAME }}<br /></strong><a href="https://hbnet.xyz">HBNet Project</a> Web Service - Dev<br />Created by KF7EEL<br />Contributors: W7NCX</p>
+ <p style="text-align: center;"><strong>{{ user_manager.USER_APP_NAME }}<br /></strong><a href="https://hbnet.xyz">HBNet Project</a><br />Created by KF7EEL<br />Contributors: W7NCX</p>
</div>
{% endblock %}