From b94a6df756f80890ca0c04d9c08e05eb7b87870c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20P=C3=A9rez-Cerezo?= Date: Tue, 17 Jul 2018 16:00:44 +0200 Subject: Various html improvements --- templates/bug.html | 6 +++++- templates/buglist.html | 29 +++++++++++++++++++++++------ templates/macros.html | 13 +++++++++++++ 3 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 templates/macros.html (limited to 'templates') diff --git a/templates/bug.html b/templates/bug.html index fc891fa..c8c2c70 100644 --- a/templates/bug.html +++ b/templates/bug.html @@ -1,3 +1,4 @@ +{% import "macros.html" as macros %} @@ -13,7 +14,7 @@ <h3 class="subject" > {{ replies[0]["Subject"]|e }} </h3> - Send replies to <a href="mailto:{{ bug.id }}@{{ DOMAIN }}" >{{ bug.id }}@{{ DOMAIN }}</a> + Send replies to <a href="mailto:{{ bug.id }}@{{ DOMAIN }}" >{{ bug.id }}@{{ DOMAIN }}</a> or using the <a href="#ReplyForm">Form below.</a> </header> {% for i in replies %} <div class="container"> @@ -37,5 +38,8 @@ </div> </div> {% endif %} + + {{ macros.form(bug.id, DOMAIN, True) }} + </body> diff --git a/templates/buglist.html b/templates/buglist.html index 142dc69..2183366 100644 --- a/templates/buglist.html +++ b/templates/buglist.html @@ -1,3 +1,4 @@ +{% import "macros.html" as macros %} <!DOCTYPE html> <head> <title> @@ -14,19 +15,32 @@ <h3> Bugs in {{prname}} </h3> + Report bugs by sending an e-mail to <a href="mailto:{{prname}}@{{DOMAIN}}" >{{prname}}@{{DOMAIN}}</a> or using the <a href="#ReplyForm">Form below.</a> + <div class="devavatars" > + Developers:<br> + {% for i in dev_avatars %} + <img class="avatar" src="{{ i }}" alt="avatar" /> + {% endfor %} + <div class="floatbarrier"> </div> + </div> </header> <table> <thead> - <td>Id - <td>Name - <td>Number of replies - <td>Created - <td>Last Reply - <td>Status + <tr> + <td> + <td>Id + <td>Subject + <td>Replies + <td>Created + <td>Last Reply + <td>Status + </tr> </thead> {% for i in bugs %} <tr class="{% if i.closed %} closed {% endif %}" > <td> + <img src="{{ i.avatar }}" style="height:1em;" alt="creator avatar" title="Creator avatar"> + <td class="id" > {{ i.id }} <td> <a href="/{{ prname }}/{{ i.id }}.html"> {{ i.subject|e }}</a> @@ -45,4 +59,7 @@ </tr> {% endfor %} </table> + +{{ macros.form(prname, DOMAIN) }} + </body> diff --git a/templates/macros.html b/templates/macros.html new file mode 100644 index 0000000..a84624f --- /dev/null +++ b/templates/macros.html @@ -0,0 +1,13 @@ +{% macro form(to, domain, reply=False) %} +<form action="mailto:{{ to }}@{{ domain }}" method="GET" class="submit"> + <a name="ReplyForm"></a> + {% if reply %} + <h5 class="form" > Reply </h4> +{% else %} +<h5 class="form" > Submit a bug </h4> +<label for="subject">Subject: </label><input name="subject" type="text" /><br> +{% endif %} +<label for="body">Description of bug:</label><br><textarea name="body"></textarea><br> +<input type="submit" value="Open mail program to submit bug report" /> +</form> +{% endmacro %} -- cgit v1.2.3