better menus

marktplatz/templates/marktplatz/product_overview.html

@@ -327,8 +327,6 @@ $(document).ready(function(){
     <span class="mybtn"></span> Alle Tags anzeigen ⋁
   </button>
 
-
-
   <div class="row border-dark collapse navbar-collapse tag-line" id="tags">
 
     <div class="container-fluid">
@@ -353,11 +351,9 @@ $(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 " style="margin-bottom: 2px; ">{% include "marktplatz/modal-sa.html" %}</button>
 
-
     </div>
   </div>
 
-
   <div class="row border-dark " id="search_bar">
     <div class="container-fluid">
       <div class="row">
@@ -411,76 +407,76 @@ $(document).ready(function(){
 
   {% for product in wohnprojekt_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.mitmachen %}begleitet_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">
-      <!--  -->
-      <div class="mab-card {{product.ort}} {{product.status}} {{product.frei}} {{product.altneu}}   {% if product.frei == 'JAJA' %} mab-card-highlight {% endif %}" style="">
-        <a href="{% url 'product-detail' product.pk %}">
-          <div style="position: relative;text-align: center;">
-            <img class="{% if user.is_authenticated %}{% get_vote_class product user %} {% endif %} {% for category in product.category.all %} {{category.short_name}} {% endfor %} card-img-top" data-otherclass="rounded-0"
-              src="{{product.media_set.first.image_norm.url}}" alt="image">
-            <div class="mab-product-title" style=""><span>{{product.name }}</span></div>
-
-            {% if product.frei == 'JAJA' %} <div class="mab-product-button" style="">
-              <div class="mab-product-button-text">
-                Wohnung Frei!
+    <!-- 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 %}   ">
+      <div id="product_{{product.pk}}_card" class="flipcard">
+        <div class="mab-card-face mab-card-face--front toogle-overflow">
+          <!--  -->
+          <div class="mab-card {{product.ort}} {{product.status}} {{product.frei}} {{product.altneu}}   {% if product.frei == 'JAJA' %} mab-card-highlight {% endif %}" style="">
+            <a href="{% url 'product-detail' product.pk %}">
+              <div style="position: relative;text-align: center;">
+                <img class="{% if user.is_authenticated %}{% get_vote_class product user %} {% endif %} {% for category in product.category.all %} {{category.short_name}} {% endfor %} card-img-top" data-otherclass="rounded-0"
+                  src="{{product.media_set.first.image_norm.url}}" alt="image">
+                <div class="mab-product-title" style=""><span>{{product.name }}</span></div>
+
+                {% if product.frei == 'JAJA' %} <div class="mab-product-button" style="">
+                  <div class="mab-product-button-text">
+                    Wohnung Frei!
+                  </div>
+                </div>
+                {% endif %}
+
               </div>
+            </a>
+            <div class="card-body mab-card-body " style="">
+              <!--<div class="border-0 d-flex justify-content">
+          <p class="card-title" style="margin-bottom: 3px"><a href="{% url 'product-detail' product.pk %}"> {{product.header }} </a></p>
+
+        </div>-->
+
+              <p class="mab-card-text card-text" style="">
+                {% if request.user_agent.browser.family != 'Safari'  %}
+                <button id='product_{{product.pk}}_flipper' onclick="" class="border-thin mybtn flipper" data-flip-card="product_{{product.pk}}_card" style=""><i class="fas fa-sync-alt"></i> Steckbrief</button>
+                {% endif %}
+                <!-- <button id='product_{{product.pk}}_teilen' onclick="location.href = '{% url 'product-detail-card-embed' pk=product.pk %}'" class="border-thin mybtn" style=""><i class="fas fa-share"></i> Teilen</button> -->
+                <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>
+                <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>
+
+                {% 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>
+                {% endfor %}
+
+                {% for key, value in product.raumangebot.field.choices %}
+                <button class="border-thin mybtn btn-toggle {{key}}" data-toggler='{{key}}' style="margin-bottom: 2px; ">#{{value}}</button>
+                {% endfor %}
+
+                {% 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 %}
+                <!-- <button  class="show-all border-thin mybtn " style="margin-bottom: 2px; ">#Alle anzeigen</button> -->
+                <!-- <span id="ShareButton" class="cursor-pointer" > Teilen</span>  -->
+              </p>
             </div>
-            {% endif %}
-
           </div>
-        </a>
-        <div class="card-body mab-card-body " style="">
-          <!--<div class="border-0 d-flex justify-content">
-        <p class="card-title" style="margin-bottom: 3px"><a href="{% url 'product-detail' product.pk %}"> {{product.header }} </a></p>
-
-      </div>-->
-
-          <p class="mab-card-text card-text" style="">
-            {% if request.user_agent.browser.family != 'Safari'  %}
-            <button id='product_{{product.pk}}_flipper' onclick="" class="border-thin mybtn flipper" data-flip-card="product_{{product.pk}}_card" style=""><i class="fas fa-sync-alt"></i> Steckbrief</button>
-            {% endif %}
-            <!-- <button id='product_{{product.pk}}_teilen' onclick="location.href = '{% url 'product-detail-card-embed' pk=product.pk %}'" class="border-thin mybtn" style=""><i class="fas fa-share"></i> Teilen</button> -->
-            <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>
-            <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>
-
-
-
-
-            {% 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>
-            {% endfor %}
-
-            {% for key, value in product.raumangebot.field.choices %}
-            <button class="border-thin mybtn btn-toggle {{key}}" data-toggler='{{key}}' style="margin-bottom: 2px; ">#{{value}}</button>
-            {% endfor %}
-
-            {% 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 %}
-            <!-- <button  class="show-all border-thin mybtn " style="margin-bottom: 2px; ">#Alle anzeigen</button> -->
-            <!-- <span id="ShareButton" class="cursor-pointer" > Teilen</span>  -->
-          </p>
         </div>
-      </div>
-    </div>
 
-     <!-- BACKFACE BACKFACE BACKFACE BACKFACE BACKFACE BACKFACE BACKFACE -->
+        <!-- BACKFACE BACKFACE BACKFACE BACKFACE BACKFACE BACKFACE BACKFACE -->
 
-     {% if request.user_agent.browser.family != 'Safari'  %}
+        {% if request.user_agent.browser.family != 'Safari'  %}
 
-    <div class="mab-card-face mab-card-face--back">
-      <div class="mab-card  {% if product.frei == 'JAJA' %} {% endif %}">
+        <div class="mab-card-face mab-card-face--back">
+          <div class="mab-card  {% if product.frei == 'JAJA' %} {% endif %}">
 
-        <div class="container flipper-wrapper" data-flip-card="product_{{product.pk}}_card">
-            <div class="row">
+            <div class="container flipper-wrapper" data-flip-card="product_{{product.pk}}_card">
+              <div class="row">
                 <div class="col-sm-12">
                   <br>
-                  <div class="" style=""><h3>  {{ product.name }}</h3></div>
+                  <div class="" style="">
+                    <h3> {{ product.name }}</h3>
+                  </div>
                   <button id='product_{{product.pk}}_flipper_back' onclick="" class="border-thin mybtn " data-flip-card="product_{{product.pk}}_card" style=""><i class="fas fa-sync-alt"></i> Steckbrief</button>
                   <div class="" style=""><span>{{ product.beschreibung }}</span></div>
                   <div class="" style=""><strong>Wohnungen:</strong> <span>{{ product.awohnungen }}</span></div>
@@ -490,32 +486,29 @@ $(document).ready(function(){
                   <span></span>
 
                 </div>
+              </div>
             </div>
-        </div>
-
-        <a href="{% url 'product-detail' product.pk %}">
-          <div style="position: relative;text-align: center;">
-
-            &nbsp;
 
-          </div>
-        </a>
-        <div class="card-body mab-card-body " style="">
-          &nbsp;
-        </div>
+            <a href="{% url 'product-detail' product.pk %}">
+              <div style="position: relative;text-align: center;">
 
-      </div>
-    </div>  <!-- BACKFACE -->
-
-    {% endif %}
+                &nbsp;
 
-  </div>
-  </div>
+              </div>
+            </a>
+            <div class="card-body mab-card-body " style="">
+              &nbsp;
+            </div>
 
-    {% endfor %}
+          </div>
+        </div> <!-- BACKFACE -->
 
+        {% endif %}
 
+      </div>
+    </div>
 
+  {% endfor %}
 
   {{sponsor_cards|safe}}
 
@@ -542,7 +535,6 @@ $(document).ready(function(){
   });
 
 </script>
-
 {% endif %}
 
 </div>

marktplatz/views.py

@@ -453,42 +453,57 @@ class ProductsListView(generic.ListView):
     template_name='marktplatz/product_list.html'
     embed = False
 
+    def get_queryset(self):
+        # original qs
+        qs = super().get_queryset()
+
+        self.user = self.request.user
+        user = self.user
+
+        if user.is_superuser:
+            return qs
+
+        qs = qs.filter(public = True)
+
+        return qs
+
+
     def get_context_data(self, **kwargs):
 
         if self.embed :
             kwargs['embed']  = True
         return super().get_context_data(**kwargs)
 
-    def post(self, request, *args, **kwargs):
-        # print (request.POST.dict())
-        context = request.POST.dict()
-        public = {k: v for k, v in context.items() if k.startswith('product_p')}
-
-        for elemk in public:
-            # print(elemk + " -  " + public[elemk] )
-            keys = elemk.split(".")
-            current_product = Product.objects.get(pk=keys[1])
-            if public[elemk] == 'true':
-                current_product.public = True
-                current_product.save()
-            else:
-                current_product.public = False
-                current_product.save()
-
-        edit = {k: v for k, v in context.items() if k.startswith('product_e')}
-        # print (edit)
-        for elemk in edit:
-            # print(elemk + " -  " + edit[elemk] )
-            keys = elemk.split(".")
-            current_product = Product.objects.get(pk=keys[1])
-            if edit[elemk] == 'true':
-                current_product.edit = True
-                current_product.save()
-            else:
-                current_product.edit = False
-                current_product.save()
-
-        return HttpResponseRedirect('')
+    # def post(self, request, *args, **kwargs):
+    #     # print (request.POST.dict())
+    #     context = request.POST.dict()
+    #     public = {k: v for k, v in context.items() if k.startswith('product_p')}
+    #
+    #     for elemk in public:
+    #         # print(elemk + " -  " + public[elemk] )
+    #         keys = elemk.split(".")
+    #         current_product = Product.objects.get(pk=keys[1])
+    #         if public[elemk] == 'true':
+    #             current_product.public = True
+    #             current_product.save()
+    #         else:
+    #             current_product.public = False
+    #             current_product.save()
+    #
+    #     edit = {k: v for k, v in context.items() if k.startswith('product_e')}
+    #     # print (edit)
+    #     for elemk in edit:
+    #         # print(elemk + " -  " + edit[elemk] )
+    #         keys = elemk.split(".")
+    #         current_product = Product.objects.get(pk=keys[1])
+    #         if edit[elemk] == 'true':
+    #             current_product.edit = True
+    #             current_product.save()
+    #         else:
+    #             current_product.edit = False
+    #             current_product.save()
+    #
+    #     return HttpResponseRedirect('')
 
 
 

project_base/templates/base_generic.html

@@ -202,11 +202,24 @@
 
       </div>
     </li>
+    <li class="nav-item">
+      <div class="mab-nav-fix">
+        <a class=" nav-link active nav-right boldkur mab-menu-elm" style="" href="{% url 'my-products' %}">Meine Projekte</a>
+      </div>
+    </li>
+
+      {% if request.user.is_superuser %}
+      <li class="nav-item">
+        <div class="mab-nav-fix">
+          <a class=" nav-link active nav-right boldkur mab-menu-elm" style="" href="{% url 'admin-panel' %}">Admin Panel</a>
+        </div>
+      </li>
+      {% endif %}
+
     {% else %}
     <li class="nav-item">
       <div class="mab-nav-fix">
         <a class=" nav-link active nav-right boldkur mab-menu-elm " style="" href="{% url 'mab_login' %}">Einloggen</a>
-
       </div>
     </li>
     {% endif %}
@@ -267,7 +280,7 @@
         <a class="nav-link " href="#">Mobility</a>
       </li> -->
       <li class="nav-item">
-        <a class="nav-link " href="#">Wohnen</a>
+        <a class="nav-link " href="{% url 'products-list' %}">Wohnen</a>
       </li>
     </ul>