diff --git a/web/app.py b/web/app.py index f26b395..e6a36f6 100644 --- a/web/app.py +++ b/web/app.py @@ -935,7 +935,13 @@ def create_app(): @roles_required('Admin') # Use of @roles_required decorator def approve_list(): u = User.query.all() - wait_list = '''

Users waiting for approval:

 

+ wait_list = '''

Users waiting for approval:

+

 

+ +

Click on the callsign to approve user. An email may be sent to inform the user that they can login.

+ +

 

+
diff --git a/web/templates/flask_user_layout.html b/web/templates/flask_user_layout.html index 577230a..459ca17 100644 --- a/web/templates/flask_user_layout.html +++ b/web/templates/flask_user_layout.html @@ -34,31 +34,31 @@

Logo

{{title}}


-
Callsign
+
- - - + + + {% if not call_or_get(current_user.is_authenticated) %} - - + + {% endif %} {% if call_or_get(current_user.is_authenticated) %} {% if call_or_get(current_user.has_roles('Admin')) %} - - - - + + + + {% endif %} - - - - + + + + {% endif %} @@ -66,15 +66,15 @@ {% if call_or_get(current_user.is_authenticated) %} {% if call_or_get(current_user.has_roles('Admin')) %} -
HomeNewsTalkgroups  Home    News    Talkgroups  RegisterSign in  Register    Sign in  Add a UserEdit UsersWaiting ApprovalAuth Log  Add a User    Edit Users    Waiting Approval    Auth Log  HelpPassphrase(s)Edit {{ current_user.username or current_user.email }}Sign out  Passphrase(s)    Edit {{ current_user.username or current_user.email }}    Sign out  
+
- - - - - - + + + + + + diff --git a/web/templates/index.html b/web/templates/index.html index d190edf..8f85087 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -2,7 +2,7 @@ {% block content %}

 

-

Welcome to the {{ user_manager.USER_APP_NAME }}. This tool is used to manage your access.

+

Welcome to the {{ user_manager.USER_APP_NAME }}.

 

Manage ServersManage PeersManage MastersManage RulesManage NewsMisc Options  Manage Servers    Manage Peers    Manage Masters    Manage Rules    Manage News    Misc Options