search query and layout

marktplatz/forms.py

@@ -29,7 +29,7 @@ def extend_help_text( help_text, myList ):
 
 class textSearchForm(forms.Form):
 
-    mywidget = forms.TextInput(  attrs={'onfocus': "this.value=''", }  )
+    mywidget = forms.TextInput(  attrs={'onfocus': "this.value=''", 'class' : "border-thin"}  )
     searchText = forms.CharField ( label='', widget = mywidget, max_length = 2048, min_length=3, empty_value="Suche...", initial='Suche...' )
 
     def __init__(self, *args, **kwargs):
@@ -42,7 +42,7 @@ class textSearchForm(forms.Form):
                Div('searchText',  css_class='col-sm-6 col-6'),
                Div(
                    ButtonHolder(
-                       Submit('submit', 'Submit', css_class='btn border-dark rounded-0 mybtn')
+                       Submit('submit', 'Submit', css_class='btn border-thin border-dark rounded-0 mybtn')
                    ),
                css_class='col-sm-6 col-6'),
                css_class='form-row  row'),

marktplatz/static/css/styles.css

@@ -224,6 +224,7 @@ img.vote {
     border-style: solid;
     border-width: 2px;
     border-color: black;
+    border-radius: 0;
     padding-bottom: 0px;
     margin: 0px;
     margin-right:1px ;

marktplatz/templates/marktplatz/product_overview.html

@@ -217,6 +217,9 @@ $(document).ready(function(){
       <button class="border-thin mybtn btn-toggle {{elem.0}}" toggler='{{elem.0}}' style="margin-right: 2px;margin-bottom: 2px">#{{elem.1}}</button>
       {% endfor %}
 
+      <button class="border-thin mybtn " style="margin-right: 2px;margin-bottom: 2px">{% include "marktplatz/modal-sa.html" %}</button>
+
+
     </div>
   </div>
 
@@ -247,7 +250,7 @@ $(document).ready(function(){
 
         </div>
         <div class="col-sm-6">
-          {% include "marktplatz/modal-sa.html" %}
+
         </div>
       </div>
     </div>

marktplatz/views.py

@@ -198,14 +198,16 @@ class ProductsView(generic.ListView):
 
 class SearchProductsView(ProductsView):
 
-    def get_queryset(self, qfilter, **kwargs ):
+
+    def get_queryset(self, qfilter=None, **kwargs ):
         # original qs
         qs = super().get_queryset()
 
         self.user = self.request.user
         user = self.user
 
-        qs =  qs.filter (name__icontains= qfilter) | qs.filter (claim__icontains= qfilter) | qs.filter (beschreibung__icontains= qfilter) | qs.filter (learning__icontains= qfilter) | qs.filter (status__icontains= qfilter) | qs.filter (adresse__icontains= qfilter) | qs.filter (plz__icontains= qfilter) | qs.filter (adresse__icontains= qfilter) | qs.filter (ort__icontains= qfilter) | qs.filter (website__icontains= qfilter) | qs.filter (email__icontains= qfilter) | qs.filter (kfrei__icontains= qfilter) | qs.filter (rechtsform__icontains= qfilter) | qs.filter (orga__icontains= qfilter)
+        if qfilter!=None:
+            qs =  qs.filter (name__icontains= qfilter) | qs.filter (claim__icontains= qfilter) | qs.filter (beschreibung__icontains= qfilter) | qs.filter (learning__icontains= qfilter) | qs.filter (status__icontains= qfilter) | qs.filter (adresse__icontains= qfilter) | qs.filter (plz__icontains= qfilter) | qs.filter (adresse__icontains= qfilter) | qs.filter (ort__icontains= qfilter) | qs.filter (website__icontains= qfilter) | qs.filter (email__icontains= qfilter) | qs.filter (kfrei__icontains= qfilter) | qs.filter (rechtsform__icontains= qfilter) | qs.filter (orga__icontains= qfilter)
 
         qs = qs.order_by('frei')