diff --git a/web/app.py b/web/app.py index ce5e4f5..6225b3c 100644 --- a/web/app.py +++ b/web/app.py @@ -658,19 +658,21 @@ def create_app(): try: l_news = News.query.order_by(News.time.desc()).first() content = ''' - - - - - - - - - - -
-

''' + l_news.subject + '''

-
''' + l_news.date + '''

''' + l_news.text + '''

''' + +

''' + l_news.subject + '''

+
+

 

+''' + l_news.date + ''' - +

 

+ +
+
+''' + l_news.text + ''' +
+
+ + + ''' except: content = '' return render_template('index.html', news = Markup(content)) @@ -1679,29 +1681,29 @@ def create_app(): ## view_news = News.query.order_by(News.time.desc()).paginate(page=page, per_page=1) #content = '''''' - content = '''

View All News

''' + news_content = '' art_count = 0 for article in view_news: if request.args.get('all_news'): art_count = 1 if art_count < 16: - content = content + ''' -
- - - - - - - - - -
-

''' + article.subject + '''

-
''' + article.date + ''' - Link
''' + article.text + '''

 

''' + news_content = news_content + ''' +

''' + article.subject + '''

+
+

 

+''' + article.date + ''' - +

 

+
+
+''' + article.text + ''' +
+
+ + +''' art_count = art_count + 1 #content = content + '''

 

''' - return render_template('flask_user_layout.html', markup_content = Markup(content)) + return render_template('news.html', markup_content = Markup(news_content)) @app.route('/news/
') #, methods=['POST', 'GET']) def view_arts(article): @@ -1709,20 +1711,20 @@ def create_app(): view_arti = News.query.filter_by(id=article).first() content = ''' - - - - - - - - - - -
-

''' + view_arti.subject + '''

-
''' + view_arti.date + '''
''' + view_arti.text + '''

 

''' - return render_template('flask_user_layout.html', markup_content = Markup(content)) +

''' + view_arti.subject + '''

+
+

 

+''' + view_arti.date + ''' +

 

+
+
+''' + view_arti.text + ''' +
+
+ + +''' + return render_template('news.html', markup_content = Markup(content)) @@ -1783,7 +1785,7 @@ def create_app(): else: content = '''

 

-

Add News Article

+

 

@@ -1798,7 +1800,7 @@ def create_app(): content = content + ''' - + @@ -1991,23 +1993,21 @@ def create_app(): ## @login_required def tg_details(name): tg_d = BridgeList.query.filter_by(bridge_name=name).first() - content = '''
''' + a.subject + ''' | Delete''' + a.subject + ''' | ''' + a.date + ''' ''' + str(a.id) + '''
- - - - - - - - - - - -
-

''' + tg_d.bridge_name + '''

-
TG #: ''' + str(tg_d.tg) + '''
 ''' + tg_d.description + '''
-

 

''' - return render_template('flask_user_layout.html', markup_content = Markup(content)) + content = ''' + +
+

''' + tg_d.bridge_name + '''

+
+TG #: ''' + str(tg_d.tg) + ''' +
+
+''' + tg_d.description + ''' +
+
+ +
+''' + return render_template('tg.html', markup_content = Markup(content)) @app.route('/hbnet_tg.csv') ## @login_required @@ -2039,24 +2039,28 @@ def create_app():

 

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 (Anytone format)

- - - - - - - ''' +
+
 Name TG Description
+ + + + + + + + ''' for i in cbl: print(str(re.sub('<[^>]*>', '', i.description))[:50]) content = content + ''' - - - -''' + + + + ''' content = content + ''' -
NameTGDescription
 ''' + i.bridge_name + ''' ''' + str(i.tg) + ''' ''' + str(re.sub('<[^>]*>|\s\s+', ' ', i.description))[:50] + '''...
  ''' + str(i.tg) + ''' ''' + str(re.sub('<[^>]*>|\s\s+', ' ', i.description))[:50] + '''...
+ + ''' return render_template('flask_user_layout.html', markup_content = Markup(content)) diff --git a/web/templates/flask_user_layout.html b/web/templates/flask_user_layout.html index 09570b4..93fda1e 100644 --- a/web/templates/flask_user_layout.html +++ b/web/templates/flask_user_layout.html @@ -122,7 +122,6 @@ {{markup_content}} - {% endblock %} {% endblock %} diff --git a/web/templates/news.html b/web/templates/news.html new file mode 100644 index 0000000..4265ca7 --- /dev/null +++ b/web/templates/news.html @@ -0,0 +1,9 @@ +{% extends 'flask_user/_public_base.html' %} +{% block content %} +

+
+
{{markup_content}}
+
+ +

 

+{% endblock %} diff --git a/web/templates/tg.html b/web/templates/tg.html new file mode 100644 index 0000000..6866fb7 --- /dev/null +++ b/web/templates/tg.html @@ -0,0 +1,9 @@ +{% extends 'flask_user/_public_base.html' %} +{% block content %} +

+
+
{{markup_content}}
+
+ +

 

+{% endblock %} diff --git a/web/templates/view_passphrase.html b/web/templates/view_passphrase.html index 0322267..fa6cb85 100644 --- a/web/templates/view_passphrase.html +++ b/web/templates/view_passphrase.html @@ -1,6 +1,7 @@ {% extends 'flask_user/_public_base.html' %} {% block content %} -

 

Click here for automated Pi-Star script.

 

+

 

+

for automated Pi-Star script.

{{server_content}}