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

cosmetic changes

This commit is contained in:
KF7EEL 2021-10-06 12:54:42 -07:00
parent e8e6e04f60
commit f63b782cdf
4 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/app.py
View File

@ -974,7 +974,7 @@ def hbnet_web_service():
#print(script_links) #print(script_links)
content = content + '''\n content = content + '''\n
<div class="card " style="text-align: center;"> <div class="card " style="text-align: center;">
<div class="card-header"><h4>''' + str(i[0]) + '''</h4></div> <div class="card-header"><h4><a href="/ss/''' + str(i[0]) + '''">''' + str(i[0]) + '''</a></h4></div>
<div class="card-body" style="max-width:300px; word-wrap:break-word; text-align: center;">MMDVM Passphrase: <div class="card-body" style="max-width:300px; word-wrap:break-word; text-align: center;">MMDVM Passphrase:
<pre><strong>''' + str(gen_passphrase(int(i[0]))) + '''</strong></pre> <pre><strong>''' + str(gen_passphrase(int(i[0]))) + '''</strong></pre>
<hr /> <hr />
@ -990,7 +990,7 @@ def hbnet_web_service():
#print(script_links) #print(script_links)
content = content + '''\n content = content + '''\n
<div class="card" style="text-align: center;"> <div class="card" style="text-align: center;">
<div class="card-header"><h4>''' + str(i[0]) + '''</h4></div> <div class="card-header"><h4><a href="/ss/''' + str(i[0]) + '''">''' + str(i[0]) + '''</a></h4></div>
<div class="card-body" style="max-width:300px; word-wrap:break-word; text-align: center;">MMDVM Passphrase: <div class="card-body" style="max-width:300px; word-wrap:break-word; text-align: center;">MMDVM Passphrase:
<pre><strong>''' + str(gen_passphrase(int(i[0]))) + '''</strong></pre> <pre><strong>''' + str(gen_passphrase(int(i[0]))) + '''</strong></pre>
<hr /> <hr />
@ -1002,7 +1002,7 @@ def hbnet_web_service():
elif i[1] == '': elif i[1] == '':
content = content + ''' content = content + '''
<div class="card" style="text-align: center;"> <div class="card" style="text-align: center;">
<div class="card-header"><h4>''' + str(i[0]) + '''</h4></div> <div class="card-header"><h4><a href="/ss/''' + str(i[0]) + '''">''' + str(i[0]) + '''</a></h4></div>
<div class="card-body" style="max-width:300px; word-wrap:break-word; text-align: center;">MMDVM Passphrase: <div class="card-body" style="max-width:300px; word-wrap:break-word; text-align: center;">MMDVM Passphrase:
<pre><strong>''' + legacy_passphrase + '''</strong></pre> <pre><strong>''' + legacy_passphrase + '''</strong></pre>
<hr /> <hr />
@ -1014,7 +1014,7 @@ def hbnet_web_service():
else: else:
content = content + ''' content = content + '''
<div class="card" style="text-align: center;"> <div class="card" style="text-align: center;">
<div class="card-header"><h4>''' + str(i[0]) + '''</h4></div> <div class="card-header"><h4><a href="/ss/''' + str(i[0]) + '''">''' + str(i[0]) + '''</a></h4></div>
<div class="card-body" style="max-width:300px; word-wrap:break-word; text-align: center;">MMDVM Passphrase: <div class="card-body" style="max-width:300px; word-wrap:break-word; text-align: center;">MMDVM Passphrase:
<pre><strong>''' + str(i[1]) + '''</strong></pre> <pre><strong>''' + str(i[1]) + '''</strong></pre>
<hr /> <hr />
@ -1300,17 +1300,17 @@ def hbnet_web_service():
if isinstance(i[1], int) == True: if isinstance(i[1], int) == True:
passphrase_list = passphrase_list + ''' passphrase_list = passphrase_list + '''
<tr> <tr>
<td style="text-align: center;">''' + str(i[0]) + '''</td> <td style="text-align: center;"><a href="/ss/''' + str(i[0]) + '''">''' + str(i[0]) + '''</a></td>
<td style="text-align: center;">''' + str(gen_passphrase(int(i[0]))) + '''</td> <td style="text-align: center;">''' + str(gen_passphrase(int(i[0]))) + '''</td>
</tr> \n''' </tr> \n'''
if i[1] == '': if i[1] == '':
passphrase_list = passphrase_list + '''<tr> passphrase_list = passphrase_list + '''<tr>
<td style="text-align: center;">''' + str(i[0]) + '''</td> <td style="text-align: center;"><a href="/ss/''' + str(i[0]) + '''">''' + str(i[0]) + '''</a></td>
<td style="text-align: center;">''' + legacy_passphrase + '''</td> <td style="text-align: center;">''' + legacy_passphrase + '''</td>
</tr> \n''' </tr> \n'''
if not isinstance(i[1], int) == True and i[1] != '': if not isinstance(i[1], int) == True and i[1] != '':
passphrase_list = passphrase_list + '''<tr> passphrase_list = passphrase_list + '''<tr>
<td style="text-align: center;">''' + str(i[0]) + '''</td> <td style="text-align: center;"><a href="/ss/''' + str(i[0]) + '''">''' + str(i[0]) + '''</a></td>
<td style="text-align: center;">''' + str(i[1]) + '''</td> <td style="text-align: center;">''' + str(i[1]) + '''</td>
</tr> \n''' </tr> \n'''
@ -2383,9 +2383,9 @@ TG #: <strong> ''' + str(tg_d.tg) + '''</strong>
<div class="card-body"> <div class="card-body">
<h4 class="card-title" style="text-align: center;">''' + ssd.callsign + ' - ' + str(ssd.dmr_id) + '''</h4>\n <p style="text-align: center;">''' + str(ssd.time.strftime(time_format)) + '''</p> <h4 class="card-title" style="text-align: center;">''' + ssd.callsign + ' - ' + str(ssd.dmr_id) + '''</h4>\n <p style="text-align: center;">''' + str(ssd.time.strftime(time_format)) + '''</p>
<br /><hr /><br /> <br /><hr /><br />
<p class="card-text" style="text-align: center;">''' + ssd.message + '''</p> <p class="card-text" style="text-align: center;"><strong>''' + ssd.message + '''</strong></p>
</div> <br /><hr /><br />
</div>
''' '''
for i in ss_all: for i in ss_all:

47
web/templates/flask_user_layout.html
View File

@ -34,14 +34,15 @@
<body> <body>
<p><img class="img-responsive" style="display: block; margin-left: auto; margin-right: auto;" src="{{ url_for('static', filename='HBnet.png') }}" alt="Logo" width="300" height="144" /></p>
<h2 class="card-body" style="text-align: center;">{{ user_manager.USER_APP_NAME }}</h2>
<hr />
<!-- A grey horizontal navbar that becomes vertical on small screens --> <!-- A grey horizontal navbar that becomes vertical on small screens -->
<nav class="navbar navbar-expand-sm bg-light"> <nav class="navbar navbar-expand-sm bg-light">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="#">
{{ user_manager.USER_APP_NAME }}
</a>
<!-- Links --> <!-- Links -->
<ul class="navbar-nav"> <ul class="navbar-nav">
<li class="nav-item"> <li class="nav-item">
@ -71,12 +72,21 @@
<a class="nav-link" href="{{url}}/help"><i class="bi bi-question-square"></i> Help </a> <a class="nav-link" href="{{url}}/help"><i class="bi bi-question-square"></i> Help </a>
</li> </li>
</ul> </ul>
<ul class="navbar-nav">
<!--Admin Menu --> {% if not call_or_get(current_user.is_authenticated) %}
<li class="nav-item">
<a class="nav-link" href="{{ url_for('user.login') }}"><i class="bi bi-door-open"></i> Sign In </a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url_for('user.register') }}"><i class="bi bi-person-plus"></i> Register </a>
</li>
{% endif %}
{% if call_or_get(current_user.is_authenticated) %} {% if call_or_get(current_user.is_authenticated) %}
<!--Admin Menu -->
{% if call_or_get(current_user.has_roles('Admin')) %} {% if call_or_get(current_user.has_roles('Admin')) %}
<ul class="navbar-nav">
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="aprs_menu" role="button" data-bs-toggle="dropdown" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="#" id="aprs_menu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
<i class="bi bi-tools"></i> Admin <i class="bi bi-tools"></i> Admin
@ -97,22 +107,8 @@
</ul> </ul>
</li> </li>
</ul> {% endif %}
{% endif %}
{% endif %}
<ul class="navbar-nav">
{% if not call_or_get(current_user.is_authenticated) %}
<li class="nav-item">
<a class="nav-link" href="{{ url_for('user.login') }}"><i class="bi bi-door-open"></i> Sign In </a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url_for('user.register') }}"> Register </a>
</li>
{% endif %}
{% if call_or_get(current_user.is_authenticated) %}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{url}}/generate_passphrase"><i class="bi bi-info-square"></i> Passphrase(s) </a> <a class="nav-link" href="{{url}}/generate_passphrase"><i class="bi bi-info-square"></i> Passphrase(s) </a>
</li> </li>
@ -130,12 +126,7 @@
</nav> </nav>
<p><img class="img-responsive" 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 %} {% block body %}
<hr class="no-margins"/> <hr class="no-margins"/>

12
web/templates/index.html
View File

@ -2,10 +2,16 @@
{% block content %} {% block content %}
<p>&nbsp;</p> <p>&nbsp;</p>
<div class="row">
{{content_block}} {{content_block}}
<div class="col-lg-6">
<p>&nbsp;</p> <p>&nbsp;</p>
<table style="width: 600px; margin-left: auto; margin-right: auto;"> <table style="margin-left: auto; margin-right: auto;">
<tbody> <tbody>
<tr> <tr>
<td style="text-align: center;"> <td style="text-align: center;">
@ -15,5 +21,9 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</div>
<p>&nbsp;</p> <p>&nbsp;</p>
{% endblock %} {% endblock %}

9
web/templates/ss.html
View File

@ -8,11 +8,9 @@
{{markup_content}} {{markup_content}}
</div> <p style="text-align: center;">Post History</p>
<div class="col-lg-12">
<p>&nbsp;</p>
<table data-toggle="table" data-pagination="true" data-search="true" > <table data-toggle="table" data-pagination="true" data-search="true" >
<thead> <thead>
<tr> <tr>
<th>Post</th> <th>Post</th>
@ -25,6 +23,9 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>