ua1zbe
/
gps
mirror of https://github.com/kf7eel/hbnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix layout bug

This commit is contained in:
KF7EEL 2022-02-20 07:15:05 -08:00
parent f0924ae803
commit 4430796c19
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/app.py
View File

@ -785,7 +785,7 @@ def hbnet_web_service():
# The Home page is accessible to anyone # The Home page is accessible to anyone
@app.route('/') @app.route('/')
def home_page(): def home_page():
if mode == 'FULL': if mode == 'FULL' or mode == 'DMR_ONLY':
home_text = Misc.query.filter_by(field_1='home_page').first() home_text = Misc.query.filter_by(field_1='home_page').first()
#content = Markup('<strong>Index</strong>') #content = Markup('<strong>Index</strong>')
try: try:
@ -5824,7 +5824,7 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
</tr> </tr>
<tr> <tr>
<td><strong>&nbsp;Use Encryption:</strong></td> <td><strong>&nbsp;Encrypt all traffic:</strong></td>
<td>&nbsp;<select name="obp_encryption"> <td>&nbsp;<select name="obp_encryption">
<option selected="selected" value="False">Current - False</option> <option selected="selected" value="False">Current - False</option>
<option value="True">True</option> <option value="True">True</option>
@ -6333,7 +6333,7 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
</tr> </tr>
<tr> <tr>
<td><strong>&nbsp;Use Encryption:</strong></td> <td><strong>&nbsp;Encrypt all traffic:</strong></td>
<td>&nbsp;<select name="obp_encryption"> <td>&nbsp;<select name="obp_encryption">
<option selected="selected" value="''' + str(o.obp_encryption) + '''">Current - ''' + str(o.obp_encryption) + '''</option> <option selected="selected" value="''' + str(o.obp_encryption) + '''">Current - ''' + str(o.obp_encryption) + '''</option>
<option value="True">True</option> <option value="True">True</option>
@ -7154,7 +7154,13 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
def api_endpoint(user, key, func): def api_endpoint(user, key, func):
try: try:
u = User.query.filter(User.username == user).first() u = User.query.filter(User.username == user).first()
return 'Your username is ' + u.username if key in u.api_keys:
if 'msg' in func:
print('msg')
return 'Your username is ' + u.username
else:
return 'Not Authenticated'
except: except:
return 'Error' return 'Error'

3
web/templates/flask_user_layout.html
View File

@ -102,9 +102,10 @@
</a> </a>
<ul class="dropdown-menu" aria-labelledby="mmdvm_admin"> <ul class="dropdown-menu" aria-labelledby="mmdvm_admin">
<li><a class="dropdown-item" href="{{url}}/manage_servers">Manage Servers</a></li> <li><a class="dropdown-item" href="{{url}}/manage_servers">Manage Servers</a></li>
{% if global_config['mode'] == 'FULL' or global_config['mode'] == 'DMR_ONLY' %}
<li><a class="dropdown-item" href="{{url}}/manage_peers">Manage Peers</a></li> <li><a class="dropdown-item" href="{{url}}/manage_peers">Manage Peers</a></li>
<li><a class="dropdown-item" href="{{url}}/manage_masters">Manage Masters</a></li> <li><a class="dropdown-item" href="{{url}}/manage_masters">Manage Masters</a></li>
{% if global_config['mode'] == 'FULL' or global_config['mode'] == 'DMR_ONLY' %}
<li><a class="dropdown-item" href="{{url}}/manage_rules">Manage Rules</a></li> <li><a class="dropdown-item" href="{{url}}/manage_rules">Manage Rules</a></li>
<li><hr class="dropdown-divider"></li> <li><hr class="dropdown-divider"></li>
{% endif %} {% endif %}