cosmetic changes
This commit is contained in:
		
							parent
							
								
									6362b8cd5a
								
							
						
					
					
						commit
						38a1ee2c0f
					
				@ -538,13 +538,14 @@ def create_app():
 | 
				
			|||||||
    @login_required    # User must be authenticated
 | 
					    @login_required    # User must be authenticated
 | 
				
			||||||
    def list_users():
 | 
					    def list_users():
 | 
				
			||||||
        u = User.query.all()
 | 
					        u = User.query.all()
 | 
				
			||||||
        u_list = '''<h2 style="text-align: center;"><strong>List/edit users:</strong></h2><p> </p><p style="text-align: center;"><a href="edit_user"><strong>Enter Callsign</strong></a></p>  <p> </p><table style="width: 700px; margin-left: auto; margin-right: auto;" border="1">
 | 
					        # Broken for now, link taken out - <h2 style="text-align: center;"><strong>List/edit users:</strong></h2><p> </p><p style="text-align: center;"><a href="edit_user"><strong>Enter Callsign</strong></a></p>
 | 
				
			||||||
 | 
					        u_list = '''<p> </p><table style="width: 700px; margin-left: auto; margin-right: auto;" border="1">
 | 
				
			||||||
<tbody>
 | 
					<tbody>
 | 
				
			||||||
<tr>
 | 
					<tr>
 | 
				
			||||||
<td style="width: 107px; text-align: center;"><strong>Callsign</strong></td>
 | 
					<td style="width: 107px; text-align: center;"><strong>Callsign</strong></td>
 | 
				
			||||||
<td style="width: 107px; text-align: center;"><strong>Name</strong></td>
 | 
					<td style="width: 107px; text-align: center;"><strong>Name</strong></td>
 | 
				
			||||||
<td style="width: 226.683px; text-align: center;"><strong>Enabled</strong></td>
 | 
					<td style="width: 226.683px; text-align: center;"><strong>Enabled</strong></td>
 | 
				
			||||||
<td style="width: 522.317px; text-align: center;"><strong>DMR ID:Authentication Mechanism</strong></td>
 | 
					<td style="width: 522.317px; text-align: center;"><strong>DMR ID:Authentication</strong></td>
 | 
				
			||||||
<td style="width: 522.317px; text-align: center;"><strong>Notes</strong></td>
 | 
					<td style="width: 522.317px; text-align: center;"><strong>Notes</strong></td>
 | 
				
			||||||
</tr>'''
 | 
					</tr>'''
 | 
				
			||||||
        for i in u:
 | 
					        for i in u:
 | 
				
			||||||
@ -573,7 +574,7 @@ def create_app():
 | 
				
			|||||||
<td style="width: 107px; text-align: center;"><strong>Callsign</strong></td>
 | 
					<td style="width: 107px; text-align: center;"><strong>Callsign</strong></td>
 | 
				
			||||||
<td style="width: 107px; text-align: center;"><strong>Name</strong></td>
 | 
					<td style="width: 107px; text-align: center;"><strong>Name</strong></td>
 | 
				
			||||||
<td style="width: 226.683px; text-align: center;"><strong>Enabled</strong></td>
 | 
					<td style="width: 226.683px; text-align: center;"><strong>Enabled</strong></td>
 | 
				
			||||||
<td style="width: 522.317px; text-align: center;"><strong>DMR ID:Authentication Mechanism</strong></td>
 | 
					<td style="width: 522.317px; text-align: center;"><strong>DMR ID:Authentication</strong></td>
 | 
				
			||||||
</tr>'''
 | 
					</tr>'''
 | 
				
			||||||
        for i in u:
 | 
					        for i in u:
 | 
				
			||||||
##            print(i.username)
 | 
					##            print(i.username)
 | 
				
			||||||
