Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-14 10:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1390 from kaedroho/template-fixes

Browse source 
Template fixes
This commit is contained in:
Karl Hobley 2015-06-09 16:25:07 +01:00
commit da9858fc39
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wagtail/project_template/project_name/templates/base.html
View file

@ -1,4 +1,4 @@
{% templatetag openblock %} load compress static wagtailuserbar {% templatetag closeblock %}
{% templatetag openblock %} load static wagtailuserbar {% templatetag closeblock %}
<!DOCTYPE html>
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
@ -12,11 +12,11 @@
<meta name="description" content="" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
{# Global stylesheets #}
{% templatetag opencomment %} Global stylesheets {% templatetag closecomment %}
<link rel="stylesheet" type="text/css" href="{% templatetag openblock %} static 'css/{{ project_name }}.css' {% templatetag closeblock %}">
{% templatetag openblock %} block extra_css {% templatetag closeblock %}
{# Override this in templates to add extra stylesheets #}
{% templatetag opencomment %} Override this in templates to add extra stylesheets {% templatetag closecomment %}
{% templatetag openblock %} endblock {% templatetag closeblock %}
</head>
@ -25,11 +25,11 @@
{% templatetag openblock %} block content {% templatetag closeblock %}{% templatetag openblock %} endblock {% templatetag closeblock %}
{# Global javascript #}
{% templatetag opencomment %} Global javascript {% templatetag closecomment %}
<script type="text/javascript" src="{% templatetag openblock %} static 'js/{{ project_name }}.js' {% templatetag closeblock %}"></script>
{% templatetag openblock %} block extra_js {% templatetag closeblock %}
{# Override this in templates to add extra javascript #}
{% templatetag opencomment %} Override this in templates to add extra javascript {% templatetag closecomment %}
{% templatetag openblock %} endblock {% templatetag closeblock %}
</body>
</html>

2
wagtail/project_template/search/templates/search/search.html
View file

@ -9,7 +9,7 @@
<h1>Search</h1>
<form action="{% templatetag openblock %} url 'search' {% templatetag closeblock %}" method="get">
<input type="text" name="query"{% templatetag openblock %} if search_query {% templatetag closeblock %} value="{% templatetag openvariable %} search_query {% templatetag closevariable %}{% templatetag openblock %} endif {% templatetag closeblock %}">
<input type="text" name="query"{% templatetag openblock %} if search_query {% templatetag closeblock %} value="{% templatetag openvariable %} search_query {% templatetag closevariable %}"{% templatetag openblock %} endif {% templatetag closeblock %}>
<input type="submit" value="Search">
</form>