get home page from DB, add terms of use
This commit is contained in:
parent
38375688f2
commit
a50901f9c0
54
web/app.py
54
web/app.py
@ -585,10 +585,22 @@ def create_app():
|
|||||||
db.session.add(flash_entry_add)
|
db.session.add(flash_entry_add)
|
||||||
tos_entry_add = Misc(
|
tos_entry_add = Misc(
|
||||||
field_1 = 'terms_of_service',
|
field_1 = 'terms_of_service',
|
||||||
field_2 = '<strong>TOS</strong>',
|
field_2 = '''<div class="panel panel-default">
|
||||||
|
<div class="panel-heading" style="text-align: center;"><h4>Terms of Use</h4></div>
|
||||||
|
<div class="panel-body">
|
||||||
|
<p>By using <strong>''' + title + '''</strong>, you agree not to do anything malicious. You agree to use the system with respect and courtesy to others. Please operate with the laws of your country.</p>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>''',
|
||||||
time = datetime.datetime.utcnow()
|
time = datetime.datetime.utcnow()
|
||||||
)
|
)
|
||||||
db.session.add(tos_entry_add)
|
db.session.add(tos_entry_add)
|
||||||
|
home_entry_add = Misc(
|
||||||
|
field_1 = 'home_page',
|
||||||
|
field_2 = '<p>Welcome to <strong>' + title + '</strong></p>.',
|
||||||
|
time = datetime.datetime.utcnow()
|
||||||
|
)
|
||||||
|
db.session.add(home_entry_add)
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
# Query radioid.net for list of DMR IDs, then add to DB
|
# Query radioid.net for list of DMR IDs, then add to DB
|
||||||
@ -654,6 +666,7 @@ def create_app():
|
|||||||
# The Home page is accessible to anyone
|
# The Home page is accessible to anyone
|
||||||
@app.route('/')
|
@app.route('/')
|
||||||
def home_page():
|
def home_page():
|
||||||
|
home_text = Misc.query.filter_by(field_1='home_page').first()
|
||||||
#content = Markup('<strong>Index</strong>')
|
#content = Markup('<strong>Index</strong>')
|
||||||
try:
|
try:
|
||||||
l_news = News.query.order_by(News.time.desc()).first()
|
l_news = News.query.order_by(News.time.desc()).first()
|
||||||
@ -675,12 +688,17 @@ def create_app():
|
|||||||
'''
|
'''
|
||||||
except:
|
except:
|
||||||
content = ''
|
content = ''
|
||||||
return render_template('index.html', news = Markup(content))
|
return render_template('index.html', news = Markup(content), content_block = Markup(home_text.field_2))
|
||||||
|
|
||||||
|
@app.route('/tos')
|
||||||
|
def tos_page():
|
||||||
|
tos_text = Misc.query.filter_by(field_1='terms_of_service').first()
|
||||||
|
content = tos_text.field_2
|
||||||
|
|
||||||
|
return render_template('flask_user_layout.html', markup_content = Markup(content))
|
||||||
|
|
||||||
@app.route('/help')
|
@app.route('/help')
|
||||||
def help_page():
|
def help_page():
|
||||||
#content = Markup('<strong>Index</strong>')
|
|
||||||
|
|
||||||
return render_template('help.html')
|
return render_template('help.html')
|
||||||
|
|
||||||
@app.route('/generate_passphrase/pi-star', methods = ['GET'])
|
@app.route('/generate_passphrase/pi-star', methods = ['GET'])
|
||||||
@ -1688,7 +1706,7 @@ def create_app():
|
|||||||
art_count = 1
|
art_count = 1
|
||||||
if art_count < 16:
|
if art_count < 16:
|
||||||
news_content = news_content + '''
|
news_content = news_content + '''
|
||||||
<div class="well well-sm" style="text-align: center;"><h3>''' + article.subject + '''</h3>
|
<div class="well well-sm" s style="text-align: center;"><h3>''' + article.subject + '''</h3>
|
||||||
<hr />
|
<hr />
|
||||||
<p style="text-align: center;"> </p>
|
<p style="text-align: center;"> </p>
|
||||||
<strong>''' + article.date + '''</strong> - <a href="news/''' + str(article.id) + '''"><button type="button" class="btn btn-primary">Link</button></a>
|
<strong>''' + article.date + '''</strong> - <a href="news/''' + str(article.id) + '''"><button type="button" class="btn btn-primary">Link</button></a>
|
||||||
@ -1826,10 +1844,17 @@ def create_app():
|
|||||||
content = '''<h3 style="text-align: center;">Saved flash text.</h3>
|
content = '''<h3 style="text-align: center;">Saved flash text.</h3>
|
||||||
<p style="text-align: center;">Redirecting in 3 seconds.</p>
|
<p style="text-align: center;">Redirecting in 3 seconds.</p>
|
||||||
<meta http-equiv="refresh" content="3; URL=misc_settings" /> '''
|
<meta http-equiv="refresh" content="3; URL=misc_settings" /> '''
|
||||||
|
elif request.args.get('home') == 'save':
|
||||||
|
misc_edit_field_1('home_page', request.form.get('home_text'), None, None, None, None, None, None, None, None)
|
||||||
|
content = '''<h3 style="text-align: center;">Saved home page.</h3>
|
||||||
|
<p style="text-align: center;">Redirecting in 3 seconds.</p>
|
||||||
|
<meta http-equiv="refresh" content="3; URL=misc_settings" /> '''
|
||||||
else:
|
else:
|
||||||
|
|
||||||
email_text = Misc.query.filter_by(field_1='approval_email').first()
|
email_text = Misc.query.filter_by(field_1='approval_email').first()
|
||||||
flash_text = Misc.query.filter_by(field_1='approval_flash').first()
|
flash_text = Misc.query.filter_by(field_1='approval_flash').first()
|
||||||
|
home_text = Misc.query.filter_by(field_1='home_page').first()
|
||||||
|
print(home_text)
|
||||||
content = '''
|
content = '''
|
||||||
<p> </p>
|
<p> </p>
|
||||||
<form action="misc_settings?approve_email=save" method="POST">
|
<form action="misc_settings?approve_email=save" method="POST">
|
||||||
@ -1864,6 +1889,25 @@ def create_app():
|
|||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
<p> </p>
|
||||||
|
|
||||||
|
<form action="misc_settings?home=save" method="POST">
|
||||||
|
<table style="width: 500px; margin-left: auto; margin-right: auto;" border="1">
|
||||||
|
<tbody>
|
||||||
|
<tr style="height: 51.1667px;">
|
||||||
|
<td style="height: 51.1667px; text-align: center;"><label for="home_text">Homepage (HTML OK, 5000 characters max):</label><br /> <textarea id="home_text" cols="65" name="home_text" rows="4">''' + home_text.field_2 + '''</textarea></td>
|
||||||
|
</tr>
|
||||||
|
<tr style="height: 27px;">
|
||||||
|
<td style="text-align: center; height: 27px;">
|
||||||
|
<p> </p>
|
||||||
|
<p><input type="submit" value="Submit" /></p>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</form>
|
||||||
|
<p> </p>
|
||||||
'''
|
'''
|
||||||
return render_template('flask_user_layout.html', markup_content = Markup(content))
|
return render_template('flask_user_layout.html', markup_content = Markup(content))
|
||||||
|
|
||||||
|
@ -5,7 +5,15 @@
|
|||||||
<h1>{%trans%}Register{%endtrans%}</h1>
|
<h1>{%trans%}Register{%endtrans%}</h1>
|
||||||
<p> </p>
|
<p> </p>
|
||||||
|
|
||||||
<strong>Your username MUST be your callsign.</strong> After filling out the fields, a confirmation link will be emailed to you.
|
<strong>Your username MUST be your callsign.</strong> After filling out the fields, a confirmation link may be emailed to you.
|
||||||
|
<hr />
|
||||||
|
<p> </p>
|
||||||
|
By registering, you acknowledge that you agree to the Terms of Use.
|
||||||
|
<p> </p>
|
||||||
|
|
||||||
|
<p style="text-align: center;"><a href="/tos"><button type="button" class="btn btn-primary">Terms of Use</button></a></p>
|
||||||
|
<p> </p>
|
||||||
|
<hr />
|
||||||
<p> </p>
|
<p> </p>
|
||||||
|
|
||||||
<form action="" method="POST" novalidate formnovalidate class="form" role="form">
|
<form action="" method="POST" novalidate formnovalidate class="form" role="form">
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
{% block content %}
|
{% block content %}
|
||||||
<p> </p>
|
<p> </p>
|
||||||
|
|
||||||
<p>Welcome to the <strong>{{ user_manager.USER_APP_NAME }}</strong>.
|
{{content_block}}
|
||||||
|
|
||||||
<p> </p>
|
<p> </p>
|
||||||
<table style="width: 600px; margin-left: auto; margin-right: auto;">
|
<table style="width: 600px; margin-left: auto; margin-right: auto;">
|
||||||
|
Loading…
Reference in New Issue
Block a user