search agent, admin backend

marktplatz/admin.py

@@ -1,14 +1,18 @@
 from django.contrib import admin
 
 # Register your models here.
-from .models import Product, Media, Link, Contact, Interaction, Vote, Video, Category
+from .models import *
 
 admin.site.register(Product)
+admin.site.register(SearchAgent)
+admin.site.register(Wohnprojekt)
+
 # admin.site.register(Description)
 admin.site.register(Media)
 # admin.site.register(Link)
 # admin.site.register(Credit)
 admin.site.register(Contact)
+
 admin.site.register(Interaction)
 admin.site.register(Vote)
 admin.site.register(Video)

marktplatz/templates/marktplatz/generic-test.html

@@ -0,0 +1,20 @@
+{% extends "base_generic.html" %}
+{% load static %}
+
+{% block content %}
+<div class="container" style="margin-top: 20px">
+
+  {{ about_text | safe}}
+
+  {{ object.bautraeger }}
+
+  {{ object }}
+
+  {% if context %}
+  {{ context | safe}}
+
+  {% endif %}
+
+</div>
+
+{% endblock %}

marktplatz/templates/marktplatz/generic.html

@@ -4,16 +4,11 @@
 {% block content %}
 <div class="container" style="margin-top: 20px">
 
-{{ about_text | safe}}
 
-{{ object.bautraeger }}
+{{ content_a | safe }}
+{{ content_b | safe }}
+{{ content_c | safe }}
 
-{{ object }}
-
-{% if context %}
-{{ context | safe}}
-
-{% endif %}
 
 </div>
 

marktplatz/templates/marktplatz/modal-sa.html

@@ -38,7 +38,7 @@
 
 
     <!-- Trigger/Open The Modal -->
-    <span id="myBtn" ><i  class="fas fa-bell"></i> Suchagent aktivieren</span>
+    <span id="myBtn" class="cursor-pointer"><i  class="fas fa-bell"></i> Suchagent aktivieren</span>
 
     <!-- The Modal -->
     <div id="SearchAgentModal" class="modal">

marktplatz/templates/marktplatz/modal-share.html

@@ -38,11 +38,12 @@
       text-decoration: none;
       cursor: pointer;
     }
+
     </style>
 
 
     <!-- Trigger/Open The Modal -->
-    <span id="ShareButton" ><i class="fas fa-share"></i> Teilen</span>
+    <span id="ShareButton" class="cursor-pointer" ><i class="fas fa-share"></i> Teilen</span>
 
     <!-- The Modal -->
     <div id="ShareModal" class="modal">
@@ -51,19 +52,24 @@
         <span id="ShareClose" class="close">&times;</span>
 
         <div class=""> &nbsp; </div>
-        <i class="fas fa-share"></i> Teilen
+        <i class="fas fa-share"></i>
+        <h3>Teilen</h3>
         <div class=""> &nbsp; </div>
         <div class=""> &nbsp; </div>
 
         <div class="row">
           <div class="col-sm-4">
+            <div class="cursor-pointer" onclick="myFunction()">
 
             <i class="fas fa-code"></i> <br>
-            <span onclick="myFunction()">Text Kopieren</span>
+            <span>Text Kopieren</span>
+          </div>
           </div>
             <div class="col-sm-4">
-              <i class="fas fa-envelope"></i> <br>
-              <a href="mailto:?subject={{  product.wohnprojekt  }}&body=Guten%20Tag!%0D%0A%0D%0AIch%20finde%20das%20folgendes%20Projekt%20sehr%20interesant!%0D%0A%0D%0A{% fullurl 'product-detail-embed' pk=product.wohnprojekt.pk %}">Send mail</a>
+              <div class="cursor-pointer" onclick="myFunction()">
+
+              <a href="mailto:?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=product.wohnprojekt.pk %}"><i class="fas fa-envelope"></i> <br>Send mail</a>
+            </div>
             </div>
             <div class="col-sm-4"></div>
         </div>
@@ -72,10 +78,8 @@
         <div class=""> &nbsp; </div>
 
         <input type="text" value="{% fullurl 'product-detail-embed' pk=product.wohnprojekt.pk %}" id="myInput">
-
         <div class=""> &nbsp; </div><div class=""> &nbsp; </div>
 
-
       </div>
     </div>
 

marktplatz/templates/marktplatz/product_detail.html

@@ -65,7 +65,7 @@
 					<div class="row">
 						<div class="col-sm-4">{% include "marktplatz/modal-share.html" %}</div>
 							<div class="col-sm-4"> {% include "marktplatz/modal-sa.html" %}</div>
-			        <div class="col-sm-4">{% if product.wohnprojekt.email  %} <a href="mailto:{{  product.wohnprojekt.email  }}"><i class="fas fa-envelope"></i> {{  product.wohnprojekt.email  }}</a> {% endif %} </div>
+			        <div class="col-sm-4">{% if product.wohnprojekt.email  %} <a href="mailto:{{  product.wohnprojekt.email  }}" class="text-decoration-none" ><i class="fas fa-envelope"></i> {{  product.wohnprojekt.email  }}</a> {% endif %} </div>
 			    </div>
 
 					<div class="">

marktplatz/templates/marktplatz/product_overview.html

