diff options
| author | Marcin Łabanowski <marcin@6irc.net> | 2013-01-09 08:35:27 +0100 |
|---|---|---|
| committer | Marcin Łabanowski <marcin@6irc.net> | 2013-01-09 08:35:27 +0100 |
| commit | c18ed4e51a8fa9d7d67fdd14f957f0e6fc0cbea3 (patch) | |
| tree | 7ec8c4076cf8c1863f443dbd0dcfd717f00c1a1b /templates/generic_page.html | |
| parent | f6e9dbed1333f6761de0e748a6a41b6b365158dc (diff) | |
| parent | e145a0ea890f6973f349d8fb342e38a9be4c649b (diff) | |
Merge branch 'master' of https://github.com/asiekierka/Tinyboard
Conflicts:
mod.php
Diffstat (limited to 'templates/generic_page.html')
| -rw-r--r-- | templates/generic_page.html | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/templates/generic_page.html b/templates/generic_page.html index c50fb5dd..539cfdd3 100644 --- a/templates/generic_page.html +++ b/templates/generic_page.html @@ -2,35 +2,8 @@ <html> <head> {% block head %} - <link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"> - {% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %} - <title>{{ board.url }} - {{ board.name }}</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=yes"> - {% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %} - {% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %} - <script type="text/javascript">var configRoot="{{ config.root }}";</script> - {% if not nojavascript %} - <script type="text/javascript" src="{{ config.url_javascript }}"></script> - {% if not config.additional_javascript_compile %} - {% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %} - {% endif %} - {% endif %} - {% if config.recaptcha %}<style type="text/css">{% raw %} - .recaptcha_image_cell { - background: none !important; - } - table.recaptchatable { - border: none !important; - } - #recaptcha_logo, #recaptcha_tagline { - display: none; - float: right; - } - .recaptchatable a { - display: block; - } - {% endraw %}</style>{% endif %} + {% include 'header.html' %} + <title>{{ board.url }} - {{ board.name }}</title> {% endblock %} </head> <body> |