Skip to content

Commit

Permalink
Merge e682675 into fd8bdfe
Browse files Browse the repository at this point in the history
  • Loading branch information
dougthor42 committed Feb 26, 2019
2 parents fd8bdfe + e682675 commit dd412cf
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -28,6 +28,7 @@
blocking #47. (#100)
+ Moved javascript out of HTML files. (#47)
+ The tree is now auto-expanded by default. (#105)
+ The program version is now displayed on all pages. (#109)


## v0.3.0 (2019-01-28)
Expand Down
8 changes: 7 additions & 1 deletion src/trendlines/routes.py
Expand Up @@ -3,10 +3,11 @@
import json
from datetime import datetime
from datetime import timezone
from functools import partial

from flask import Blueprint
from flask import jsonify
from flask import render_template
from flask import render_template as _render_template
from flask import request

# peewee
Expand All @@ -16,6 +17,7 @@
from playhouse.shortcuts import update_model_from_dict

from trendlines import logger
from trendlines.__about__ import __version__
from . import db
from .error_responses import ErrorResponse
from . import utils
Expand All @@ -24,6 +26,10 @@
api = Blueprint('api', __name__)


# Make sure all pages show our version.
render_template = partial(_render_template, version=__version__)


@pages.route('/', methods=['GET'])
def index():
"""
Expand Down
1 change: 1 addition & 0 deletions src/trendlines/templates/trendlines/layout.html
Expand Up @@ -23,6 +23,7 @@

<main>
<h1><a href="{{ url_for('pages.index') }}">Trendlines</a></h1>
<h4>v{{ version }}</h4>

<div id="content">
{% block body %}
Expand Down

0 comments on commit dd412cf

Please sign in to comment.