Minor css fix for search engine. It needs more improvements.

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 6a33456..3aceb4f 100644 (file)
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -26,7 +26,7 @@ class SearchForm(forms.Form):
         tags = kwargs.pop('tags', [])
         super(SearchForm, self).__init__(*args, **kwargs)
         self.fields['q'].widget.attrs['title'] = _('title, author, theme/topic, epoch, kind, genre')
         tags = kwargs.pop('tags', [])
         super(SearchForm, self).__init__(*args, **kwargs)
         self.fields['q'].widget.attrs['title'] = _('title, author, theme/topic, epoch, kind, genre')

-       self.fields['q'].widget.attrs['style'] = 'float: left; width: 200px; border: medium none; height: 15px; margin-top: 2px;'
+           #self.fields['q'].widget.attrs['style'] = ''

         self.fields['tags'].initial = '/'.join(tag.slug for tag in Tag.get_tag_list(tags))
 
 
         self.fields['tags'].initial = '/'.join(tag.slug for tag in Tag.get_tag_list(tags))
 
 

diff --git a/wolnelektury/static/css/facelist_2-0.css b/wolnelektury/static/css/facelist_2-0.css
index f723ea5..bd6d35e 100644 (file)
--- a/wolnelektury/static/css/facelist_2-0.css
+++ b/wolnelektury/static/css/facelist_2-0.css
@@ -18,7 +18,7 @@ ul.facelist-selections {
        box-shadow:inset 0 1px 2px #888;
        -webkit-box-shadow:inset 0 1px 2px #888;
        -moz-box-shadow:inset 0 1px 2px #888;
        box-shadow:inset 0 1px 2px #888;
        -webkit-box-shadow:inset 0 1px 2px #888;
        -moz-box-shadow:inset 0 1px 2px #888;

-       width: 600px;
+       width: 90%;

 }
 
 ul.facelist-selections.loading {
 }
 
 ul.facelist-selections.loading {

diff --git a/wolnelektury/static/css/master.css b/wolnelektury/static/css/master.css
index 7440827..cc7ca37 100644 (file)
--- a/wolnelektury/static/css/master.css
+++ b/wolnelektury/static/css/master.css
@@ -146,6 +146,13 @@ em {
     margin: 0.5em 0;
     padding: 0.5em;
     background-color: rgb(132, 191, 42);
     margin: 0.5em 0;
     padding: 0.5em;
     background-color: rgb(132, 191, 42);

+}
+
+#searchContainer {
+    width: 100%;
+    min-height: 65px;
+    background-color: rgb(132, 191, 42);
+    padding: 0px 5px;

     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     border-radius: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     border-radius: 4px;


@@ -153,6 +160,11 @@ em {
     border-right: 0.15em solid #7B9C2D;
 }
 
     border-right: 0.15em solid #7B9C2D;
 }
 

+#searchContainer #search-form {
+    padding: 0;
+    margin: 0;
+}
+

 #search-form p {
     margin: 0em 0 0 0;
 }
 #search-form p {
     margin: 0em 0 0 0;
 }


@@ -195,14 +207,19 @@ em {
 }
 
 .ac_input {
 }
 
 .ac_input {

-    width: 18em;
+    width: 300px;
+    border: 0;

 }
 
 p .ac_input {
     width: 28em;
 }
 
 }
 
 p .ac_input {
     width: 28em;
 }
 

-
+#searchSubmit {
+    float: left; 
+    margin-top: 10px; 
+    height: 33px;
+}

 /* ================== */
 /* = Search matches = */
 /* ================== */
 /* ================== */
 /* = Search matches = */
 /* ================== */

diff --git a/wolnelektury/templates/catalogue/breadcrumbs.html b/wolnelektury/templates/catalogue/breadcrumbs.html
index 9213adb..5aafeb9 100644 (file)
--- a/wolnelektury/templates/catalogue/breadcrumbs.html
+++ b/wolnelektury/templates/catalogue/breadcrumbs.html
@@ -1,24 +1,24 @@
 {% load i18n %}
 {% load catalogue_tags %}
 {% load i18n %}
 {% load catalogue_tags %}

-<form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form" style="float:left;">
-    <div style="width: 900px;">
+<div id="searchContainer">
+    <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">

     <ul class="facelist-selections" style="float:left;">
         {% for tag in tag_list %}
         <li class="facelist-selection-item">
     <ul class="facelist-selections" style="float:left;">
         {% for tag in tag_list %}
         <li class="facelist-selection-item">

-       <span style="margin-left: 5px;">
-       <a href="{% catalogue_url tag %}">{{ tag }}</a>
-       <a class="facelist-close" href="{% catalogue_url tag_list -tag %}">x</a>
-       </span>
-       </li>
+               <span style="margin-left: 5px;">
+               <a href="{% catalogue_url tag %}">{{ tag }}</a>
+               <a class="facelist-close" href="{% catalogue_url tag_list -tag %}">x</a>
+               </span>
+           </li>

         {% empty %}
         {% empty %}

-        <li class="facelist-selection-item">
-        </li>
+            <li class="facelist-selection-item">
+            </li>

         {% endfor %}
         {% if search_form %}
             <li>{{ search_form.q }} {{ search_form.tags }}</li>
         {% endif %}
     </ul>
         {% endfor %}
         {% if search_form %}
             <li>{{ search_form.q }} {{ search_form.tags }}</li>
         {% endif %}
     </ul>

-    <input type="submit" value="{% trans "Search" %}" style="float: left; margin-top: 10px; height: 33px;"/>
-    </div>
-</form>
+    <input type="submit" value="{% trans "Search" %}" id="searchSubmit"/>
+    </form>
+</div>    

 <div class="clearboth"></div>
 <div class="clearboth"></div>