urbanem fix in general overview

marktplatz/templates/marktplatz/file_upload.html

@@ -7,155 +7,146 @@
 {% block content %}
 
 
-
 <div class="container-fluid">
 
-    <h3 style="margin-top: 10px">{{product.name}} Media </h3>
-
- <table class="table table-sm table-hover">
+  <h3 style="margin-top: 10px">{{product.name}} Media </h3>
 
+  <table class="table table-sm table-hover">
 
     {% for pic in images %}
-    <tr class=""   >
-        <td  scope="col"><img src="{{  pic.image_small.url  }}?v={{ pic.pk }}"  width="50" height="50" alt="{{ pic.name_for }}"> </td>
-        <td  scope="col">    {{pic.name_for }} </td>
-        <td scope="col"> <a href="{% url 'delete-media' pk=pic.pk %}"><button  type="button" class="btn btn-default"><i class="fas fa-trash-alt"></i> Löschen</button> </a> </td>
-
+    <tr class="">
+      <td scope="col"><img src="{{  pic.image_small.url  }}?v={{ pic.pk }}" width="50" height="50" alt="{{ pic.name_for }}"> </td>
+      <td scope="col"> {{pic.name_for }} </td>
+      <td scope="col"> <a href="{% url 'delete-media' pk=pic.pk %}"><button type="button" class="btn btn-default"><i class="fas fa-trash-alt"></i> Löschen</button> </a> </td>
     </tr>
     {% endfor %}
-      {% for pic in video %}
-    <tr class=""   >
-        <td  scope="col"><img src="{{pic.image.url}}?v={{ pic.pk }}"  width="50" height="50" alt="Video: {{ pic.name_for }}"> </td>
-        <td  scope="col">    {{pic.name_for }} </td>
-
-        <td scope="col" > <a href="{% url 'delete-video' pk=pic.pk %}"><button  type="button" class="btn btn-default"><i class="fas fa-trash-alt"></i> Löschen</button> </a></td>
 
+    {% for pic in video %}
+    <tr class="">
+      <td scope="col"><img src="{{pic.image.url}}?v={{ pic.pk }}" width="50" height="50" alt="Video: {{ pic.name_for }}"> </td>
+      <td scope="col"> {{pic.name_for }} </td>
+      <td scope="col"> <a href="{% url 'delete-video' pk=pic.pk %}"><button type="button" class="btn btn-default"><i class="fas fa-trash-alt"></i> Löschen</button> </a></td>
     </tr>
     {% endfor %}
 
+  </table>
+  <a href="{% url 'product-detail-type' pk=product.pk type=product.type %}"> <input class="btn  mybtn border-thin" value="Show Site"></a>
+</div>
 
-
-
- </table>
-    <a href="{% url 'product-detail-type' pk=product.pk type=product.type %}">  <input  class="btn  mybtn border-thin" value="Show Site"></a>
-</div >
-
- <div class="">
+<div class="">
   &nbsp;
 </div>
 
-
 <div class="container-fluid">
 
-    <h4 style="margin-top: 10px">Laden Sie neue Medien hoch</h4>
-    {% if warning%}
-<div class="alert alert-danger rounded-0" role="alert">
-  {{warning}}
-</div>
-{% endif %}
-    <p style="margin-top: 10px">Bitte laden Sie nicht mehr als sieben Bilder und zwei Videos hoch.</p>
-    <p style="margin-top: 10px">Für eine optimale Darstellung sollten die Bilder eine Auflösung von 1920x1080 bzw. eine Seitenverhältnis von 16:9 (FullHD) haben.</p>
-
-    {% if video_count and media_count%}
-    <p style="margin-top: 10px">Sie haben zu viele Medienelemente hochgeladen. Sie können Medien löschen, um sie erneut hochzuladen.</p>
-    {% elif video_count%}
-    <p style="margin-top: 10px">Sie haben zu viele Videos hochgeladen. Stellen Sie sicher, dass Sie nur Fotos hochladen.</p>
-
-
- <link rel="stylesheet" href="{% static "ajaxuploader/css/fileuploader.css" %}">
-
-   <script src="{% static "jquery/dist/jquery.js" %}"></script>
-        <script src="{% static "ajaxuploader/js/fileuploader.js" %}"></script>
-        <script src="{% static "file_form/file_form.js" %}"></script>
-        <script>
-            $(function() {
-                initUploadFields($('#upload_mab'));
-            });
-        </script>
-
-
-<form id='upload_mab' enctype="multipart/form-data" method="post">
+  <h4 style="margin-top: 10px">Laden Sie neue Medien hoch</h4>
+
+  {% if warning%}
+  <div class="alert alert-danger rounded-0" role="alert">
+    {{warning}}
+  </div>
+  {% endif %}
+
+  <p style="margin-top: 10px">Bitte laden Sie nicht mehr als sieben Bilder und zwei Videos hoch.</p>
+  <p style="margin-top: 10px">Für eine optimale Darstellung sollten die Bilder eine Auflösung von 1920x1080 bzw. eine Seitenverhältnis von 16:9 (FullHD) haben.</p>
+
+  {% if video_count and media_count%}
+  <p style="margin-top: 10px">Sie haben zu viele Medienelemente hochgeladen. Sie können Medien löschen, um sie erneut hochzuladen.</p>
+  {% elif video_count%}
+  <p style="margin-top: 10px">Sie haben zu viele Videos hochgeladen. Stellen Sie sicher, dass Sie nur Fotos hochladen.</p>
+  <link rel="stylesheet" href="{% static "ajaxuploader/css/fileuploader.css" %}">
+  <script src="{% static "jquery/dist/jquery.js" %}"></script>
+  <script src="{% static "ajaxuploader/js/fileuploader.js" %}"></script>
+  <script src="{% static "file_form/file_form.js" %}"></script>
+  <script>
+    $(function() {
+      initUploadFields($('#upload_mab'));
+    });
+  </script>
+
+
+  <form id='upload_mab' enctype="multipart/form-data" method="post">
     {% csrf_token %}
 
