Merge branch 'production' into pretty

[wolnelektury.git] / wolnelektury / templates / base.html

diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index 4409486..23cb46b 100644 (file)
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -72,19 +72,20 @@
 
 
 
-            <form id="search-area">
+            <form id="search-area" action="/fullsearch/">
                 
-                <span id="search-field">
-                    <input title="np. Leśmian" name="q" autocomplete="off">
+                <span id="search-field" class="grid-line">
+                 {{search_form.q}}
+<!--                    <input title="np. Leśmian" name="q" autocomplete="off" data-source="/fullsearch/hint/">-->
                 </span><span id="search-button">
                     <button type='submit'><span class="mono">{% trans "Search" %}</span></button>
                 </span>
                 
+                <div class="clearboth"></div>
             </form>
 
 
 
-            <div class="clearboth"></div>
         </div>
         </div>
 
@@ -131,9 +132,11 @@
 
         <div class="clearboth"></div>
 
+        </div>{# end main-content #}
 
 
         <div id="footer">
+        <div id="footer-content">
             <p>
                {% blocktrans %}
                                Wolne Lektury is a project lead by <a href="http://nowoczesnapolska.org.pl/">Modern Poland Foundation</a>.
@@ -152,8 +155,8 @@
 
                        {% sponsor_page "footer" %}
         </div>
+        </div>
 
-        </div>{# end main-content #}
 
 
         {# template #}