Commit f56fcd9b authored by PJ Janse van Rensburg's avatar PJ Janse van Rensburg

Preserve 'input_class' parameter.

parent 2c8bca94
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
{% endmacro %} {% endmacro %}
{% macro search_form() %} {% macro search_form(input_class=None) %}
<form method="GET" action="{{ return_url }}" class="search-form"> <form method="GET" action="{{ return_url }}" class="search-form">
{% for flt_name, flt_value in filter_args.items() %} {% for flt_name, flt_value in filter_args.items() %}
<input type="hidden" name="{{ flt_name }}" value="{{ flt_value }}"> <input type="hidden" name="{{ flt_name }}" value="{{ flt_value }}">
...@@ -76,13 +76,13 @@ ...@@ -76,13 +76,13 @@
{%- if search_placeholder %}{% set full_search_placeholder = [full_search_placeholder, search_placeholder] | join(": ") %}{% endif %} {%- if search_placeholder %}{% set full_search_placeholder = [full_search_placeholder, search_placeholder] | join(": ") %}{% endif %}
{% if search %} {% if search %}
<div class="input-append"> <div class="input-append">
<input type="search" name="search" class="input-xlarge" value="{{ search }}" placeholder="{{ full_search_placeholder }}"> <input type="search" name="search" class="input-xlarge{% if input_class %} {{ input_class }}{% endif %}" value="{{ search }}" placeholder="{{ full_search_placeholder }}">
<a href="{{ clear_search_url }}" class="clear add-on"> <a href="{{ clear_search_url }}" class="clear add-on">
<i class="fa fa-times icon-remove"></i> <i class="fa fa-times icon-remove"></i>
</a> </a>
</div> </div>
{% else %} {% else %}
<input type="search" name="search" class="input-xlarge" value="" placeholder="{{ full_search_placeholder }}"> <input type="search" name="search" class="input-xlarge{% if input_class %} {{ input_class }}{% endif %}" value="" placeholder="{{ full_search_placeholder }}">
{% endif %} {% endif %}
</form> </form>
{% endmacro %} {% endmacro %}
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
{% endmacro %} {% endmacro %}
{% macro search_form() %} {% macro search_form(input_class=None) %}
<form method="GET" action="{{ return_url }}" class="navbar-form navbar-left" role="search"> <form method="GET" action="{{ return_url }}" class="navbar-form navbar-left" role="search">
{% for flt_name, flt_value in filter_args.items() %} {% for flt_name, flt_value in filter_args.items() %}
<input type="hidden" name="{{ flt_name }}" value="{{ flt_value }}"> <input type="hidden" name="{{ flt_name }}" value="{{ flt_value }}">
...@@ -78,12 +78,12 @@ ...@@ -78,12 +78,12 @@
{%- set input_size = [[full_search_placeholder | length, 30] | max, max_size] | min %} {%- set input_size = [[full_search_placeholder | length, 30] | max, max_size] | min %}
{% if search %} {% if search %}
<div class="input-group"> <div class="input-group">
<input type="search" name="search" value="{{ search }}" class="form-control" size="{{ input_size }}" placeholder="{{ full_search_placeholder }}"> <input type="search" name="search" value="{{ search }}" class="form-control{% if input_class %} {{ input_class }}{% endif %}" size="{{ input_size }}" placeholder="{{ full_search_placeholder }}">
<a href="{{ clear_search_url }}" class="input-group-addon clear"><span class="fa fa-times glyphicon glyphicon-remove"></span></a> <a href="{{ clear_search_url }}" class="input-group-addon clear"><span class="fa fa-times glyphicon glyphicon-remove"></span></a>
</div> </div>
{% else %} {% else %}
<div class="form-group"> <div class="form-group">
<input type="search" name="search" value="" class="form-control" size="{{ input_size }}" placeholder="{{ full_search_placeholder }}"> <input type="search" name="search" value="" class="form-control{% if input_class %} {{ input_class }}{% endif %}" size="{{ input_size }}" placeholder="{{ full_search_placeholder }}">
</div> </div>
{% endif %} {% endif %}
</form> </form>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment