diff options
| -rw-r--r-- | export/hemiptera.png | bin | 0 -> 209 bytes | |||
| -rw-r--r-- | export/styles.css | 13 | ||||
| -rw-r--r-- | templates/bug.html | 5 | ||||
| -rw-r--r-- | templates/buglist.html | 8 | ||||
| -rw-r--r-- | templates/macros.html | 9 | ||||
| -rw-r--r-- | templates/main_page.html | 11 |
6 files changed, 33 insertions, 13 deletions
diff --git a/export/hemiptera.png b/export/hemiptera.png Binary files differnew file mode 100644 index 0000000..37f504a --- /dev/null +++ b/export/hemiptera.png diff --git a/export/styles.css b/export/styles.css index 2aab9ec..bb1cdfd 100644 --- a/export/styles.css +++ b/export/styles.css @@ -1,6 +1,6 @@ .container { border: 1px solid #aaa; - margin: 1em; + margin: 1em; margin-top:0; margin-bottom:-1px; padding: 1em; @@ -34,7 +34,8 @@ header { body { font-family: sans-serif; - margin: 0; + margin: 1em; + } @@ -189,8 +190,16 @@ h1 { background-color: #aaa; margin-bottom: 1em; border-radius: 3px 3px 0 0; + min-height: 2em; +} +.logo { + height: 2em; + float: left; + margin-right: 0.5em; } + + a { color:blue; diff --git a/templates/bug.html b/templates/bug.html index c8c2c70..a428576 100644 --- a/templates/bug.html +++ b/templates/bug.html @@ -4,12 +4,11 @@ <title> Hemiptera Bugtracker at {{DOMAIN}} </title> - <meta charset="utf-8"> - <link rel="stylesheet" type="text/css" href="/styles.css" > + {{ macros.head() }} </head> <body> <header> - <h1><a href="/"> Hemiptera Bugtracker at {{DOMAIN}}</a></h1> + {{ macros.h1(DOMAIN) }} <h2><a href="/{{prname}}" >{{prname}}</a></h2> <h3 class="subject" > {{ replies[0]["Subject"]|e }} diff --git a/templates/buglist.html b/templates/buglist.html index 2664e00..15806e8 100644 --- a/templates/buglist.html +++ b/templates/buglist.html @@ -4,14 +4,12 @@ <title> Hemiptera Bugtracker at {{DOMAIN}} </title> - <meta charset="utf-8"> - <link rel="stylesheet" type="text/css" href="/styles.css" > + + {{ macros.head() }} </head> <body> <header> - <h1> - <a href="/" >Hemiptera Bugtracker at {{DOMAIN}}</a> - </h1> + {{ macros.h1(DOMAIN) }} <h3> Bugs in {{prname}} </h3> diff --git a/templates/macros.html b/templates/macros.html index a84624f..76fad97 100644 --- a/templates/macros.html +++ b/templates/macros.html @@ -11,3 +11,12 @@ <input type="submit" value="Open mail program to submit bug report" /> </form> {% endmacro %} + +{% macro h1(DOMAIN) %} +<h1><a href="/"> <img class="logo" src="/hemiptera.png"> Hemiptera Bugtracker at {{DOMAIN}}</a></h1> +{% endmacro %} +{% macro head() %} + <meta charset="utf-8"> + <link rel="stylesheet" type="text/css" href="/styles.css" > + <link rel="icon" type="image/png" href="/hemiptera.png"/> +{% endmacro %} diff --git a/templates/main_page.html b/templates/main_page.html index dabb1ee..f7ffbe3 100644 --- a/templates/main_page.html +++ b/templates/main_page.html @@ -1,13 +1,18 @@ +{% import "macros.html" as macros %} <!DOCTYPE html> <head> <title> Hemiptera Bugtracker at {{DOMAIN}} </title> - <meta charset="utf-8"> - <link rel="stylesheet" type="text/css" href="/styles.css" > + {{ macros.head() }} </head> <body> - List of projects + <header> + + {{ macros.h1(DOMAIN) }} + <h2><a href="/" >List of projects</a></h2> + </header> + <table> <thead> <td>Name |
