ShaYmez
/
hbnet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more cosmetic changes

This commit is contained in:
KF7EEL 2021-08-05 14:28:38 -07:00
parent 15ddbbff88
commit b8b8e09cae
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/app.py
View File

@ -935,7 +935,13 @@ def create_app():
@roles_required('Admin') # Use of @roles_required decorator
def approve_list():
u = User.query.all()
wait_list = '''<h2 style="text-align: center;"><strong>Users waiting for approval:</strong></h2><p>&nbsp;</p><table style="width: 700px; margin-left: auto; margin-right: auto;" border="1">
wait_list = '''<h2 style="text-align: center;"><strong>Users waiting for approval:</strong></h2>
<p>&nbsp;</p>
<p style="text-align: center;">Click on the callsign to approve user. An email may be sent to inform the user that they can login.</p>
<p>&nbsp;</p>
<table style="width: 700px; margin-left: auto; margin-right: auto;" border="1">
<tbody>
<tr>
<td style="width: 107px; text-align: center;"><strong>Callsign</strong></td>

42
web/templates/flask_user_layout.html
View File

@ -34,31 +34,31 @@
<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: 800px; margin-left: auto; margin-right: auto;" border="black" cellspacing="3" cellpadding="3">
<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>
<td style="text-align: center;"><a href={{url}}/>&nbsp; Home &nbsp;</a></td>
<td style="text-align: center;"><a href={{url}}/news>&nbsp; News &nbsp;</a></td>
<td style="text-align: center;"><a href={{url}}/talkgroups>&nbsp; Talkgroups &nbsp;</a></td>
{% 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>
<td style="text-align: center;"><a href={{ url_for('user.register') }}>&nbsp; Register &nbsp;</a></td>
<td style="text-align: center;"><a href={{ url_for('user.login') }}>&nbsp; Sign in &nbsp;</a></td>
{% endif %}
{% 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>
<td style="text-align: center;"><a href={{url}}/add_user><strong>&nbsp; Add a User &nbsp;</strong></a></td>
<td style="text-align: center;"><a href={{url}}/list_users><strong>&nbsp; Edit Users &nbsp;</strong></a></td>
<td style="text-align: center;"><a href={{url}}/approve_users><strong>&nbsp; Waiting Approval &nbsp;</strong></a></td>
<td style="text-align: center;"><a href={{url}}/auth_log><strong>&nbsp; Auth Log &nbsp;</strong></a></td>
{% 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>
<td style="text-align: center;"><a href={{url}}/generate_passphrase>&nbsp; Passphrase(s) &nbsp;</a></td>
<!-- <td style="text-align: center;"><a href={{url}}/user_tg>&nbsp; Current TGs &nbsp;</a></td> -->
<td style="text-align: center;"><a href="{{ url_for('user.edit_user_profile') }}">&nbsp; Edit {{ current_user.username or current_user.email }} &nbsp;</a></td>
<td style="text-align: center;"><a href={{ url_for('user.logout') }}>&nbsp; Sign out &nbsp;</a></td>
{% endif %}
</tr>
</tbody>
@ -66,15 +66,15 @@
{% if call_or_get(current_user.is_authenticated) %}
{% if call_or_get(current_user.has_roles('Admin')) %}
<table style="width: 800px; margin-left: auto; margin-right: auto;" border="black" cellspacing="3" cellpadding="3">
<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>
<td style="text-align: center;"><a href={{url}}/manage_servers>&nbsp; Manage Servers &nbsp;</a></td>
<td style="text-align: center;"><a href={{url}}/manage_peers>&nbsp; Manage Peers &nbsp;</a></td>
<td style="text-align: center;"><a href={{url}}/manage_masters>&nbsp; Manage Masters &nbsp;</a></td>
<td style="text-align: center;"><a href={{url}}/manage_rules>&nbsp; Manage Rules &nbsp;</a></td>
<td style="text-align: center;"><a href={{url}}/manage_news>&nbsp; Manage News &nbsp;</a></td>
<td style="text-align: center;"><a href={{url}}/misc_settings>&nbsp; Misc Options &nbsp;</a></td>
</tr>

2
web/templates/index.html
View File

@ -2,7 +2,7 @@
{% block content %}
<p>&nbsp;</p>
<p>Welcome to the <strong>{{ user_manager.USER_APP_NAME }}</strong>. This tool is used to manage your access.</p>
<p>Welcome to the <strong>{{ user_manager.USER_APP_NAME }}</strong>.
<p>&nbsp;</p>
<table style="width: 600px; margin-left: auto; margin-right: auto;">