email url, projekte, ganz Wien

marktplatz/forms.py

@@ -68,7 +68,6 @@ class textSearchForm(forms.Form):
 
 class searchAgentForm(forms.ModelForm):
 
-
     class Meta:
         model = SearchAgent
         fields = ('ort', 'email')
@@ -76,15 +75,28 @@ class searchAgentForm(forms.ModelForm):
     agent_layout = Layout(
         Fieldset(
             ('Suchagent'),
-            'ort',
+            # '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>
+               """),
+               css_class='col-sm-6 col-6'),
+               css_class='form-row  row'),
+
         ),
     )
 
-    # def __init__(self, *args, **kwargs):
-    #     super().__init__(*args, **kwargs)
-    #     self.fields ['ort'].label = 'Ich akzeptiere die <a href="{}"> Datenschutzrichtlinie</a> sowie die  <a href="{}"> Teilnahmebedingungen</a> und habe sie gelesen.'.format(drurl, tmurl)
-
-
 class AgentNewslwtterForm( searchAgentForm, GeneralFields):
 
     email_field = forms.EmailField( label = 'Email', required=True, max_length=254 )
@@ -95,7 +107,7 @@ class AgentNewslwtterForm( searchAgentForm, GeneralFields):
         super(searchAgentForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper(self)
         self.helper.attrs = {  'enctype' : "multipart/form-data" }
-        self.helper.form_action = reverse('agent-newsletter-create', kwargs={'newsletter_slug': "test_news"}    )
+        self.helper.form_action = reverse('agent-newsletter-create', kwargs={'newsletter_slug': "gemeinschaffen-newsletter"}    )
 
         self.helper.layout = Layout(
             self.agent_layout,
@@ -109,7 +121,6 @@ class AgentNewslwtterForm( searchAgentForm, GeneralFields):
        )
 
 
-
 class RegisterForm(forms.ModelForm, GeneralFields):
 
     class Meta:
@@ -187,7 +198,7 @@ class WohnprojektForm(ProductForm):
     class Meta:
         model = Wohnprojekt
         fields = ProductForm.product_fields + (
-         'eigentum', 'inseratstext', 'altneu', 'schwerpunkt', 'wohnbaufoerderung', 'artmodell', 'bautraeger', 'aerwachsene', 'akinder', 'awohnungen', 'wohnflaeche', 'gewerbeflaechen', 'gemeinschaftsflaeche', 'sonstige_flaechen', 'kflaechen', 'gemeinschaftr', 'kgemeinschaftr', 'sonderwohnformen', 'raumangebot', 'kraumangebot', 'parbeiten', 'karbeiten', 'bauweise', 'zielgruppen', 'gprojekte', 'oekologie', 'freiraumangebote', 'gaestwohnungen',
+         'eigentum', 'inseratstext', 'altneu', 'schwerpunkt', 'wohnbaufoerderung', 'artmodell', 'bautraeger', 'aerwachsene', 'akinder', 'awohnungen', 'wohnflaeche', 'gewerbeflaechen', 'gemeinschaftsflaeche', 'sonstige_flaechen', 'kflaechen', 'gemeinschaftr', 'kgemeinschaftr', 'sonderwohnformen', 'raumangebot', 'kraumangebot', 'parbeiten', 'karbeiten', 'bauweise', 'zielgruppen', 'gprojekte', 'oekologie', 'freiraumangebote', 'gaestwohnungen', 'urbanem',
          )
 
     def __init__(self,*args, **kwargs):
@@ -250,7 +261,7 @@ class WohnprojektForm(ProductForm):
                   Div('karbeiten', css_class='col-sm-6 col-6'),
                   css_class='form-row  row'),
 
-               'bauweise', 'zielgruppen', 'gprojekte', 'oekologie', 'freiraumangebote',
+               'bauweise', 'zielgruppen', 'gprojekte', 'oekologie', 'freiraumangebote', 'urbanem',
 
            )
        )

marktplatz/models.py

@@ -356,7 +356,7 @@ class Wohnprojekt(Product):
     oekologie          = CharField         ( 'Ökologie',  max_length = 1024, help_text="Ökologie", null = True, blank=True )
     freiraumangebote   = CharField         ( 'Freiraumangebote',  max_length = 64, choices=FREIANGEBOT, help_text="Freiraumangebote", null = True, blank=True )
     gaestwohnungen     = IntegerField      ( 'Anzahl an Gästewohnungen', help_text="Anzahl an Gästewohnungen", validators=[MinValueValidator(0)], default = 0 )
-
+    urbanem            = BooleanField      ( 'Urbane Mischung', default=False, help_text="Urbane Mischung?", blank=False )
 
 
 class Link(models.Model):

marktplatz/templates/marktplatz/form_newsletter.html

@@ -35,7 +35,7 @@
 
 
 
-    <!-- <form enctype="multipart/form-data" method="post" action="/newsletter/test_news/subscribe/">
+    <!-- <form enctype="multipart/form-data" method="post" action="/newsletter/gemeinschaffen-newsletter/subscribe/">
     {% csrf_token %}
     <label for="id_email_field">E-mail:</label> <input type="email" name="email_field" required="" id="id_email_field">
     <button id="id_submit" name="submit" value="Subscribe" type="submit">Subscribe</button>

marktplatz/templates/marktplatz/product_overview.html

@@ -349,6 +349,7 @@ $(document).ready(function(){
       {% endfor %}
 
       <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>
 
     </div>
@@ -409,7 +410,7 @@ $(document).ready(function(){
 
     <!-- rounded-0 border-0 -->
     <div
-      class="card  {{product.ort}} {{product.status}} {{product.frei}} {{product.altneu}} {% for key in product.raumangebot %}{{key}} {% endfor %} {% if product.mitmachen %}begleitet_true{% endif %}{% if product.frei == 'JAJA' %} mab-card-container-highlight {% endif %}   ">
+      class="card  {{product.ort}} {{product.status}} {{product.frei}} {{product.altneu}} {% for key in product.raumangebot %}{{key}} {% endfor %} {% if product.mitmachen %}begleitet_true{% endif %} {% if product.urbanem %}urbanem  _true{% endif %} {% if product.frei == 'JAJA' %} mab-card-container-highlight {% endif %}   ">
       <div id="product_{{product.pk}}_card" class="flipcard">
         <div class="mab-card-face mab-card-face--front toogle-overflow">
           <!--  -->
@@ -456,6 +457,12 @@ $(document).ready(function(){
                 {% if product.mitmachen %}
                 <button id='product_{{product.pk}}_{{product.mitmachen}}' data-toggler='begleitet_true' class="border-thin mybtn btn-toggle begleitet_true" style="">#Begleitet von RealityLab</button>
                 {% endif %}
+
+                {% if product.urbanem %}
+                <button id='product_{{product.pk}}_{{product.urbanem}}' data-toggler='urbanem_true' class="border-thin mybtn btn-toggle urbanem_true" style="">#Urbane Mischung</button>
+                {% endif %}
+
+
                 <!-- <button  class="show-all border-thin mybtn " style="margin-bottom: 2px; ">#Alle anzeigen</button> -->
                 <!-- <span id="ShareButton" class="cursor-pointer" > Teilen</span>  -->
               </p>

marktplatz/urls.py

@@ -7,19 +7,16 @@ from django.views.generic import RedirectView, TemplateView
 from django.conf.urls import url, include
 
 urlpatterns = [
-    path('', RedirectView.as_view(url='projects/'), name='index'),
+    path('', RedirectView.as_view(url='projekte/'), name='index'),
     path('about/', views.about, name='about'),
     path('submit/', views.submit, name='submit'),
-    path('projects/', views.ProductsView.as_view(), name='products'),
-    path('products/search', views.SearchProductsView.as_view(), name='search-products'),
+    path('projekte/', views.ProductsView.as_view(), name='products'),
+    path('projekte/search', views.SearchProductsView.as_view(), name='search-products'),
     path('products-list/', views.ProductsListView.as_view(), name='products-list'),
     path('products-list/embed', views.ProductsListView.as_view(  embed=True,  ), name='products-list-embed'),
     path('agent_newsletter/', views.AgentNewslwtterFormView.as_view(), name='search-agent-form'),
     path('agent_newsletter/embed/', views.AgentNewslwtterFormView.as_view( embed=True, ), name='search-agent-form-embed'),
     path('agent_newsletter/<slug:newsletter_slug>/anmelden/', views.AgentNewslwtterSubscribeView.as_view(   ), name='agent-newsletter-create'),
-    # path('agent_newsletter/<slug:newsletter_slug>/anmelden/embed/', views.AgentNewslwtterSubscribeView.as_view( embed=True,  ), name='agent-newsletter-create-embed'),
-    # path('agent_newsletter/anmelden', views.AgentNewslwtterSubscribeView.as_view(), name='search-agent-create'),
-    # path('suchagent/', views.SearchAgentCreate.as_view(), name='search-agent-create'),
     # path('suchagent/embed', views.SearchAgentCreate.as_view( embed=True, ), name='search-agent-create-embed'),
     path('suchagent/<int:pk>/<slug:hash>/', views.SearchAgentDelete.as_view(), name='search-agent-delete'),
     path('product/<int:pk>/', views.DetailView.as_view(), name='product-detail'),

project_base/templates/base_generic.html

@@ -280,7 +280,7 @@
         <a class="nav-link " href="#">Mobility</a>
       </li> -->
       <li class="nav-item">
-        <a class="nav-link " href="{% url 'products-list' %}">Wohnen</a>
+        <a class="nav-link " href="{% url 'products' %}">Wohnen</a>
       </li>
     </ul>
 

project_base/templates/newsletter/message/subscribe.html

@@ -12,9 +12,16 @@
 you, or someone in your name requested a subscription to {{ title }}.
 
 If you would like to confirm your subscription, please follow this activation link:
-<p><a href="http://{{ domain }}{{ url }}">http://{{ domain }}{{ url }}</a></p>
+http://{{ domain }}{{ url }}
 
 Kind regards,{% endblocktrans %}
 {{ newsletter.sender }}
+<br>
+{% with domain=site.domain url=subscription.subscribe_activate_url %}
+<p><a href="http://{{ domain }}{{ url }}">http://{{ domain }}{{ url }}</a></p>
+{% endwith %}
+<br>
+<br>
+<br>
 </body>
 </html>