-     <div class="col-sm-10">
-         {% crispy media %}
+    <div class="col-sm-10">
+      {% crispy media %}
 
-         {% include 'django_file_form/upload_template.html' %}
-        </div>
-     <div class="col-sm-10">
+      {% include 'django_file_form/upload_template.html' %}
+    </div>
+    <div class="col-sm-10">
 
-        <div class="buttonHolder">
-        <input type="submit" name="add" class="btn  mybtn border-thin" value="Medien hinzufügen" >
-        </div>
+      <div class="buttonHolder">
+        <input type="submit" name="add" class="btn  mybtn border-thin" value="Medien hinzufügen">
+      </div>
     </div>
 
-</form>
+  </form>
 
-       {% elif media_count%}
-    <p style="margin-top: 10px">Sie haben zu viele Fotos hochgeladen. Stellen Sie sicher, dass Sie nur Videos hochladen.</p>
-    <link rel="stylesheet" href="{% static "ajaxuploader/css/fileuploader.css" %}">
+  {% elif media_count%}
+  <p style="margin-top: 10px">Sie haben zu viele Fotos hochgeladen. Stellen Sie sicher, dass Sie nur Videos hochladen.</p>
+  <link rel="stylesheet" href="{% static "ajaxuploader/css/fileuploader.css" %}">
 
-   <script src="{% static "jquery/dist/jquery.js" %}"></script>
-        <script src="{% static "ajaxuploader/js/fileuploader.js" %}"></script>
-        <script src="{% static "file_form/file_form.js" %}"></script>
-        <script>
-            $(function() {
-                initUploadFields($('#upload_mab'));
-            });
-        </script>
+  <script src="{% static "jquery/dist/jquery.js" %}"></script>
+  <script src="{% static "ajaxuploader/js/fileuploader.js" %}"></script>
+  <script src="{% static "file_form/file_form.js" %}"></script>
+  <script>
+    $(function() {
+      initUploadFields($('#upload_mab'));
+    });
+  </script>
 
 
-<form id='upload_mab' enctype="multipart/form-data" method="post">
+  <form id='upload_mab' enctype="multipart/form-data" method="post">
     {% csrf_token %}
 
-     <div class="col-sm-10">
-         {% crispy media %}
+    <div class="col-sm-10">
+      {% crispy media %}
 
-         {% include 'django_file_form/upload_template.html' %}
-        </div>
-     <div class="col-sm-10">
+      {% include 'django_file_form/upload_template.html' %}
+    </div>
+    <div class="col-sm-10">
 
-        <div class="buttonHolder">
-        <input type="submit" name="add" class="btn  mybtn border-thin" value="Medien hinzufügen" >
-        </div>
+      <div class="buttonHolder">
+        <input type="submit" name="add" class="btn  mybtn border-thin" value="Medien hinzufügen">
+      </div>
     </div>
 
-</form>
-               {% else %}
+  </form>
+  {% else %}
 
-      <link rel="stylesheet" href="{% static "ajaxuploader/css/fileuploader.css" %}">
+  <link rel="stylesheet" href="{% static "ajaxuploader/css/fileuploader.css" %}">
 
