preview-release-nov

locale/de/LC_MESSAGES/django.po

@@ -59,7 +59,7 @@ msgstr ""
 #: project_base/templates/newsletter/subscription_subscribe_user.html:5
 #: project_base/templates/newsletter/subscription_subscribe_user.html:8
 msgid "Newsletter subscribe"
-msgstr "Suchagent- und Newsletteranmeldung"
+msgstr "Suchagent- und/oder Newsletteranmeldung"
 
 
 ### ********************** /\ *****************************

marktplatz/forms.py

@@ -12,8 +12,8 @@ from django.forms.models import inlineformset_factory
 # from django.views.generic.edit.FormMixin
 # from crispy_forms.layout.buttons import Submit, InputButton
 
-from crispy_forms.layout import Layout, Field, Fieldset, Div, Row, Column, HTML, ButtonHolder, Submit
-from crispy_forms.bootstrap import InlineField
+from crispy_forms.layout import *
+from crispy_forms.bootstrap import InlineField, InlineCheckboxes
 from crispy_forms.helper import FormHelper
 from captcha.fields import CaptchaField
 from tinymce.widgets import TinyMCE
@@ -57,14 +57,16 @@ class textSearchForm(forms.Form):
         self.helper.form_tag = False
         self.helper.layout = Layout(
 
+
            Div(
-               Div('searchText',  css_class='col-sm-6 col-6'),
+               Div('searchText',  css_class='col-sm-4 col-4'),
                Div(
                    ButtonHolder(
                        Submit('submit', 'Suche', css_class='border-thin mybtn')
                    ),
-               css_class='col-sm-6 col-6'),
+               css_class='col-sm-2 col-2'),
                css_class='form-row row mab-search-bar'),
+
            )
 
 
@@ -84,111 +86,39 @@ class searchAgentForm(forms.ModelForm):
                 ('Suchagent einrichten'),
                 # 'ort',
                Div(
-                   Div('ort',  css_class='col-sm-6 col-6 checkbox-ort'),
+
                    Div(
-                   HTML("""
-                   <button onclick=" ganz_wien()" class="btn btn-primary border-thin border-dark mybtn">Ganz Wien</button>
-                   <script>
-                    function ganz_wien(){
-                      $(".checkbox-ort .custom-control-label:contains('Wien')").each(function() {
-                       $this = $(this);
-                       var selector = "#" + $this.attr('for')  ;
-                       $( selector ).prop('checked', true);
-                    });
-                    }
-                   </script>
-                   <br>
-                   """),
-                   # HTML("""
-                   # <div id="div_id_ort" class="form-group">
-                   # <label for="" class=" requiredField">Ort<span class="asteriskField">*</span> </label>
-                   # <div class="">
-                   # <div class="row">
-                   #     <div class="col-sm-6 col-6 checkbox-ort">
-                   #
-                   #             <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_1" value="1010" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_1">
-                   #                 Wien 1
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_2" value="1020" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_2">
-                   #                 Wien 2
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_3" value="1030" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_3">
-                   #                 Wien 3
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_4" value="1040" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_4">
-                   #                 Wien 4
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_5" value="1050" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_5">
-                   #                 Wien 5
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_6" value="1060" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_6">
-                   #                 Wien 6
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_7" value="1070" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_7">
-                   #                 Wien 7
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_8" value="1080" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_8">
-                   #                 Wien 8
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_9" value="1090" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_9">
-                   #                 Wien 9
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_10" value="1100" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_10">
-                   #                 Wien 10
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_11" value="1110" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_11">
-                   #                 Wien 11
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_12" value="1120" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_12">
-                   #                 Wien 12
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_13" value="1130" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_13">
-                   #                 Wien 13
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_14" value="1140" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_14">
-                   #                 Wien 14
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_15" value="1150" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_15">
-                   #                 Wien 15
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_16" value="1160" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_16">
-                   #                 Wien 16
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_17" value="1170" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_17">
-                   #                 Wien 17
-                   #             </label> </div>
-                   #         </div>
-                   #         <div class="col-sm-6 col-6 checkbox-ort">
-                   #
-                   #
-                   #             <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_18" value="1180" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_18">
-                   #                 Wien 18
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_19" value="1190" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_19">
-                   #                 Wien 19
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_20" value="1200" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_20">
-                   #                 Wien 20
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_21" value="1210" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_21">
-                   #                 Wien 21
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_22" value="1220" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_22">
-                   #                 Wien 22
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_23" value="1230" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_23">
-                   #                 Wien 23
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_24" value="GERM" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_24">
-                   #                 Deutschland
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_25" value="SCHW" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_25">
-                   #                 Schweiz
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_26" value="VORA" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_26">
-                   #                 Vorarlberg
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_27" value="TIRO" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_27">
-                   #                 Tirol
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_28" value="SALZ" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_28">
-                   #                 Salzburg
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_29" value="KAER" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_29">
-                   #                 Kärnten
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_30" value="STEI" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_30">
-                   #                 Steiermark
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_31" value="OBER" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_31">
-                   #                 Oberösterreich
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_32" value="NIER" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_32">
-                   #                 Niederösterreich
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_33" value="BURG" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_33">
-                   #                 Burgenland
-                   #             </label> </div> <div class="custom-control custom-checkbox"> <input type="checkbox" class="custom-control-input" name="ort" id="id_ort_34" value="WELT" style="min-height: 250px;"> <label class="custom-control-label" for="id_ort_34">
-                   #                 Welt
-                   #             </label> </div>
-                   #         </div>
-                   #         </div>
-                   #         <small id="hint_id_ort" class="form-text text-muted">Ort des Projektes</small>
-                   #     </div>
-                   # </div>
-                   #
-                   # """),
+
+                   InlineCheckboxes('ort'),
+                   css_class='col-sm-8 col-8 checkbox-ort'
+
+                   ),
+
+               css_class='form-row  row'),
+
+               Div(
+
+                   Div(
+
+                       HTML("""
+                       <button onclick=" ganz_wien()" class="btn btn-primary border-thin border-dark mybtn">Ganz Wien</button>
+                       <script>
+                        function ganz_wien(){
+                          $(".checkbox-ort .custom-control-label:contains('Wien')").each(function() {
+                           $this = $(this);
+                           var selector = "#" + $this.attr('for')  ;
+                           $( selector ).prop('checked', true);
+                        });
+                        }
+                       </script>
+                       <br><br><br>
+                       """),
+
                    css_class='col-sm-6 col-6'),
-                   css_class='form-row  row'),
+
+              css_class='form-row  row'),
+
+
 
             ),
         )

