custom url fix on front banner also front banner ampersand fix
This commit is contained in:
@@ -12,7 +12,12 @@ bp = Blueprint('home', __name__)
|
|||||||
@bp.route('/')
|
@bp.route('/')
|
||||||
def index():
|
def index():
|
||||||
db = get_db()
|
db = get_db()
|
||||||
|
|
||||||
|
if g.user:
|
||||||
fronters = db.execute("SELECT * FROM member WHERE front=(?) ORDER BY member_name",(1,)).fetchall()
|
fronters = db.execute("SELECT * FROM member WHERE front=(?) ORDER BY member_name",(1,)).fetchall()
|
||||||
|
else:
|
||||||
|
fronters = db.execute("SELECT * FROM member WHERE front=(?) AND public=(?) ORDER BY member_name",(1,1)).fetchall()
|
||||||
|
|
||||||
homepage = db.execute("SELECT * FROM member WHERE homepage=(?) ORDER BY member_name COLLATE NOCASE",(1,)).fetchall()
|
homepage = db.execute("SELECT * FROM member WHERE homepage=(?) ORDER BY member_name COLLATE NOCASE",(1,)).fetchall()
|
||||||
|
|
||||||
latest_start = db.execute("SELECT start_time FROM front_log ORDER BY start_time DESC").fetchone()
|
latest_start = db.execute("SELECT start_time FROM front_log ORDER BY start_time DESC").fetchone()
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<div id="frontbanner" class="heading">
|
<div id="frontbanner" class="heading">
|
||||||
{% if front_list|length > 0 %}
|
{% if front_list|length > 0 %}
|
||||||
<b>currently fronting: </b> {% for member in front_list %}{% if not g.user and member[9]==0 %}{% else %}<a href="{{ url_for('home.page', mid=member[0]) }}">{{ member[3]|safe }}</a> {% if front_list.index(member) != front_list|length -1 %}&{% endif %}{% endif %} {% endfor %}
|
<b>currently fronting: </b> {% for member in front_list %}{% if member[22] %}<a href="{{ url_for('home.page', mid=member[22]) }}">{{ member[3]|safe }}</a>{%else%}<a href="{{ url_for('home.page', mid=member[0]) }}">{{ member[3]|safe }}</a>{%endif%} {% if front_list.index(member) != front_list|length -1 %}& {% endif %}{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<i><sub>There are currently no members listed as fronting</sub></i>
|
<i><sub>There are currently no members listed as fronting</sub></i>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
Reference in New Issue
Block a user