-   <script src="{% static "jquery/dist/jquery.js" %}"></script>
-        <script src="{% static "ajaxuploader/js/fileuploader.js" %}"></script>
-        <script src="{% static "file_form/file_form.js" %}"></script>
-        <script>
-            $(function() {
-                initUploadFields($('#upload_mab'));
-            });
-        </script>
+  <script src="{% static "jquery/dist/jquery.js" %}"></script>
+  <script src="{% static "ajaxuploader/js/fileuploader.js" %}"></script>
+  <script src="{% static "file_form/file_form.js" %}"></script>
+  <script>
+    $(function() {
+      initUploadFields($('#upload_mab'));
+    });
+  </script>
 
 
-<form id='upload_mab' enctype="multipart/form-data" method="post">
+  <form id='upload_mab' enctype="multipart/form-data" method="post">
     {% csrf_token %}
 
-     <div class="col-sm-10">
-         {% crispy media %}
+    <div class="col-sm-10">
+      {% crispy media %}
 
-         {% include 'django_file_form/upload_template.html' %}
-        </div>
-     <div class="col-sm-10">
+      {% include 'django_file_form/upload_template.html' %}
+    </div>
+    <div class="col-sm-10">
 
-        <div class="buttonHolder">
-        <input type="submit" name="add" class="btn  mybtn border-thin" value="Medien hinzufügen" >
-        </div>
+      <div class="buttonHolder">
+        <input type="submit" name="add" class="btn  mybtn border-thin" value="Medien hinzufügen">
+      </div>
     </div>
 
-</form>
+  </form>
 
 
-           {% endif %}
+  {% endif %}
 
-    </div>
+</div>
 
 <div class="">
   &nbsp;

marktplatz/templates/marktplatz/modal-share.html

@@ -22,16 +22,11 @@
 
         <div class="row">
           <div class="col-sm-4">
-
             <div class="cursor-pointer" onclick="">
-
               <a href="mailto:{{ object.email |obfuscate }}?subject={{  product.wohnprojekt  }}&body=Guten%20Tag!%0D%0A%0D%0AIch%20finde%20das%20folgende%20Projekt%20sehr%20interesant!%0D%0A%0D%0A{% fullurl 'product-detail-embed' pk=object.pk %}"><i class="fas fa-envelope"></i> <br>Send mail</a>
-
             </div>
-
           </div>
           <div class="col-sm-4">
-
           </div>
           <div class="col-sm-4">
           </div>
@@ -39,9 +34,6 @@
         <div class=""> &nbsp; </div>
         <div class=""> &nbsp; </div>
 
-
-
-
         <input type="text" value="&lt;iframe src=&quot;{% fullurl 'product-detail-embed' pk=object.pk %}&quot; style=&quot;border:0px #ffffff none;&quot; name=&quot;myiFrame&quot; scrolling=&quot;yes&quot; frameborder=&quot;0&quot; marginheight=&quot;0px&quot; marginwidth=&quot;0px&quot; height=&quot;400px&quot; width=&quot;600px&quot; allowfullscreen&gt;&lt;/iframe&gt;" id="iframecode">
         <div class="cursor-pointer" onclick = "function copyiframecode() {
               var copyText = document.getElementById('iframecode');
@@ -70,6 +62,5 @@
           <span>Code Kopieren</span>
         </div>
         <div class=""> &nbsp; </div><div class=""> &nbsp; </div>
-
       </div>
     </div>

marktplatz/templates/marktplatz/product_overview.html