marktplatz/templates/marktplatz/form_newsletter.html

@@ -11,6 +11,13 @@
     color: #F00;
 
   }
+
+  .custom-control-inline {
+    display: -ms-inline-flexbox;
+    display: inline-flex;
+    margin-right: 1.2rem;
+    margin-bottom: 1rem;
+  }
 </style>
 
   <div class="col-sm-6">

marktplatz/templates/marktplatz/product_overview.html

@@ -241,28 +241,23 @@ $(document).ready(function(){
 
 
 
-
-
-
 {% block content %}
 
 <div class="container-fluid tag-container">
 
 
 
-
-
 <nav class="navbar-expand-sm tag" style="margin-left: 0px">
 
 
-  <button class="navbar-toggler border-thin mybtn rounded-0 tag navbar-expand-sm " type="button" data-toggle="collapse" data-target="#tags"  aria-expanded="false" aria-label="Toggle tags" style="font-size: 15px">
+  <button class="navbar-toggler border-thin mybtn rounded-0 tag navbar-expand-sm " type="button" data-toggle="collapse" data-target="#tags" aria-expanded="false" aria-label="Toggle tags" style="font-size: 15px">
     <span class="mybtn"></span> Alle Tags anzeigen ⋁
   </button>
 
   <div class="row border-dark collapse navbar-collapse tag-line" id="tags">
     <div class="container-fluid">
       <p>Filtere die Projekte, indem du auf einen der folgenden Tags klickst:</p>
-      <button  class="show-all border-thin mybtn " style="margin-bottom: 2px; ">#Alle anzeigen</button>
+      <button class="show-all border-thin mybtn " style="margin-bottom: 2px; ">#Alle anzeigen</button>
 
       {% for elem in frei_list %}
       <button id='{{elem.0}}' data-toggler='{{elem.0}}' class="border-thin mybtn btn-toggle elem.0" style="margin-bottom: 2px; ">#{{elem.1}}</button>
@@ -282,8 +277,8 @@ $(document).ready(function(){
 
       <button class="border-thin mybtn btn-toggle begleitet_true" data-toggler='begleitet_true' style="margin-bottom: 2px; " style="">#Begleitet von realitylab</button>
       <button class="border-thin mybtn btn-toggle urbanem_true" data-toggler='urbanem_true' style="margin-bottom: 2px; " style="">#Urbane Mischung</button>
-      <button class="border-thin mybtn " style="margin-bottom: 2px; ">{% include "marktplatz/modal-sa.html" %}</button>
-      <button class="border-thin mybtn btn-toggle urbanem_true"  style="margin-bottom: 2px;" onclick="window.location='{% url 'newsletter-anmeldung' newsletter_slug='gemeinschaffen-newsletter' %}'" style="">Newsletter </button>
+      <button class="border-thin mybtn" style="margin-bottom: 2px;">{% include "marktplatz/modal-sa.html" %}</button>
+      <button class="border-thin mybtn" style="margin-bottom: 2px;" onclick="window.location='{% url 'newsletter-anmeldung' newsletter_slug='gemeinschaffen-newsletter' %}'" style=""><i class="fas fa-envelope"></i> Newsletter </button>
 
 
 
@@ -294,7 +289,9 @@ $(document).ready(function(){
     <div class="container-fluid">
       <div class="row">
         <div class="col-sm-6">
-          <form method="post" action="{% url 'generic-search-products' type=type %}" >
+
+
+          <form method="post" action="{% url 'generic-search-products' type=type %}">
             {% csrf_token %}
             <!-- Left here in case we need to debug -->
             {% if signup_errors %}
@@ -310,9 +307,9 @@ $(document).ready(function(){
 
           </form>
 
+
         </div>
         <div class="col-sm-6">
-
         </div>
       </div>
     </div>

marktplatz/views.py

@@ -95,20 +95,20 @@ class AgentNewslwtterFormView(TemplateView):
         context['bz'] = request.GET.get('bz', '') # used in template to check a district by default.
         return render(request, self.template_name, context )
 
-class AgentNewsletterSubscribeView(SubscribeRequestView):
+class AgentNewsletterSubscribeView( SubscribeRequestView ):
     action = 'subscribe'
     # form_class = AgentNewslwtterForm
     confirm = False
     embed = False
 
     def get_context_data(self, **kwargs):
-            if self.embed :
-                kwargs['embed']       = True
-                kwargs['form_content']       = '<i  class="fas fa-bell"></i> Suchagent einrichten'
-                kwargs['content_a']       = 'Dein Suchagent wurde erstellt!'
+        if self.embed :
+            kwargs['embed']       = True
+            kwargs['form_content']       = '<i  class="fas fa-bell"></i> Suchagent einrichten'
+            kwargs['content_a']       = 'Dein Suchagent wurde erstellt!'
 
-            # kwargs['news_form']       =  SubscribeRequestForm()
-            return super().get_context_data(**kwargs)
+        # kwargs['news_form']       =  SubscribeRequestForm()
+        return super().get_context_data(**kwargs)
 
     def post(self, request, *args, **kwargs):
 
@@ -126,7 +126,6 @@ class AgentNewsletterSubscribeView(SubscribeRequestView):
             return render(request, 'marktplatz/form_newsletter.html', context )
 
         if agent_form.cleaned_data['subscribe'] :
-            # return super(SubscribeRequestView).get(self, request, *args, **kwargs)
             return super().post( request, *args, **kwargs )
             # return super(SubscribeRequestView, self).post( request, *args, **kwargs )
 
@@ -135,9 +134,9 @@ class AgentNewsletterSubscribeView(SubscribeRequestView):
         context['content_a'] = '<br><i  class="fas fa-bell"></i><br><h2>Dein Suchagent wurde erstellt!</h2>'
         return render(request, 'marktplatz/generic.html', context )
 
-    def dispatch(self, request, *args, **kwargs):
-
-        return super(SubscribeRequestView, self).dispatch( request, *args, **kwargs )
+    # def dispatch(self, request, *args, **kwargs):
+    #
+    #     return super(SubscribeRequestView, self).dispatch( request, *args, **kwargs )
 
 
 class genericView(TemplateView):

project_base/templates/base_generic.html

@@ -332,7 +332,7 @@
       <li class="nav-item">
         <a class="nav-link " href="{% url 'wohnprojekte-list' %}">Wohnen</a>
       </li>
-      <li class="nav-item">
+      <!-- <li class="nav-item">
         <a class="nav-link " href="{% url 'mobilitaetsprojekte-list' %}">Mobilität</a>
       </li>
       <li class="nav-item">
@@ -340,7 +340,7 @@
       </li>
       <li class="nav-item">
         <a class="nav-link " href="{% url 'energieprojekte-list' %}">Energie</a>
-      </li>
+      </li> -->
     </ul>
 
     <!-- <form class="form-inline my-2 my-lg-0">

project_base/templates/newsletter/subscription_subscribe_user.html

@@ -1,5 +1,6 @@
 {% extends "newsletter/common.html" %}
 
+{% load crispy_forms_tags %}
 {% load i18n %}
 
 {% block title %}{% trans "Newsletter subscribe" %}{% endblock title %}
@@ -17,9 +18,14 @@
 </ul>
 {% else %}
 {% trans "Do you want to subscribe to this newsletter?" %}
+<br>
+<br>
 <form enctype="multipart/form-data" method="post" action="{% url "newsletter_subscribe_confirm" newsletter.slug %}">
     {% csrf_token %}
-    <p><input id="id_submit" name="submit" value="{% trans "Subscribe" %}" type="submit" /></p>
+    <p><input id="id_submit" class="border-thin mybtn" name="submit" value="{% trans "Subscribe" %}" type="submit" /></p>
 </form>
+<br>
+<br>
+<br>
 {% endif %}
 {% endblock body %}