diff --git a/web/app.py b/web/app.py index 1ae1329..e1599f3 100644 --- a/web/app.py +++ b/web/app.py @@ -21,7 +21,7 @@ Flask based application that is the web server for HBNet. Controls user authentication, DMR server config, etc. ''' -from flask import Flask, render_template_string, request, make_response, jsonify, render_template, Markup, flash, redirect, url_for, current_app +from flask import Flask, render_template_string, request, make_response, jsonify, render_template, Markup, flash, redirect, url_for, current_app, Response from flask_sqlalchemy import SQLAlchemy from flask_user import login_required, UserManager, UserMixin, user_registered, roles_required from werkzeug.security import check_password_hash @@ -1801,6 +1801,16 @@ def create_app():

 

''' return render_template('flask_user_layout.html', markup_content = Markup(content)) + @app.route('/hbnet_tg.csv') +## @login_required + def tg_csv(): + cbl = BridgeList.query.filter_by(public_list=True).all() + gen_csv = 'number, name\n' + for t in cbl: + gen_csv = gen_csv + str(t.tg) + ', ' + t.bridge_name + '\n' + response = Response(gen_csv, mimetype="text/csv") + return response + @app.route('/talkgroups') ## @login_required def tg_list(): @@ -1809,7 +1819,7 @@ def create_app(): content = '''

 

Note: Talkgroups listed here may not be available on all servers. See Passphrase(s) for complete list of talkgroup availability per server.

-

Download talkgroup CSV

+

Download talkgroup CSV

diff --git a/web/templates/flask_user_layout.html b/web/templates/flask_user_layout.html index 60965e4..45f65d6 100644 --- a/web/templates/flask_user_layout.html +++ b/web/templates/flask_user_layout.html @@ -38,9 +38,9 @@ - - - + + + {% if not call_or_get(current_user.is_authenticated) %} @@ -48,15 +48,15 @@ {% endif %} {% if call_or_get(current_user.is_authenticated) %} {% if call_or_get(current_user.has_roles('Admin')) %} - - - - + + + + {% endif %} - - - + + + {% endif %} @@ -69,11 +69,11 @@
HomeNewsTalkgroupsHomeNewsTalkgroupsRegisterAdd a UserEdit UsersWaiting ApprovalAuth LogAdd a UserEdit UsersWaiting ApprovalAuth LogHelpPassphrase(s)HelpPassphrase(s) Edit {{ current_user.username or current_user.email }} Sign out
- - - - - + + + + +
Manage ServersManage PeersManage MastersManage RulesManage NewsManage ServersManage PeersManage MastersManage RulesManage News