@@ -276,7 +276,10 @@ $(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>
+
+      {% if urbanem %}
       <button class="border-thin mybtn btn-toggle urbanem_true" data-toggler='urbanem_true' style="margin-bottom: 2px; " style="">#Urbane Mischung</button>
+      {% endif %}
       <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>
 
@@ -342,6 +345,7 @@ $(document).ready(function(){
 
   {% for product in object_list %}
 
+
     <!-- rounded-0 border-0 -->
     <div
       class="card  {{product.ort}} {{product.status}} {{product.frei}} {{product.altneu}} {% for key in product.raumangebot %}{{key}} {% endfor %} {% if product.realitylab %}begleitet_true{% endif %} {% if product.urbanem %}urbanem_true{% endif %} {% if product.frei == 'JAJA' %} mab-card-container-highlight {% endif %}   ">
@@ -374,7 +378,10 @@ $(document).ready(function(){
                 <button id='product_{{product.pk}}_{{product.frei}}' data-toggler='{{product.frei}}' class="border-thin mybtn btn-toggle {{product.frei}}" style="">#{{product.get_frei_display}}</button>
                 <button id='product_{{product.pk}}_{{product.status}}' data-toggler='{{product.status}}' class="border-thin mybtn btn-toggle {{product.status}}" style="">#{{product.get_status_display}}</button>
                 <button id='product_{{product.pk}}_{{product.ort}}' data-toggler='{{product.ort}}' class="border-thin mybtn btn-toggle {{product.ort}}" style="">#{{product.get_ort_display}}</button>
+
+                {% if product.altneu %}
                 <button id='product_{{product.pk}}_{{product.altneu}}' data-toggler='{{product.altneu}}' class="border-thin mybtn btn-toggle {{product.altneu}}" style="">#{{product.get_altneu_display}}</button>
+                {% endif %}
 
                 {% for key in product.raumangebot %}
                 <button class="border-thin mybtn btn-toggle {{key}}" data-toggler='{{key}}' style="margin-bottom: 2px; ">#{{ product.raumangebot.choices|get_item:key}}</button>

marktplatz/urls.py

@@ -22,10 +22,13 @@ urlpatterns = [
     path('products-list/embed', views.ProductsListView.as_view(  embed=True,  ), name='products-list-embed'),
 
     # OVERVIEW (LISTVIEW)
+    path('projekte/',            views.ProductsView.as_view(), name='products'),
     path('wohnprojekte/',        views.WohnprojekteView.as_view(),          name='wohnprojekte-list'),
     path('mobilitaetsprojekte/', views.MobilitaetsProjekteView.as_view(),   name='mobilitaetsprojekte-list'),
     path('ernaerungsprojekte/',  views.ErnaerungsProjekteView.as_view(),    name='ernaerungsprojekte-list'),
     path('energieprojekte/',     views.EnergyProjekteView.as_view(),        name='energieprojekte-list'),
+
+    path('projekte/urbanem/', views.UrbanemProductsView.as_view(), name='products-filter-view'),
     # path('wohnprojekte/', views.WohnProjekteView.as_view(), name='wohnprojekte-list'),
 
     # CREATE
@@ -62,8 +65,6 @@ urlpatterns = [
     path('projekte/<slug:type>/search', views.GenericSearchView.as_view(), name='generic-search-products'),
     path('projekte/search', views.SearchProductsView.as_view(), name='search-products'),
         # - FILTERS
-    path('projekte/', views.ProductsView.as_view(), name='products'),
-    path('projekte/urbanem/', views.UrbanemProductsView.as_view(), name='products-filter-view'),
     path('projekte/filter/<slug:filter>/', views.FilterProductsView.as_view(), name='products-filter-view'),
 
 

marktplatz/views.py

@@ -341,10 +341,15 @@ class ProductsView(generic.ListView):
         context = super().get_context_data(**kwargs)
 
         orts = {}
+        urbanem = False
         for product in context['object_list']:
             if not product.ort in orts:
                 orts[product.ort] = product.get_ort_display()
+            if hasattr(product, "urbanem"):
+                urbanem = True
+
         context['ort_dict'] = orts
+        context['urbanem'] = urbanem
 
         context['user'] = self.request.user
         context['frei_list'] = Product.FREI
@@ -1199,24 +1204,6 @@ handle_upload = FileFormUploader()
 
 
 
-# class MediaView(LoginRequiredMixin, TemplateView):
-#     template_name = 'marktplatz/media_overview.html'
-#
-#     def get(self, request, pk):
-#         self.user = self.request.user
-#         user= self.user
-#         contact = Contact.objects.get(user=user)
-#         if not Product.objects.filter(contact=contact).filter(pk=pk).exists():
-#             raise Http404
-#
-#         context = request.GET.dict()
-#         contact = Contact.objects.get(user=self.request.user)
-#         product = get_object_or_404(Product, (Q(pk = pk) & Q(contact = contact)))
-#         context['product'] = product
-#         context['media'] = Media.objects.filter(product=product)
-#         context['video'] = Video.objects.filter(product=product)
-#         return render(request, self.template_name, context)
-
 
 
 def delete_media(request, pk):

project_base/templates/base_generic.html

@@ -452,22 +452,9 @@
 
 
 
-<!-- Matomo -->
+
 <script>
-  /*
-  var _paq = _paq || [];
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://piwik.juan-carlos.info/";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
-    _paq.push(['setSiteId', '4']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-  })();
-  */
 </script>
-<!-- End Matomo Code -->
 
 </body>