fnp / prawokultury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 6f1d6a6 dfedb58)
Merge branch 'master' of github.com:fnp/prawokultury
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Mon, 27 Aug 2012 15:23:23 +0000 (17:23 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Mon, 27 Aug 2012 15:23:23 +0000 (17:23 +0200)
1  2 
prawokultury/templates/base.html patch | diff1 | diff2 | blob | history

diff --combined prawokultury/templates/base.html
index 5355e5a,c76ee4d..94a44f2
--- 1/prawokultury/templates/base.html
--- 2/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@@ -1,4 -1,3 +1,4 @@@
 +<!DOCTYPE html>
  {% load url from future %}
  {% load i18n static %}
  {% load migdal_tags events_tags %}
@@@ -36,7 -35,7 +36,7 @@@
  
          <div id="menu-bar">
          <div class="bar-right">
-             <form id="search-form"><input /><button>
+             <form id="search-form" method="GET" action="/search/"><input name="q" /><button>
                  <img src="{% static "img/search.png" %}" alt="{% trans "Search" %}" />
              </button></form>
          </div>
@@@ -59,9 -58,9 +59,9 @@@
                      {% categories 'topics' %}
                      {% categories 'types' %}
                  </div>
 -                <div class="sidebar-box">
 +                <!--div class="sidebar-box">
                      <a href="{% url 'migdal_main_feed' %}">RSS</a>
 -                </div>
 +                </div-->
                  <div class="sidebar-box">
                      <h3>{% trans "Latest comments" %}</h3>
                      {% last_comments %}
@@@ -95,4 -94,4 +95,4 @@@
      <script type="text/javascript" src="http://code.jquery.com/jquery-1.8.0.min.js" charset="utf-8"></script>
      {% compressed_js 'base' %}
      </body>
- </html>
+ </html>