Merge branch 'master' into master
This commit is contained in:
		
						commit
						d44b034817
					
				@ -1,6 +1,6 @@
 | 
				
			|||||||
<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form">
 | 
					<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form">
 | 
				
			||||||
    <div id="search_wrapper">
 | 
					    <div id="search_wrapper">
 | 
				
			||||||
        <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
 | 
					        <input type="text" autofocus placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
 | 
				
			||||||
        <input type="submit" value="search" id="search_submit" />
 | 
					        <input type="submit" value="search" id="search_submit" />
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    {% include 'courgette/categories.html' %}
 | 
					    {% include 'courgette/categories.html' %}
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form">
 | 
					<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form">
 | 
				
			||||||
    <div id="search_wrapper">
 | 
					    <div id="search_wrapper">
 | 
				
			||||||
        <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" size="100" {% if q %}value="{{ q }}"{% endif %}/>
 | 
					        <input type="text" autofocus placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" size="100" {% if q %}value="{{ q }}"{% endif %}/>
 | 
				
			||||||
        <input type="submit" value="search" id="search_submit" />
 | 
					        <input type="submit" value="search" id="search_submit" />
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    {% set display_tooltip = true %}
 | 
					    {% set display_tooltip = true %}
 | 
				
			||||||
 | 
				
			|||||||
@ -3,7 +3,7 @@
 | 
				
			|||||||
  <div class="row">
 | 
					  <div class="row">
 | 
				
			||||||
    <div class="col-xs-12 col-md-8">
 | 
					    <div class="col-xs-12 col-md-8">
 | 
				
			||||||
      <div class="input-group search-margin">
 | 
					      <div class="input-group search-margin">
 | 
				
			||||||
        <input type="search" name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s">
 | 
					        <input type="search" autofocus name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s">
 | 
				
			||||||
        <span class="input-group-btn">
 | 
					        <span class="input-group-btn">
 | 
				
			||||||
            <button type="submit" class="btn btn-default" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
 | 
					            <button type="submit" class="btn btn-default" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
 | 
				
			||||||
            <button type="reset" class="btn btn-default" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button>
 | 
					            <button type="reset" class="btn btn-default" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button>
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
    {% else %}
 | 
					    {% else %}
 | 
				
			||||||
    <div class="input-group col-md-8 col-md-offset-2">
 | 
					    <div class="input-group col-md-8 col-md-offset-2">
 | 
				
			||||||
    {% endif %}
 | 
					    {% endif %}
 | 
				
			||||||
        <input type="search" name="q" class="form-control input-lg autofocus" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s">
 | 
					        <input type="search" autofocus name="q" class="form-control input-lg autofocus" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s">
 | 
				
			||||||
        <span class="input-group-btn">
 | 
					        <span class="input-group-btn">
 | 
				
			||||||
            <button type="submit" class="btn btn-default input-lg" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
 | 
					            <button type="submit" class="btn btn-default input-lg" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
 | 
				
			||||||
            <button type="reset" class="btn btn-default input-lg" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button>
 | 
					            <button type="reset" class="btn btn-default input-lg" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button>
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form">
 | 
					<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form">
 | 
				
			||||||
    <div id="search_wrapper">
 | 
					    <div id="search_wrapper">
 | 
				
			||||||
        <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" size="100" {% if q %}value="{{ q }}"{% endif %}/>
 | 
					        <input type="text" autofocus placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" size="100" {% if q %}value="{{ q }}"{% endif %}/>
 | 
				
			||||||
        <input type="submit" value="" id="search_submit" />
 | 
					        <input type="submit" value="" id="search_submit" />
 | 
				
			||||||
        {% for category in categories %}
 | 
					        {% for category in categories %}
 | 
				
			||||||
        <input type="hidden" name="category_{{ category }}" value="1"/>
 | 
					        <input type="hidden" name="category_{{ category }}" value="1"/>
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,7 @@
 | 
				
			|||||||
<form id="search" method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
 | 
					<form id="search" method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
 | 
				
			||||||
  <div id="search_wrapper">
 | 
					  <div id="search_wrapper">
 | 
				
			||||||
    <div class="search_box">
 | 
					    <div class="search_box">
 | 
				
			||||||
      <input id="q" name="q" type="text" placeholder="{{ _('Search for...') }}" tabindex="1" autocomplete="off" spellcheck="false" dir="auto" {% if q %}value="{{ q }}"{% endif %} >
 | 
					      <input id="q" autofocus name="q" type="text" placeholder="{{ _('Search for...') }}" tabindex="1" autocomplete="off" spellcheck="false" dir="auto" {% if q %}value="{{ q }}"{% endif %} >
 | 
				
			||||||
      <button id="clear_search" type="button" tabindex="-1"><span class="hide_if_nojs">{{ icon('close') }}</span><span class="show_if_nojs">{{ _('Clear search') }}</span></button>
 | 
					      <button id="clear_search" type="button" tabindex="-1"><span class="hide_if_nojs">{{ icon('close') }}</span><span class="show_if_nojs">{{ _('Clear search') }}</span></button>
 | 
				
			||||||
      <button id="send_search" type="submit" tabindex="-1"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="show_if_nojs">{{ _('Start search') }}</span></button>
 | 
					      <button id="send_search" type="submit" tabindex="-1"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="show_if_nojs">{{ _('Start search') }}</span></button>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user