cosmetic changes

2021-10-06 12:54:42 -07:00 · 2021-10-06 12:54:42 -07:00 · f63b782cdf
parent e8e6e04f60
commit f63b782cdf
4 changed files with 45 additions and 43 deletions
--- a/web/app.py
+++ b/web/app.py
@ -974,7 +974,7 @@ def hbnet_web_service():
                    #print(script_links)
                    content = content + '''\n
            <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:
  <pre><strong>''' + str(gen_passphrase(int(i[0]))) + '''</strong></pre>
  <hr />
@ -990,7 +990,7 @@ def hbnet_web_service():
                    #print(script_links)
                    content = content + '''\n
 <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:
  <pre><strong>''' + str(gen_passphrase(int(i[0]))) + '''</strong></pre>
  <hr />
@ -1002,7 +1002,7 @@ def hbnet_web_service():
                elif i[1] == '':
                    content = content + '''
 <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:
  <pre><strong>''' + legacy_passphrase + '''</strong></pre>
  <hr />
@ -1014,7 +1014,7 @@ def hbnet_web_service():
                else:
                    content = content + '''
  <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:
  <pre><strong>''' + str(i[1]) + '''</strong></pre>
  <hr />
@ -1300,17 +1300,17 @@ def hbnet_web_service():
                if isinstance(i[1], int) == True: 
                    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(gen_passphrase(int(i[0]))) + '''</td>
 </tr> \n'''
                if i[1] == '':
                    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>
 </tr> \n'''
                if not isinstance(i[1], int) == True and i[1] != '':
                    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>
 </tr> \n'''
            
@ -2383,9 +2383,9 @@ TG #: <strong> ''' + str(tg_d.tg) + '''</strong>
    <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>
    <br /><hr /><br />
-    <p class="card-text" style="text-align: center;">''' + ssd.message + '''</p>
-    </div>
-    </div>
+    <p class="card-text" style="text-align: center;"><strong>''' + ssd.message + '''</strong></p>
+<br /><hr /><br />
+

    '''
            for i in ss_all:
--- a/web/templates/flask_user_layout.html
+++ b/web/templates/flask_user_layout.html
@ -34,14 +34,15 @@

 <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 -->
 <nav class="navbar navbar-expand-sm bg-light">

  <div class="container-fluid">
-    <a class="navbar-brand" href="#">
-      
-      {{ user_manager.USER_APP_NAME }}
-    </a>
+
    <!-- Links -->
    <ul class="navbar-nav">
      <li class="nav-item">
@ -71,12 +72,21 @@
        <a class="nav-link" href="{{url}}/help"><i class="bi bi-question-square"></i> Help </a>
      </li>
    </ul>
+  

-
-    <!--Admin Menu -->
+        <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') }}"><i class="bi bi-person-plus"></i> Register </a>
+      </li>
+      {% endif %}
+    
    {% if call_or_get(current_user.is_authenticated) %}
+        <!--Admin Menu -->
            {% if call_or_get(current_user.has_roles('Admin')) %}
-    <ul class="navbar-nav">
    <li class="nav-item dropdown">
          <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
@ -97,22 +107,8 @@

          </ul>
        </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">
        <a class="nav-link" href="{{url}}/generate_passphrase"><i class="bi bi-info-square"></i> Passphrase(s) </a>
      </li>
@ -130,12 +126,7 @@

 </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 %}

    <hr class="no-margins"/>
--- a/web/templates/index.html
+++ b/web/templates/index.html
@ -2,10 +2,16 @@
 {% block content %}
 <p>&nbsp;</p>

+<div class="row">
+
+
 {{content_block}}

+
+<div class="col-lg-6">
+
 <p>&nbsp;</p>
-<table style="width: 600px; margin-left: auto; margin-right: auto;">
+<table style="margin-left: auto; margin-right: auto;">
 <tbody>
 <tr>
 <td style="text-align: center;">
@ -15,5 +21,9 @@
 </tr>
 </tbody>
 </table>
+
+</div>
+</div>
+
 <p>&nbsp;</p>
 {% endblock %}
--- a/web/templates/ss.html
+++ b/web/templates/ss.html
@ -8,11 +8,9 @@

  {{markup_content}}

-  </div>
-  <div class="col-lg-12">
-<p>&nbsp;</p>
+<p style="text-align: center;">Post History</p>

-  <table data-toggle="table" data-pagination="true" data-search="true" >
+<table data-toggle="table" data-pagination="true" data-search="true" >
  <thead>
    <tr>
      <th>Post</th>
@ -25,6 +23,9 @@

  </tbody>
  </table>
+
+  
+  
  </div>
 </div>