@@ -191,35 +191,52 @@ $(document).ready(function(){
 {% block content %}
 
 <nav class="navbar-expand-sm tag" style="margin-left: 0px">
+
+
+  <div class="row border-dark " id="search_bar">
+    <div class="container-fluid">
+  <input type="search" id="site-search" name="q" aria-label="Suche">
+
+    {% include "marktplatz/modal-sa.html" %}
+  </div>
+</div>
+<div class="">
+  &nbsp;
+</div>
+
   <button class="navbar-toggler border-thin mybtn rounded-0 tag navbar-expand-sm " type="button" data-toggle="collapse" data-target="#tags" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle tags" style="font-size: 15px">
     <span class="mybtn"></span> Show All Tags ⋁
   </button>
+
+
+
   <div class="row border-dark collapse navbar-collapse" id="tags">
+
+
     <div class="container-fluid">
       <button id='show' class="border-thin mybtn " style="margin-right: 2px;margin-bottom: 2px">#Show All</button>
-      {% if user.is_authenticated %}
-      <button id='vote' class="border-thin mybtn " style="margin-right: 2px;margin-bottom: 2px">#Not Voted</button>
-      {% endif %}
 
 
-        {% for elem in frei_list %}
-                    <button id='{{elem.0}}' toggler='{{elem.0}}' class="border-thin mybtn btn-toggle elem.0" style="margin-right: 2px;margin-bottom: 2px" >#{{elem.1}}</button>
-        {% endfor %}
 
+      {% for elem in frei_list %}
+      <button id='{{elem.0}}' toggler='{{elem.0}}' class="border-thin mybtn btn-toggle elem.0" style="margin-right: 2px;margin-bottom: 2px">#{{elem.1}}</button>
+      {% endfor %}
 
 
-        {% for key, value in ort_dict.items %}
-        <button class="border-thin mybtn btn-toggle {{key}}"  toggler='{{key}}' style="margin-right: 2px;margin-bottom: 2px" >#{{value}}</button>
-        {% endfor %}
 
-        {% for elem in altneu_list %}
-        <button class="border-thin mybtn btn-toggle {{elem.0}}"  toggler='{{elem.0}}' style="margin-right: 2px;margin-bottom: 2px" >#{{elem.1}}</button>
-        {% endfor %}
+      {% for key, value in ort_dict.items %}
+      <button class="border-thin mybtn btn-toggle {{key}}" toggler='{{key}}' style="margin-right: 2px;margin-bottom: 2px">#{{value}}</button>
+      {% endfor %}
 
+      {% for elem in altneu_list %}
+      <button class="border-thin mybtn btn-toggle {{elem.0}}" toggler='{{elem.0}}' style="margin-right: 2px;margin-bottom: 2px">#{{elem.1}}</button>
+      {% endfor %}
 
 
-      </div>
-</div>
+
+    </div>
+  </div>
+
 
 </nav>
 

marktplatz/urls.py

@@ -3,7 +3,7 @@ from . import views
 from .views import *
 from django.conf import settings
 from django.conf.urls.static import static
-from django.views.generic import RedirectView
+from django.views.generic import RedirectView, TemplateView
 from django.conf.urls import url, include
 
 urlpatterns = [
@@ -21,9 +21,10 @@ urlpatterns = [
     path('register/', views.registerView.as_view(), name='register-view'),
     path('addProduct/', views.NewWohnprojektView.as_view(), name='new-submit-view'),
     path('myProducts/', views.UsersProducts.as_view(), name='my-products'),
-    path('generic/', views.genericView.as_view(), name='generic'),
     path('editProduct/<int:pk>', views.EditView.as_view(), name='edit-product'),
     path('addImage/<int:pk>', views.uploadView.as_view(), name='add-Image'),
+    path('generic-test/', views.genericView.as_view(), name='generic-test'),
+    path('generic/', TemplateView.as_view(template_name="marktplatz/generic.html"), name='generic'),
     path('images/<int:pk>', views.MediaView.as_view(), name='media-overview'),
     url(r'^delete_media/(?P<pk>\d+)/$', views.delete_media, name='delete-media'),
     url(r'^delete_video/(?P<pk>\d+)/$', views.delete_video, name='delete-video'),

marktplatz/views.py

@@ -90,7 +90,7 @@ class SearchAgentCreate(CreateView):
     model = SearchAgent
     template_name =  'marktplatz/form.html'
     fields =  'ort', 'email'
-    success_url = reverse_lazy('products')
+    success_url = reverse_lazy('generic')
     embed = False
 
 
@@ -98,9 +98,18 @@ class SearchAgentCreate(CreateView):
             if self.embed :
                 kwargs['embed']       = True
                 kwargs['form_content']       = '<i  class="fas fa-bell"></i> Suchagent einrichten'
+                kwargs['content_a']       = 'Sehr gut, Dein Suchagent wurde erstellt!'
             return super().get_context_data(**kwargs)
 
 
+    def form_valid(self, form):
+        # Instead of return this HttpResponseRedirect, return an
+        #  new rendered page
+        super().form_valid(form)
+        return render(self.request, 'marktplatz/generic.html',
+                      self.get_context_data(form=form))
+
+
 class SearchAgentDelete(DeleteView):
     model = SearchAgent
     template_name =  'marktplatz/form.html'

project_base/templates/base_generic.html

@@ -36,6 +36,14 @@
           box-shadow: 0 8px 4px -6px gray;
       }
 
+      .cursor-pointer {
+        cursor: pointer;
+      }
+
+      .text-decoration-none, .text-decoration-none:hover, .text-decoration-none a:hover{
+        text-decoration: none;
+      }
+
     </style>