diff options
| author | Philip Häusler <msquare@notrademark.de> | 2012-12-27 03:04:54 +0100 |
|---|---|---|
| committer | Philip Häusler <msquare@notrademark.de> | 2012-12-27 03:04:54 +0100 |
| commit | caeadadb2734bfc537d3e1701b2a20cad233a07e (patch) | |
| tree | e0606c6eb37707b372e65cf1c5f6243254eb94fe /templates | |
| parent | 32cae74a585ecc074124aa5b9668b9f0a25a2ad5 (diff) | |
| parent | 0f0f847af4c9ffe8138c802086bda7eb15f9baef (diff) | |
Merge branch 'dev'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/admin_free.html | 2 | ||||
| -rw-r--r-- | templates/layout.html | 1 | ||||
| -rw-r--r-- | templates/user_questions.html | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/templates/admin_free.html b/templates/admin_free.html index 522de12b..ef1dccf0 100644 --- a/templates/admin_free.html +++ b/templates/admin_free.html @@ -1,6 +1,6 @@ <form action="%link%" method="post"> <p> - Search Angel: <input type="text" name="search" value="%search%" /><input type="submit" name="submit" value="Search" /> + Search Angel: <input type="text" name="search" value="%search%" placeholder="Name"> %angeltypes% <label><input type="checkbox" name="confirmed_only" %confirmed_only% value="1"> Nur zugelassene</label> <input type="submit" name="submit" value="Search"> </p> </form> <table> diff --git a/templates/layout.html b/templates/layout.html index 695b6c9c..f6d19c6f 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -14,6 +14,7 @@ <script type="text/javascript" src="css/forms.js"></script> <link rel="stylesheet" type="text/css" href="css/base.css" /> <link rel="stylesheet" type="text/css" href="css/style%theme%.css" /> + %atom_link% </head> <body class="background"> <header> diff --git a/templates/user_questions.html b/templates/user_questions.html index 4cbe0338..0167ba6d 100644 --- a/templates/user_questions.html +++ b/templates/user_questions.html @@ -43,7 +43,7 @@ </table> <hr/> <p> - Frage einen Orga: + Frage einen Erzengel: </p> <form action="%link%&action=ask" method="post"> <table> |