@ -969,7 +970,7 @@ def create_app():
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
            content = '''
 | 
					            content = '''
 | 
				
			||||||
    <p> </p>
 | 
					    <p> </p>
 | 
				
			||||||
    <p style="text-align: center;"><strong>Log for user: ''' + g_arg + '''</strong></p>
 | 
					    <p style="text-align: center;"><strong>Log for: ''' + g_arg + '''</strong></p>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ''' + f_link + '''
 | 
					    ''' + f_link + '''
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
@ -1364,7 +1365,7 @@ def create_app():
 | 
				
			|||||||
                                    mode='normal',
 | 
					                                    mode='normal',
 | 
				
			||||||
                                    )
 | 
					                                    )
 | 
				
			||||||
                        elif authorized_peer(hblink_req['login_id'])[1] == '':
 | 
					                        elif authorized_peer(hblink_req['login_id'])[1] == '':
 | 
				
			||||||
                            authlog_add(hblink_req['login_id'], hblink_req['login_ip'], hblink_req['login_server'], authorized_peer(hblink_req['login_id'])[2], 'Config: ' + legacy_passphrase, 'Attempt')
 | 
					                            authlog_add(hblink_req['login_id'], hblink_req['login_ip'], hblink_req['login_server'], authorized_peer(hblink_req['login_id'])[2], 'Config Passphrase: ' + legacy_passphrase, 'Attempt')
 | 
				
			||||||
                            response = jsonify(
 | 
					                            response = jsonify(
 | 
				
			||||||
                                    allow=True,
 | 
					                                    allow=True,
 | 
				
			||||||
                                    mode='legacy',
 | 
					                                    mode='legacy',
 | 
				
			||||||
@ -1405,7 +1406,7 @@ def create_app():
 | 
				
			|||||||
                            response = make_response(msg, 401)
 | 
					                            response = make_response(msg, 401)
 | 
				
			||||||
            elif 'login_id' in hblink_req and 'login_confirmed' in hblink_req:
 | 
					            elif 'login_id' in hblink_req and 'login_confirmed' in hblink_req:
 | 
				
			||||||
                if hblink_req['old_auth'] == True:
 | 
					                if hblink_req['old_auth'] == True:
 | 
				
			||||||
                    authlog_add(hblink_req['login_id'], hblink_req['login_ip'], hblink_req['login_server'], authorized_peer(hblink_req['login_id'])[2], 'CONFIG PASSPHRASE', 'Confirmed')
 | 
					                    authlog_add(hblink_req['login_id'], hblink_req['login_ip'], hblink_req['login_server'], authorized_peer(hblink_req['login_id'])[2], 'CONFIG, NO UMS', 'Confirmed')
 | 
				
			||||||
                else:
 | 
					                else:
 | 
				
			||||||
                    authlog_add(hblink_req['login_id'], hblink_req['login_ip'], hblink_req['login_server'], authorized_peer(hblink_req['login_id'])[2], 'USER MANAGER', 'Confirmed')
 | 
					                    authlog_add(hblink_req['login_id'], hblink_req['login_ip'], hblink_req['login_server'], authorized_peer(hblink_req['login_id'])[2], 'USER MANAGER', 'Confirmed')
 | 
				
			||||||
                response = jsonify(
 | 
					                response = jsonify(
 | 
				
			||||||
 | 
				
			|||||||
@ -17,7 +17,7 @@
 | 
				
			|||||||
    {% endfor %}
 | 
					    {% endfor %}
 | 
				
			||||||
</form>
 | 
					</form>
 | 
				
			||||||
<br/>
 | 
					<br/>
 | 
				
			||||||
<p><a href="../update_ids">Update your information from RadioID.net</a></p>
 | 
					<p><a href="../update_ids"><strong>Update your information from RadioID.net</strong></a></p>
 | 
				
			||||||
{% if not user_manager.USER_ENABLE_AUTH0 %}
 | 
					{% if not user_manager.USER_ENABLE_AUTH0 %}
 | 
				
			||||||
    {% if user_manager.USER_ENABLE_CHANGE_USERNAME %}
 | 
					    {% if user_manager.USER_ENABLE_CHANGE_USERNAME %}
 | 
				
			||||||
        <p><a href="{{ url_for('user.change_username') }}">{%trans%}Change username{%endtrans%}</a></p>
 | 
					        <p><a href="{{ url_for('user.change_username') }}">{%trans%}Change username{%endtrans%}</a></p>
 | 
				
			||||||
 | 
				
			|||||||
@ -110,12 +110,16 @@
 | 
				
			|||||||
    <br/>
 | 
					    <br/>
 | 
				
			||||||
    <hr class="no-margins"/>
 | 
					    <hr class="no-margins"/>
 | 
				
			||||||
    <div id="footer-div" class="clearfix with-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://github.com/kf7eel/hblink3">HBLink3 User Manager</a><br />Created by KF7EEL<br />Contributors:  W7NCX, N9VW, KC7AAD, NO7RF</p>
 | 
				
			||||||
 | 
					<!--
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <div class="pull-left">{{ user_manager.USER_APP_NAME }}</div>
 | 
					        <div class="pull-left">{{ user_manager.USER_APP_NAME }}</div>
 | 
				
			||||||
        <div class="pull-right">Credits: KF7EEL, W7NCX, N9VW, KC7AAD, NO7RF</div>
 | 
					        <div class="pull-right">Credits: KF7EEL, W7NCX, N9VW, KC7AAD, NO7RF</div>
 | 
				
			||||||
 | 
					    -->
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    {% endblock %}
 | 
					    {% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
 | 
					    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
 | 
				
			||||||
    <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
 | 
					    <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
 | 
				
			||||||
    <!-- Bootstrap -->
 | 
					    <!-- Bootstrap -->
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user