diff --git a/myriad/__init__.py b/myriad/__init__.py index 6b6aaf3..648970b 100644 --- a/myriad/__init__.py +++ b/myriad/__init__.py @@ -56,8 +56,25 @@ def create_app(): if os.path.isfile(os.path.join(app.config["STATIC_FOLDER"], "favicon.ico")): return True return False + def get_pins_public(): + db = get_db() + pins = db.execute("SELECT * FROM member WHERE homepage=(?) AND public=(?) ORDER BY member_name",(1, 1)).fetchall() + return pins + def get_pins_all(): + db = get_db() + pins = db.execute("SELECT * FROM member WHERE homepage=(?) ORDER BY member_name",(1,)).fetchall() + return pins - - return dict(get_themes=get_themes, server_time=w_server_time, get_datetime_str=w_get_datetime_str, get_member=get_member, remove_html=remove_html, get_pages=get_pages, get_system_name=get_system_name, get_pages_name=get_pages_name, check_favicon=check_favicon) + return dict(get_themes=get_themes, + server_time=w_server_time, + get_datetime_str=w_get_datetime_str, + get_member=get_member, + remove_html=remove_html, + get_pages=get_pages, + get_system_name=get_system_name, + get_pages_name=get_pages_name, + check_favicon=check_favicon, + get_pins_public=get_pins_public, + get_pins_all=get_pins_all) return app diff --git a/myriad/templates/base.html b/myriad/templates/base.html index 3dc043a..388fd17 100644 --- a/myriad/templates/base.html +++ b/myriad/templates/base.html @@ -37,6 +37,19 @@ {% endif %} + {% if g.user %} + {% set pins = get_pins_all() %} + {% else %} + {% set pins = get_pins_public() %} + {% endif %} + + {% if pins %} +
Pinned
+ {% for pin in pins %} + + {% endfor %} + {% endif %} + {% set pages = get_pages() %} {% if pages %}
{{ get_pages_name() }}