diff --git a/myriad/home.py b/myriad/home.py index 4d110ec..1174a6c 100644 --- a/myriad/home.py +++ b/myriad/home.py @@ -5,6 +5,7 @@ from werkzeug.exceptions import abort from myriad.auth import login_required from myriad.db import get_db +from myriad.utilities import get_pages bp = Blueprint('home', __name__) @@ -99,4 +100,9 @@ def groups(): def custom_page(pid): db = get_db() page = db.execute("SELECT * FROM pages WHERE id=(?)",(pid,)).fetchone() - return render_template('custom_page.html', page=page) \ No newline at end of file + return render_template('custom_page.html', page=page) + +@bp.route("/page") +def pages(): + pages = get_pages() + return render_template('pages.html', pages=pages) \ No newline at end of file diff --git a/myriad/templates/base.html b/myriad/templates/base.html index 24e7ba2..709bf90 100644 --- a/myriad/templates/base.html +++ b/myriad/templates/base.html @@ -65,6 +65,7 @@ Full List | Groups | Blog | + {% set pages = get_pages() %}{% if pages %}{{ get_pages_name() }} | {% endif %} {% if g.user %}Admin{% endif %} diff --git a/myriad/templates/custom_page.html b/myriad/templates/custom_page.html index ca33568..3500a43 100644 --- a/myriad/templates/custom_page.html +++ b/myriad/templates/custom_page.html @@ -5,7 +5,7 @@
- {% if g.user %}Edit Page{% endif %} + {% if g.user %}

Edit Page

{% endif %} {{ page[2]|safe }} diff --git a/myriad/templates/pages.html b/myriad/templates/pages.html new file mode 100644 index 0000000..18d3e5a --- /dev/null +++ b/myriad/templates/pages.html @@ -0,0 +1,17 @@ +{% extends 'base.html' %} +{% block title %}{{ get_pages_name() }}{% endblock %} + +{% block content %} + +
+ + {% if not pages %} + There are no pages to show + {% endif %} + {% for page in pages %} +

{{ page[1]|safe }}

+ {% endfor %} + +
+ +{% endblock %} \ No newline at end of file