diff options
Diffstat (limited to 'edaweb/templates')
| -rw-r--r-- | edaweb/templates/discord.html.j2 | 2 | ||||
| -rw-r--r-- | edaweb/templates/index.html.j2 | 6 | ||||
| -rw-r--r-- | edaweb/templates/question.html.j2 | 22 | ||||
| -rw-r--r-- | edaweb/templates/questions.html.j2 | 6 | ||||
| -rw-r--r-- | edaweb/templates/services.html.j2 | 2 |
5 files changed, 28 insertions, 10 deletions
diff --git a/edaweb/templates/discord.html.j2 b/edaweb/templates/discord.html.j2 index 597fb4b..e946f13 100644 --- a/edaweb/templates/discord.html.j2 +++ b/edaweb/templates/discord.html.j2 @@ -1,5 +1,5 @@ {% extends "template.html.j2" %} {% block content %} <p>You can contact me on discord (telegram preferred):</p> - <h1>{{discord}}</h1> + <h1>{{ discord }}</h1> {% endblock %}
\ No newline at end of file diff --git a/edaweb/templates/index.html.j2 b/edaweb/templates/index.html.j2 index d6c08d8..0f9ce37 100644 --- a/edaweb/templates/index.html.j2 +++ b/edaweb/templates/index.html.j2 @@ -1,16 +1,16 @@ {% extends "template.html.j2" %} {% block content %} <aside> - <a><i>{{ "%d days until FFS" % days_till_ffs.days }}</i></a> + <a><i>{{ "%d days since FFS" % days_since_ffs.days }}</i></a> <section id="recent_thoughts"> - <h4>recent thoughts:</h4> + <h4>recent blog posts:</h4> <ul> {% for id_, title in featured_thoughts %} <li><a href="{{'/thought?id=%i' % id_}}">{{title}}</a></li> {% endfor %} </ul> </section> - <img id="sidebar_img" alt="{{sidebar_img[0]}}" src="{{sidebar_img[1]}}"> + {# <img id="sidebar_img" alt="{{sidebar_img[0]}}" src="{{sidebar_img[1]}}"> #} </aside> {{markdown|safe}} <section id="recent_commits"> diff --git a/edaweb/templates/question.html.j2 b/edaweb/templates/question.html.j2 new file mode 100644 index 0000000..a9c7a0c --- /dev/null +++ b/edaweb/templates/question.html.j2 @@ -0,0 +1,22 @@ +{% extends "template.html.j2" %} +{% block content %} + <aside> + {% if qna["previous"] != None %} + <a href="/question?id={{ qna['previous'] }}">← Previous</a> + {% endif %} + {% if qna["next"] != None %} + <a href="/question?id={{ qna['next'] }}">→ Next</a> + {% endif %} + <br> + <a href="/questions#{{ qna['qna'][0] }}">All questions</a> + </aside> + + <h4><a href="{{ qnas_link }}">ask a question!</a></h4> + <dl> + <dt class="qnaheader">ID:</dt><dd>{{ qna["qna"][0] }}</dd> + <dt class="qnaheader">Question source:</dt><dd>{{ qna["qna"][-1] }}</dd> + <dt class="qnaheader">Answered at:</dt><dd>{{ qna["qna"][2] }}</dd> + <dt class="qnaheader">Question:</dt><dd>{{ qna["qna"][3] }}</dd> + <dt class="qnaheader">Answer:</dt><dd>{{ qna["qna"][4] }}</dd> + </dl> +{% endblock %}
\ No newline at end of file diff --git a/edaweb/templates/questions.html.j2 b/edaweb/templates/questions.html.j2 index eb58380..a800941 100644 --- a/edaweb/templates/questions.html.j2 +++ b/edaweb/templates/questions.html.j2 @@ -3,11 +3,7 @@ <h4><a href="{{ qnas_link }}">ask a question!</a></h4> <dl> {% for id_, link, dt, question, answer, host in qnas %} - {% if host == "curiouscat" %} - <dt class="qnaheader"><a href="{{ link }}">{{ dt.isoformat() }}</a> - {{ host }}</dt> - {% else %} - <dt class="qnaheader">{{ dt.isoformat() }} - {{ host }}</dt> - {% endif %} + <dt class="qnaheader" id="{{ id_ }}"><a href="question?id={{ id_ }}">{{ dt.isoformat() }}</a> - {{ host }}</dt> <dd> <dt class="question"><p>{{ question }}</p></dt> <dd class="answer"><p>{{ answer }}</p></dd> diff --git a/edaweb/templates/services.html.j2 b/edaweb/templates/services.html.j2 index 9f42c7f..c336990 100644 --- a/edaweb/templates/services.html.j2 +++ b/edaweb/templates/services.html.j2 @@ -5,7 +5,7 @@ <h2>docker</h2> <ul> {% for host, containers in docker["containers"].items() %} - <h4>{{ "%s - %s" % (host[0], host[1]) }}</h4> + <h4>{{ "%s - %s - %s" % (host[0], host[1], docker["uptimes"][host]) }}</h4> <table> {% for name, status, image in containers %} <tr> |