jurysys > markplatz.

project > product

MAB18_site/settings.py

@@ -230,6 +230,7 @@ CONSTANCE_CONFIG = {
     'CURRENT_EVENT': ('MAB20', 'Filter for the projects that should be evaluated'),
     'INFO_TXT': (INFO_TXT, 'Text to help with the fill in the submitform'),
     'SUBMIT_TEXT': (SUBMIT_TEXT, 'Text to welcome to the submitpage'),
+    'ADMIN_EMAIL': ('juan@mediaarchitecture.org', 'Admin email'),
 }
 
 
@@ -242,7 +243,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'jurysys.apps.jurysysConfig',
+    'marktplatz',
     'constance',
     'constance.backends.database',
     'imagekit',

MAB18_site/urls.py

@@ -29,7 +29,7 @@ from .views import *
 urlpatterns = [
     path('admin/', admin.site.urls),
     url(r'^captcha/',  include('captcha.urls')),
-    path('mab/', include('jurysys.urls')),
+    path('mab/', include('marktplatz.urls')),
 
 
     path('login/',                   auth_views.LoginView.as_view(template_name="auth/login.html"), name='mab_login'),
@@ -56,7 +56,7 @@ urlpatterns = [
     path('reset/done/', auth_views.PasswordResetCompleteView.as_view(template_name="auth/password_reset_complete.html"), name='mab_password_reset_complete'),
     path('accounts/reset/done/', auth_views.PasswordResetCompleteView.as_view(template_name="auth/password_reset_complete.html"), name='password_reset_complete'),
 
-    #redirects to jurysys
+    #redirects to marktplatz
     path('', RedirectView.as_view(url='/mab/')),
 
     path('accounts/', include('django.contrib.auth.urls')),
@@ -65,7 +65,7 @@ urlpatterns = [
     #path('resetpwd/', auth_views.PasswordResetForm, name='password_reset'),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
-handler404 = 'jurysys.views.error_404_view'
+handler404 = 'marktplatz.views.error_404_view'
 
 # Use static() to add url mapping to serve static files during development (only)
 from django.conf import settings

jurysys/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class jurysysConfig(AppConfig):
-    name = 'jurysys'

jurysys/jsonmigrate.py

@@ -1,27 +0,0 @@
-import json
-from django.db import migration
-
-def parseData(key, value, apps, schema_editor, project):
-    if "City" in key:
-        project(city = value)
-    elif "Country" in key:
-        project(country = value)
-    elif "title" in key:
-        project(title = value)
-    elif "Owner" in key:
-        project(owner = value)
-    elif "Year" in key:
-        project(year = value)
-    elif "teaser" in key:
-        project(teaser_txt = value)
-    elif "heading" in key:
-        project(header = value)
-    elif "description" in key:
-        project(description= value)
-    elif "cid" in key:
-        project(class_cid = value)
-        project(cid = 2)
-        # need 2 parse to int project(cid =value[1:])
-    elif "category" in key:
-        project(category = value)
-

jurysys/admin.py → marktplatz/admin.py

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

marktplatz/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class marktplatzConfig(AppConfig):
+    name = 'marktplatz'

jurysys/forms.py → marktplatz/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 
 from django.conf import settings
-from .models import Contact, Project, Credit, Description, Interaction, Link, Media, Video
+from .models import Contact, Product, Credit, Description, Interaction, Link, Media, Video
 from django.contrib.auth.forms import UserCreationForm
 from django_file_form.forms import UploadedFileField, FileFormMixin, CharField, MultipleUploadedFileField
 from django.contrib.auth.models import User
@@ -56,7 +56,7 @@ class SubmissionForm(forms.ModelForm):
     terms = forms.BooleanField(required=True,  label= ('I accept and have read the Terms of Participation.'))
 
     class Meta:
-        model = Project
+        model = Product
         fields = ('title','country','city','year','owner','teaser_txt','header','category', 'description_txt', 'terms')
 
     def __init__(self,*args, **kwargs):
@@ -82,7 +82,7 @@ class SubmissionForm(forms.ModelForm):
        self.helper.form_tag = False
        self.helper.layout = Layout(
            Fieldset(
-               ('About your Project'),
+               ('About your Product'),
                'title',
                'header',
                'owner',
@@ -105,7 +105,7 @@ class CreditForm(forms.ModelForm):
         model = Credit
         fields = ('owner','architecture','concept','structural_engeneering','facade_design',
                     'face_construction','kinetic_design','light_design','tecnical_layout',
-                    'display_content','light_hardware','lightning_software','project_coordination',
+                    'display_content','light_hardware','lightning_software','Product_coordination',
                     'membrane_skin','interaction_design','sponsor','module_elems')
 
     def __init__(self, *args, **kwargs):
@@ -123,7 +123,7 @@ class CreditForm(forms.ModelForm):
         self.fields['display_content'].help_text = ('<i>e.g. Domenico Torrone;reality check, Munich;</i>')
         self.fields['light_hardware'].help_text = ('<i>e.g. Modul Labs, Berlin</i>')
         self.fields['lightning_software'].help_text = ('<i>e.g. Dimma DMX by Eflux</i>')
-        self.fields['project_coordination'].help_text = ('<i>e.g. Domenico Torrone and Partners</i>')
+        self.fields['Product_coordination'].help_text = ('<i>e.g. Domenico Torrone and Partners</i>')
         self.fields['membrane_skin'].help_text = ('<i>e.g. none</i>')
         self.fields['interaction_design'].help_text = ('<i>e.g. pixeldings, Toronto</i>')
         self.fields['sponsor'].help_text = ('<i>e.g. none</i>')
@@ -141,7 +141,7 @@ class CreditForm(forms.ModelForm):
         self.fields['display_content'].max_length = 100
         self.fields['light_hardware'].max_length = 100
         self.fields['lightning_software'].max_length = 100
-        self.fields['project_coordination'].max_length = 100
+        self.fields['Product_coordination'].max_length = 100
         self.fields['membrane_skin'].max_length = 100
         self.fields['interaction_design'].max_length = 100
         self.fields['sponsor'].max_length = 100
@@ -159,7 +159,7 @@ class CreditForm(forms.ModelForm):
                  Div( Div('kinetic_design',css_class='form-group col-md-5 mb-0'),  Div('light_design',css_class='form-group col-md-5 mb-0'), css_class='form-row'),
                  Div( Div('tecnical_layout',css_class='form-group col-md-5 mb-0'), Div('display_content',css_class='form-group col-md-5 mb-0'), css_class='form-row'),
                  Div( Div('light_hardware',css_class='form-group col-md-5 mb-0'),  Div('lightning_software',css_class='form-group col-md-5 mb-0'), css_class='form-row'),
-                 Div( Div('project_coordination',css_class='form-group col-md-5 mb-0'),  Div('membrane_skin',css_class='form-group col-md-5 mb-0'), css_class='form-row'),
+                 Div( Div('Product_coordination',css_class='form-group col-md-5 mb-0'),  Div('membrane_skin',css_class='form-group col-md-5 mb-0'), css_class='form-row'),
                  Div( Div('interaction_design',css_class='form-group col-md-5 mb-0'),  Div('sponsor',css_class='form-group col-md-5 mb-0'),  css_class='form-row'),
                 Div( Div( 'module_elems',css_class='form-group col-md-5 mb-0'),  css_class='form-row')
             ))
@@ -226,7 +226,7 @@ class LinkForm(forms.ModelForm):
     #        ))
 
 
-LinkFormSet = inlineformset_factory(Project,Link, fields = ['link_description','link'], form=LinkForm, extra=3, can_delete=False)
+LinkFormSet = inlineformset_factory(Product,Link, fields = ['link_description','link'], form=LinkForm, extra=3, can_delete=False)
 
 
 class FormsetHelper(FormHelper):
@@ -288,15 +288,15 @@ class MediaForm(FileFormMixin, forms.Form):
    #    return cleaned_data
 
 
-   #def save(self, project_pk):
+   #def save(self, Product_pk):
    #    self.clean()
    #    media = Media()
    #    print('hallo')
-   #    media.project= project_pk
+   #    media.Product= Product_pk
    #    media.image=self.cleaned_data['image']
    #    media.name_for=self.cleaned_data['name_for']
    #    media.copyright =self.cleaned_data['copyright']
-   #    media.project= project_pk
+   #    media.Product= Product_pk
    #    media.save()
 
    ##    self.delete_temporary_files()

jurysys/models.py → marktplatz/models.py

@@ -22,9 +22,9 @@ import datetime
 import shutil
 
 class Credit(models.Model):
-    owner = models.CharField(verbose_name='Building or project owner',blank=True,max_length = 300)
+    owner = models.CharField(verbose_name='Building or Product owner',blank=True,max_length = 300)
     architecture = models.CharField(verbose_name='Architecture',blank=True,max_length = 300)
-    concept = models.CharField(verbose_name='Project artist/ concept/ design/ planning',blank=True,max_length = 300)
+    concept = models.CharField(verbose_name='Product artist/ concept/ design/ planning',blank=True,max_length = 300)
     structural_engeneering = models.CharField(verbose_name='Structural engineering',blank=True,max_length = 300)
     facade_design = models.CharField(verbose_name='Facade design',blank=True,max_length = 300)
     face_construction = models.CharField(verbose_name='Facade construction',blank=True,max_length = 300)
@@ -34,10 +34,10 @@ class Credit(models.Model):
     display_content = models.CharField(verbose_name='Display content/ visuals/ showreel',blank = True,max_length = 300)
     light_hardware = models.CharField(verbose_name='Light hardware (LED hardware)',blank = True,max_length = 300)
     lightning_software = models.CharField(verbose_name='Lighting control software',blank = True,max_length = 300)
-    project_coordination = models.CharField(verbose_name='Project co-ordination',blank = True,max_length = 300)
+    Product_coordination = models.CharField(verbose_name='Product co-ordination',blank = True,max_length = 300)
     membrane_skin = models.CharField(verbose_name='Membrane skin',blank = True,max_length = 300)
     interaction_design = models.CharField(verbose_name='Interaction design/ programming',blank = True,max_length = 300)
-    sponsor = models.CharField(verbose_name='Project sponsor/ support',blank = True,max_length = 500)
+    sponsor = models.CharField(verbose_name='Product sponsor/ support',blank = True,max_length = 500)
     module_elems = models.CharField(verbose_name='Pixel or other basic module/ elements',blank = True,max_length = 300)
 
     def __iter__(self):
@@ -111,8 +111,11 @@ class Category(models.Model):
         return self.name
 
 
-class Project(models.Model):
-    title = models.CharField('Project Title',max_length = 100)
+
+
+
+class Product(models.Model):
+    title = models.CharField('Product Title',max_length = 100)
     country = CountryField(blank=True,multiple=True)
     city = models.CharField(max_length = 100,null = True, blank=True)
     year = models.IntegerField('Year of Completion',null = True, blank=True)
@@ -135,7 +138,6 @@ class Project(models.Model):
     contact = models.ForeignKey(Contact, null = True,on_delete=models.SET_NULL)
     interaction = models.ForeignKey(Interaction, null = True,on_delete = models.SET_NULL)
 
-
     def __str__(self):
         return str(self.title)
 
@@ -144,7 +146,11 @@ class Project(models.Model):
             yield (field.verbose_name, field.value_to_string(self))
 
 
-@receiver(post_delete, sender=Project)
+class BuildingProduct(Product):
+    additionalInfo = models.CharField('Product Title',max_length = 100)
+
+
+@receiver(post_delete, sender=Product)
 def auto_delete_reverse_keys(sender, instance, **kwargs):
     if instance.credits:
         instance.credits.delete()
@@ -156,36 +162,36 @@ def auto_delete_reverse_keys(sender, instance, **kwargs):
 
 
 class Link(models.Model):
-    project = models.ForeignKey(Project, on_delete=models.CASCADE)
+    Product = models.ForeignKey(Product, on_delete=models.CASCADE)
     link_description = models.CharField(null=True, blank=True, max_length = 2048)
     link = models.URLField(null=True, blank=True, max_length = 2048)
 
-def project_path(instance, filename):
-    return 'jurysys/media/{0}/{1}'.format(instance.project.id, filename)
+def Product_path(instance, filename):
+    return 'marktplatz/media/{0}/{1}'.format(instance.Product.id, filename)
 
 
 class Media(models.Model):
     fs = FileSystemStorage(location=settings.MEDIA_ROOT)
 
-    project = models.ForeignKey(Project, on_delete=models.CASCADE)
+    Product = models.ForeignKey(Product, on_delete=models.CASCADE)
     name_for = models.CharField(blank = True,max_length = 256)
 
     filename = models.CharField(max_length = 100)
     copyright = models.CharField(blank=True, max_length = 100)
-    image = models.ImageField(upload_to=project_path,storage=fs)
-    image_small = ProcessedImageField(upload_to=project_path,
+    image = models.ImageField(upload_to=Product_path,storage=fs)
+    image_small = ProcessedImageField(upload_to=Product_path,
                                       processors=[ResizeToCover(640, 360)],
                                       format='JPEG',
                                       options={'quality': 90})
-    image_medium= ProcessedImageField(upload_to=project_path,
+    image_medium= ProcessedImageField(upload_to=Product_path,
                                      processors=[ResizeToCover(960, 540)],
                                      format='JPEG',
                                      options={'quality': 90})
-    image_big = ProcessedImageField(upload_to=project_path,
+    image_big = ProcessedImageField(upload_to=Product_path,
                                      processors=[ResizeToCover(1920, 1080)],
                                      format='JPEG',
                                      options={'quality': 90})
-    image_norm = ProcessedImageField(upload_to=project_path,
+    image_norm = ProcessedImageField(upload_to=Product_path,
                                      processors=[Thumbnail(640, 360)],
                                      format='JPEG',
                                      options={'quality': 90},
@@ -225,10 +231,10 @@ def auto_delete_file_on_delete(sender, instance, **kwargs):
        if os.path.isfile(instance.image_norm.path):
            os.remove(instance.image_norm.path)
 #
-   #print(settings.MEDIA_ROOT+'/jurysys/media/{0}/{1}'.format(instance.project.id, instance.image.name))
-   #print(instance.project.id, instance.image.path)
-   #os.remove(settings.MEDIA_ROOT+'/jurysys/media/{0}/{1}_big'.format(instance.project.id, instance.filename))
-   #os.remove(settings.MEDIA_ROOT+'/jurysys/media/{0}/{1}.jpg'.format(instance.project.id, instance.image.name))
+   #print(settings.MEDIA_ROOT+'/marktplatz/media/{0}/{1}'.format(instance.Product.id, instance.image.name))
+   #print(instance.Product.id, instance.image.path)
+   #os.remove(settings.MEDIA_ROOT+'/marktplatz/media/{0}/{1}_big'.format(instance.Product.id, instance.filename))
+   #os.remove(settings.MEDIA_ROOT+'/marktplatz/media/{0}/{1}.jpg'.format(instance.Product.id, instance.image.name))
 
 
 
@@ -295,12 +301,12 @@ def auto_delete_file_on_delete(sender, instance, **kwargs):
 
 
 class Video(models.Model):
-    project = models.ForeignKey(Project, on_delete=models.CASCADE)
+    Product = models.ForeignKey(Product, on_delete=models.CASCADE)
     name_for = models.CharField(blank=True, max_length=256)
 
     filename = models.CharField(max_length=100)
     copyright = models.CharField(blank=True, max_length=100)
-    image = models.FileField(upload_to=project_path)
+    image = models.FileField(upload_to=Product_path)
 
 @receiver(models.signals.post_delete, sender=Video)
 def auto_delete_video_on_delete(sender, instance, **kwargs):
@@ -335,7 +341,7 @@ def auto_delete_video_on_delete(sender, instance, **kwargs):
 
 
 class Vote(models.Model):
-    project = models.ForeignKey(Project, on_delete=models.CASCADE)
+    Product = models.ForeignKey(Product, on_delete=models.CASCADE)
     juryMember = models.ForeignKey(User, on_delete = models.CASCADE)
     vote = models.PositiveSmallIntegerField(default=0)
     comment = models.CharField(blank=True, max_length =300)

jurysys/templates/index.html → marktplatz/templates/index.html

@@ -6,19 +6,19 @@
 <div style="background-color: white; margin-left: 20px;margin-right: 20px;padding-top: 30px" class="jumbotron">
     <h2 style="margin-top: 0px" class="display-3">Dear Jury Members,</h2>
 
-    <p class="lead">so many great projects have submitted! <br>
-It has been a great success: we have never before received more submissions. We received around 70 projects. So this should be an excellent overview of how Media Architecture looks like these days.</p>
+    <p class="lead">so many great Products have submitted! <br>
+It has been a great success: we have never before received more submissions. We received around 70 Products. So this should be an excellent overview of how Media Architecture looks like these days.</p>
   <hr class="my-4">
 
-<p>By clicking on the menu 'PROJECTS' you will get an overeview of all submissions that need to be voted.<br>
+<p>By clicking on the menu 'ProductS' you will get an overeview of all submissions that need to be voted.<br>
 You can filter the category by clicking the respective tag on top of the screen.<br>
-You should vote all projects, but if you forget to vote some project your other votes will count anyway.<br>
+You should vote all Products, but if you forget to vote some Product your other votes will count anyway.<br>
 </p>
         <p>
         You can filter the category by clicking the respective tag on top of the screen.<br>
-You should vote all projects, but if you forget to vote some project your other votes will count anyway.<br>
-There’s also a special tag “#not voted” to filter all the projects you haven’t been voted by you already.<br>
-Videos: Some of the projects have inline videos other have links to vimeo / youtube or other websites showing videos. Don’t miss the videos 🙂 <br>
+You should vote all Products, but if you forget to vote some Product your other votes will count anyway.<br>
+There’s also a special tag “#not voted” to filter all the Products you haven’t been voted by you already.<br>
+Videos: Some of the Products have inline videos other have links to vimeo / youtube or other websites showing videos. Don’t miss the videos 🙂 <br>
 
     </p>
 
@@ -43,8 +43,8 @@ Please make sure that you have a WeChat account and let us (Juan and me) know wh
 Please respond to awards@mediaarchitecture.org - also in case of questions.<br>
     </p>
     <p>
-        It will take you around 2 - 3 hours to see all the projects and vote them. An amazing experience!<br>
-I wish you fun browsing the projects and "happy voting“
+        It will take you around 2 - 3 hours to see all the Products and vote them. An amazing experience!<br>
+I wish you fun browsing the Products and "happy voting“
     </p>
     <p>
 best, Gernot</p>

jurysys/templates/jurysys/add.html → marktplatz/templates/marktplatz/add.html

@@ -1,7 +1,7 @@
 {% extends "base_generic.html" %}
 {% load static %}
 {% load crispy_forms_tags %}
-{% crispy project project.helper %}
+{% crispy Product Product.helper %}
 {% crispy credits credits.helper %}
 
 {% block content %}
@@ -22,7 +22,7 @@
           <div class="">
   &nbsp;
 </div>
-<h3>Submit your Project</h3>
+<h3>Submit your Product</h3>
                <div class="">
   &nbsp;
 </div>
@@ -32,7 +32,7 @@
 </div>
         </div>
     <div class="col-sm-10">
-      {% crispy project %}
+      {% crispy Product %}
     </div>
 
     <div class="col-sm-10">
@@ -56,7 +56,7 @@
     </div>
 
        <div class="col-sm-10">
-      {{ project.terms|as_crispy_field  }}
+      {{ Product.terms|as_crispy_field  }}
 
     </div>
              <div class="col-sm-10">

jurysys/templates/jurysys/admin_panel.html → marktplatz/templates/marktplatz/admin_panel.html

@@ -6,7 +6,7 @@
 <div class="container-fluid">
     {% if user.is_superuser %}
 
-<h3 style="margin-top: 10px">Projects Overview </h3>
+<h3 style="margin-top: 10px">Products Overview </h3>
 
 <form class="form-inline" method="POST"> {% csrf_token %}
  <table class="table table-sm table-hover">
@@ -14,29 +14,29 @@
      <thead class="">
     <tr>
         <th scope="col"></th>
-        <th scope="col"> Project</th>
+        <th scope="col"> Product</th>
         <th scope="col"> Category</th>
         <th scope="col"> Public</th>
         <th scope="col"> Editable </th>
         <th scope="col"> submitted</th>
 
     </tr>
-    {% for project in project_list %}
+    {% for Product in Product_list %}
     <tr class=""   >
-        <td  scope="col"><img src="{{project.media_set.first.image_small.url}}"  width="50" height="50" alt="{{ project.pk }}"> </td>
-        <td  scope="col"> <a href="{% url 'project-detail' project.pk %}">   {{project.title|upper }} </a></td>
+        <td  scope="col"><img src="{{Product.media_set.first.image_small.url}}"  width="50" height="50" alt="{{ Product.pk }}"> </td>
+        <td  scope="col"> <a href="{% url 'Product-detail' Product.pk %}">   {{Product.title|upper }} </a></td>
          <td scope="col">
-        {% for category in project.category.all %}
+        {% for category in Product.category.all %}
         {{category.short_name}}{% if not forloop.last %} | {% endif %}
              {% endfor %}
         </td>
         <td scope="col">
-    <input type="checkbox" class="form-check-input check" id="{{ project.pk }}.public" name="{{ project.pk }}.public" {% if project.public %}checked="checked"{% endif %}>
+    <input type="checkbox" class="form-check-input check" id="{{ Product.pk }}.public" name="{{ Product.pk }}.public" {% if Product.public %}checked="checked"{% endif %}>
   </td>
         <td scope="col">
-    <input type="checkbox" class="form-check-input check" id="{{ project.pk }}.edit" name="{{ project.pk }}.edit" {% if project.edit %}checked="checked"{% endif %}>
+    <input type="checkbox" class="form-check-input check" id="{{ Product.pk }}.edit" name="{{ Product.pk }}.edit" {% if Product.edit %}checked="checked"{% endif %}>
  </td>
-        <td scope="col"> {{project.sumbitted}} </td>
+        <td scope="col"> {{Product.sumbitted}} </td>
 
     </tr>
     {% endfor %}

jurysys/templates/jurysys/file_upload.html → marktplatz/templates/marktplatz/file_upload.html

@@ -10,7 +10,7 @@
 
 <div class="container-fluid">
 
-    <h3 style="margin-top: 10px">{{project.title}} Media </h3>
+    <h3 style="margin-top: 10px">{{Product.title}} Media </h3>
 
  <table class="table table-sm table-hover">
 
@@ -37,7 +37,7 @@
 
 
  </table>
-    <a href="{% url 'project-detail' pk=project.pk %}">  <input  class="btn border-dark rounded-0 mybtn" value="Show Site"></a>
+    <a href="{% url 'Product-detail' pk=Product.pk %}">  <input  class="btn border-dark rounded-0 mybtn" value="Show Site"></a>
 </div >
 
  <div class="">

jurysys/templates/jurysys/media_overview.html → marktplatz/templates/marktplatz/media_overview.html

@@ -8,7 +8,7 @@
 
 <div class="container-fluid">
 
-    <h3 style="margin-top: 10px">{{project.title}} Media </h3>
+    <h3 style="margin-top: 10px">{{Product.title}} Media </h3>
 
  <table class="table table-sm table-hover">
 
@@ -36,7 +36,7 @@
 
  </table>
 
-         <a href="{% url 'add-Image' project.pk %}"> <button class="btn border-dark rounded-0 mybtn" type="submit">Add Media </button> </a>
+         <a href="{% url 'add-Image' Product.pk %}"> <button class="btn border-dark rounded-0 mybtn" type="submit">Add Media </button> </a>
 </div>
 
 

jurysys/templates/jurysys/myProjects.html → marktplatz/templates/marktplatz/myProjects.html

@@ -22,30 +22,30 @@ $('form').submit(function () {
 
 <div class="container-fluid">
 
-<h3 style="margin-top: 10px"> {{user.username}}'s Projects </h3>
+<h3 style="margin-top: 10px"> {{user.username}}'s Products </h3>
 
-{% if project_list %}
+{% if Product_list %}
  <table class="table table-sm table-hover">
     <caption>* FP = Future trends & Prototypes; AA = Animated Architecture; MA = Money Architecture; SMA = Spatial Media Art; PAUI = Participatory Architecture & Urban Interaction</caption>
 
      <thead class="">
     <tr>
         <th scope="col"></th>
-        <th scope="col"> Project</th>
+        <th scope="col"> Product</th>
         <th scope="col"> Category</th>
         <th scope="col"> Editable</th>
 
     </tr>
-    {% for project in project_list %}
-    <tr class="{% get_sucsess project %}"   >
-        <td  scope="col"><img src="{{project.media_set.first.image_small.url}}"  width="50" height="50" alt="{{ project.pk }}"> </td>
-        <td  scope="col"> <a href="{% url 'project-detail' project.pk %}">   {{project.title|upper }} </a></td>
+    {% for Product in Product_list %}
+    <tr class="{% get_sucsess Product %}"   >
+        <td  scope="col"><img src="{{Product.media_set.first.image_small.url}}"  width="50" height="50" alt="{{ Product.pk }}"> </td>
+        <td  scope="col"> <a href="{% url 'Product-detail' Product.pk %}">   {{Product.title|upper }} </a></td>
           <td scope="col">
-        {% for category in project.category.all %}
+        {% for category in Product.category.all %}
         {{category.short_name}}{% if not forloop.last %} | {% endif %}
              {% endfor %}
         </td>
-        <td scope="col"> {% if project.edit %} <a href="{% url 'edit-project' project.pk %}"> edit Project </a> ; <a href="{% url 'add-Image' project.pk %}"> edit Media </a> {% else %} already sumbitted {% endif %} </td>
+        <td scope="col"> {% if Product.edit %} <a href="{% url 'edit-Product' Product.pk %}"> edit Product </a> ; <a href="{% url 'add-Image' Product.pk %}"> edit Media </a> {% else %} already sumbitted {% endif %} </td>
 
     </tr>
     {% endfor %}
@@ -54,11 +54,11 @@ $('form').submit(function () {
 
 
  </table>
-    <a href="{% url 'NewSubmitView' %}"><button class="btn border-dark rounded-0 mybtn" type="submit">Add Project </button> </a>
+    <a href="{% url 'NewSubmitView' %}"><button class="btn border-dark rounded-0 mybtn" type="submit">Add Product </button> </a>
  {% else %}
 <div class="container-fluid">
 
-    <h6>Seems like you haven't uploaded anything yet :(<br> Start Sumbitting now :  <a href="{% url 'NewSubmitView' %}"><button class="btn border-dark rounded-0 mybtn" type="submit">Add Projects </button> </a></h6>
+    <h6>Seems like you haven't uploaded anything yet :(<br> Start Sumbitting now :  <a href="{% url 'NewSubmitView' %}"><button class="btn border-dark rounded-0 mybtn" type="submit">Add Products </button> </a></h6>
 </div>
 
 {% endif %}

jurysys/templates/jurysys/project_detail.html → marktplatz/templates/marktplatz/project_detail.html

@@ -31,14 +31,14 @@ $('.gallery').featherlightGallery({
 <div clas="container">
 
 
-<h2 class="titlepro" style="margin-top: 7px;color: black; font-weight: bold">{{ project.title }}
-      <small class="text-muted">{% if project.year %} {{ project.year }}, {% endif %}  {% for country in project.country %} {{ country.name }}, {% endfor %} {% if project.city %} {{ project.city }} {% endif %}</small>
+<h2 class="titlepro" style="margin-top: 7px;color: black; font-weight: bold">{{ Product.title }}
+      <small class="text-muted">{% if Product.year %} {{ Product.year }}, {% endif %}  {% for country in Product.country %} {{ country.name }}, {% endfor %} {% if Product.city %} {{ Product.city }} {% endif %}</small>
 </h2>
-<p class="lead kur"> {{ project.header }}</p>
+<p class="lead kur"> {{ Product.header }}</p>
   <div class="row" style="display: flex">
 
 
-{% for media in project.media_set.all %}
+{% for media in Product.media_set.all %}
 
          <div style="flex: {% get_ratio media %}">
     <img href="{{media.image_big.url}}" align="middle" src="{{media.image_norm.url }}" class="gallery img-fluid img-responsive"  alt="" style="width: 100%;height: auto;vertical-align: middle;">
@@ -56,17 +56,17 @@ $('.gallery').featherlightGallery({
      
      <div class="col-sm-6">
          <p ><h5 class="black"></h5></p>
-          {% for video in project.video_set.all %}
+          {% for video in Product.video_set.all %}
 
           <video autoplay style="width: 100%;height: auto;vertical-align: middle; padding-bottom: 10px" controls>
               <source src="{{video.image.url}}" type="video/mp4">
           </video>
 
       {% endfor %}
-         <p>{{project.teaser_txt}}</p>
-         <p>{{project.description_txt}}</p>
+         <p>{{Product.teaser_txt}}</p>
+         <p>{{Product.description_txt}}</p>
 
-         {% for link in project.link_set.all %}
+         {% for link in Product.link_set.all %}
          <p> <a href="{{link.link}}">{{link.link}}</a></p>
 
 
@@ -78,8 +78,8 @@ $('.gallery').featherlightGallery({
          {% if request.user|has_group:"jury" %}
          <p ><h5 class="black mediumkur" style="margin: 0px">Please vote here:</h5></p>
             <form class="form-inline needs-validation" method="POST"> {% csrf_token %}
-                <p><textarea style="margin-top: 0px;padding-top: 0px" type="text" rows="5" cols="25" class="form-control border-dark rounded-0" id="comment" name="comment" placeholder='{% get_comment project user %}'>{% get_comment project user %}</textarea></br>
-                <br> <input style='width: 50px;' type="number" class="form-control border-dark rounded-0" id="vote" name="vote" placeholder='{% get_int_vote project user %}' required> <button  class="btn border-dark rounded-0 mybtn" type="submit">Submit </button> </br>
+                <p><textarea style="margin-top: 0px;padding-top: 0px" type="text" rows="5" cols="25" class="form-control border-dark rounded-0" id="comment" name="comment" placeholder='{% get_comment Product user %}'>{% get_comment Product user %}</textarea></br>
+                <br> <input style='width: 50px;' type="number" class="form-control border-dark rounded-0" id="vote" name="vote" placeholder='{% get_int_vote Product user %}' required> <button  class="btn border-dark rounded-0 mybtn" type="submit">Submit </button> </br>
                 </p>
                 <small class="form-text text-muted">
                    <p style="margin-bottom: 0px">Only Values between 0 an 10 are taken into account.</p>
@@ -91,7 +91,7 @@ $('.gallery').featherlightGallery({
 
                 <div class="invalid-feedback"> Please enter a Vote between 0 an 10 </div>
             </form>
-            <p style="margin-top: 4px"><strong>Award Categories:</strong> {% for cat in project.category.all %} {{cat.name}}{% if not forloop.last %}, {% endif %}{% endfor %}</p>
+            <p style="margin-top: 4px"><strong>Award Categories:</strong> {% for cat in Product.category.all %} {{cat.name}}{% if not forloop.last %}, {% endif %}{% endfor %}</p>
          {% endif %}
 
          <p ><h5 class="black mediumkur">Details</h5></p>
@@ -125,12 +125,12 @@ $('.gallery').featherlightGallery({
 
          <p ><h5 class="mediumkur">Mediacredits</h5></p>
 
-         {% for media in project.media_set.all %}
+         {% for media in Product.media_set.all %}
          {% if media.copyright %}
           <p class="fieldname"> {{ media.copyright }}</p>
          {% endif %}
          {% endfor %}
-         {% for media in project.video_set.all %}
+         {% for media in Product.video_set.all %}
          {% if media.copyright %}
           <p class="fieldname"> {{ media.copyright }}</p>
          {% endif %}

jurysys/templates/jurysys/project_overwiev.html → marktplatz/templates/marktplatz/project_overwiev.html

@@ -121,7 +121,7 @@ $(document).ready(function(){
 
   }
 
-  .mab-project-title {
+  .mab-Product-title {
 
     position: absolute;
     bottom: 8px;
@@ -135,7 +135,7 @@ $(document).ready(function(){
 
   }
 
-  .mab-project-vote {
+  .mab-Product-vote {
 
     position: absolute;
     top: 8px;
@@ -192,7 +192,7 @@ $(document).ready(function(){
 
 <div id="how" style="margin-top: 5px;text-align: center;vertical-align: middle; max-height: 40px;" class="container-fluid">
 
-  <p style="color: black"> There are no projects matching your selection, as you have selected multiple tags.
+  <p style="color: black"> There are no Products matching your selection, as you have selected multiple tags.
     Click <nobr><button id='show' class="border-thin mybtn" style="margin-right: 2px;margin-top: 15px">#Show All</button></nobr> to deselect all tags.
   </p>
 </div>
@@ -202,32 +202,32 @@ $(document).ready(function(){
   {{main_card|safe}}
 
 
-  {% for project in project_list %}
+  {% for Product in Product_list %}
 
-  <div class="mab-card {% for name in project.country %} {{name.code}} {% endfor %} {{project.year}} {% for category in project.category.all %} {{category.short_name}} {% endfor %} card rounded-0 border-0 {% if user.is_authenticated %} {% get_vote_class project user %} {% endif %}" style="">
-    <a href="{% url 'project-detail' project.pk %}">
+  <div class="mab-card {% for name in Product.country %} {{name.code}} {% endfor %} {{Product.year}} {% for category in Product.category.all %} {{category.short_name}} {% endfor %} card rounded-0 border-0 {% if user.is_authenticated %} {% get_vote_class Product user %} {% 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 project user %} {% endif %} {% for category in project.category.all %} {{category.short_name}} {% endfor %} card-img-top rounded-0" src="{{project.media_set.first.image_norm.url}}" alt="image">
-        <div class="mab-project-title" style="">{{project.title|upper }}</div>
+        <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 rounded-0" src="{{Product.media_set.first.image_norm.url}}" alt="image">
+        <div class="mab-Product-title" style="">{{Product.title|upper }}</div>
         {% if user.is_authenticated %}
-        <div class="mab-project-vote" style="">{% get_vote project user %}</div>
+        <div class="mab-Product-vote" style="">{% get_vote Product user %}</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 'project-detail' project.pk %}"> {{project.header }} </a></p>
+        <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="">
-        {% for name in project.country %}
+        {% for name in Product.country %}
         <button id='{{name.code}}' class="border-thin mybtn" style="">#{{name.name}}</button>
         {% endfor %}
 
-        <button id='{{project.year}}' class="border-thin mybtn" style="">#{{project.year}}</button>
+        <button id='{{Product.year}}' class="border-thin mybtn" style="">#{{Product.year}}</button>
 
-        {% for category in project.category.all %}
+        {% for category in Product.category.all %}
         <button id='{{category.short_name}}' class="border-thin mybtn" style="">#{{category.name}}</button>
         {% endfor %}
       </p>

jurysys/templates/jurysys/voteDetail.html → marktplatz/templates/marktplatz/voteDetail.html

@@ -17,25 +17,25 @@
      <thead class="">
     <tr>
         <th scope="col"></th>
-        <th scope="col"> Project</th>
+        <th scope="col"> Product</th>
         <th scope="col"> Category</th>
         <th scope="col"> Average</th>
         {% for user in user %}
         <th scope="col"> {{user.username}}</th>
         {% endfor %}
     </tr>
-    {% for project in project_list %}
-    <tr class="{% get_sucsess project %}"   >
-        <td  scope="col"><img src="{{project.media_set.first.image_small.url}}"  width="50" height="50" alt="image"> </td>
-        <td  scope="col"> <a href="{% url 'project-detail' project.pk %}">   {{project.title|upper }} </a></td>
+    {% for Product in Product_list %}
+    <tr class="{% get_sucsess Product %}"   >
+        <td  scope="col"><img src="{{Product.media_set.first.image_small.url}}"  width="50" height="50" alt="image"> </td>
+        <td  scope="col"> <a href="{% url 'Product-detail' Product.pk %}">   {{Product.title|upper }} </a></td>
          <td scope="col">
-        {% for category in project.category.all %}
+        {% for category in Product.category.all %}
         {{category.short_name}}{% if not forloop.last %} | {% endif %}
              {% endfor %}
         </td>
-        <td scope="col"> {% get_avg project %}</td>
+        <td scope="col"> {% get_avg Product %}</td>
         {% for user in user %}
-        <td scope="col"><abbr title="{% get_vote_txt project user%}">  {% get_vote_simple project user %} </abbr></td>
+        <td scope="col"><abbr title="{% get_vote_txt Product user%}">  {% get_vote_simple Product user %} </abbr></td>
         {% endfor %}
     </tr>
     {% endfor %}

jurysys/templates/jurysys/votes_cid.html → marktplatz/templates/marktplatz/votes_cid.html

@@ -34,25 +34,25 @@ $('form').submit(function () {
      <thead class="">
     <tr>
         <th scope="col"></th>
-        <th scope="col"> Project</th>
+        <th scope="col"> Product</th>
         <th scope="col"> Category</th>
         <th scope="col"> Average</th>
         <th scope="col"> CID</th>
         <th scope="col"> submitted</th>
 
     </tr>
-    {% for project in project_list %}
-    <tr class="{% get_sucsess project %}"   >
-        <td  scope="col"><img src="{{project.media_set.first.image_small.url}}"  width="50" height="50" alt="{{ project.pk }}"> </td>
-        <td  scope="col"> <a href="{% url 'project-detail' project.pk %}">   {{project.title|upper }} </a></td>
+    {% for Product in Product_list %}
+    <tr class="{% get_sucsess Product %}"   >
+        <td  scope="col"><img src="{{Product.media_set.first.image_small.url}}"  width="50" height="50" alt="{{ Product.pk }}"> </td>
+        <td  scope="col"> <a href="{% url 'Product-detail' Product.pk %}">   {{Product.title|upper }} </a></td>
          <td scope="col">
-        {% for category in project.category.all %}
+        {% for category in Product.category.all %}
         {{category.short_name}}{% if not forloop.last %} | {% endif %}
              {% endfor %}
         </td>
-        <td scope="col"> {% get_avg project %}</td>
-        <td scope="col"> <input type="text" id="{{ project.pk }}cid" name="{{ project.pk }}.cid" placeholder="{{project.class_cid}}"> </td>
-        <td scope="col"> <input type="text" id="{{ project.pk }}sub" name="{{ project.pk }}.sub" placeholder="{{project.sumbitted}}"> </td>
+        <td scope="col"> {% get_avg Product %}</td>
+        <td scope="col"> <input type="text" id="{{ Product.pk }}cid" name="{{ Product.pk }}.cid" placeholder="{{Product.class_cid}}"> </td>
+        <td scope="col"> <input type="text" id="{{ Product.pk }}sub" name="{{ Product.pk }}.sub" placeholder="{{Product.sumbitted}}"> </td>
 
     </tr>
     {% endfor %}

jurysys/templatetags/tags.py → marktplatz/templatetags/tags.py

@@ -4,13 +4,13 @@ from django.conf import settings
 from django.db.models import Avg
 
 register = template.Library()
-from ..models import Project, User, Vote, Media, Contact
+from ..models import Product, User, Vote, Media, Contact
 
 @register.simple_tag
-def get_vote(project, user):
+def get_vote(Product, user):
     if user.groups.filter(name='jury').exists():
         try:
-            vote = Vote.objects.get(juryMember=user, project=project)
+            vote = Vote.objects.get(juryMember=user, Product=Product)
         except Vote.DoesNotExist:
             return 'VOTE !'
 
@@ -18,10 +18,10 @@ def get_vote(project, user):
     return ''
 
 @register.simple_tag
-def get_int_vote(project, user):
+def get_int_vote(Product, user):
 
     try:
-        vote = Vote.objects.get(juryMember=user, project=project)
+        vote = Vote.objects.get(juryMember=user, Product=Product)
 
     except Vote.DoesNotExist:
         return 0
@@ -29,10 +29,10 @@ def get_int_vote(project, user):
     return vote.vote
 
 @register.simple_tag
-def get_comment(project, user):
+def get_comment(Product, user):
 
     try:
-        vote = Vote.objects.get(juryMember=user, project=project)
+        vote = Vote.objects.get(juryMember=user, Product=Product)
 
     except Vote.DoesNotExist:
         return 'Here is some space for your comments (not obligatory)'
@@ -59,9 +59,9 @@ def get_ratio(media):
 
 
 @register.simple_tag
-def get_vote_simple(project, user):
+def get_vote_simple(Product, user):
     try:
-        vote = Vote.objects.get(juryMember=user, project=project)
+        vote = Vote.objects.get(juryMember=user, Product=Product)
 
     except Vote.DoesNotExist:
         return '-'
@@ -70,9 +70,9 @@ def get_vote_simple(project, user):
 
 
 @register.simple_tag
-def get_avg(project):
+def get_avg(Product):
     try:
-        votes = Vote.objects.filter(project=project)
+        votes = Vote.objects.filter(Product=Product)
 
     except Vote.DoesNotExist:
         return '-'
@@ -80,20 +80,20 @@ def get_avg(project):
     return votes.aggregate(Avg('vote'))['vote__avg']
 
 @register.simple_tag
-def get_countries(project_list):
+def get_countries(Product_list):
     countries = {''}
-    for project in project_list:
+    for Product in Product_list:
 
-       if not countries.__contains__(project.country):
-           countries.add(project.country)
+       if not countries.__contains__(Product.country):
+           countries.add(Product.country)
 
     return countries
 
 @register.simple_tag
-def get_vote_class(project, user):
+def get_vote_class(Product, user):
 
     try:
-        Vote.objects.get(juryMember=user, project=project)
+        Vote.objects.get(juryMember=user, Product=Product)
 
     except Vote.DoesNotExist:
         return 'notvote'
@@ -101,9 +101,9 @@ def get_vote_class(project, user):
     return 'vote'
 
 @register.simple_tag
-def get_sucsess(project):
+def get_sucsess(Product):
     try:
-        votes = Vote.objects.filter(project=project)
+        votes = Vote.objects.filter(Product=Product)
 
     except Vote.DoesNotExist:
         return ''
@@ -114,9 +114,9 @@ def get_sucsess(project):
     return ''
 
 @register.simple_tag
-def get_vote_txt(project, user):
+def get_vote_txt(Product, user):
     try:
-        vote = Vote.objects.get(juryMember=user, project=project)
+        vote = Vote.objects.get(juryMember=user, Product=Product)
 
     except Vote.DoesNotExist:
         return ''
@@ -127,8 +127,8 @@ def get_vote_txt(project, user):
 def has_group(user, group_name):
     return user.groups.filter(name=group_name).exists()
 
-@register.filter(name='has_project')
-def has_project(user, project):
+@register.filter(name='has_Product')
+def has_Product(user, Product):
     contact = Contact.objects.get(user=user)
-    return Project.objects.filter(contact=contact).filter(pk=project).exists()
+    return Product.objects.filter(contact=contact).filter(pk=Product).exists()
 

jurysys/urls.py → marktplatz/urls.py

@@ -7,21 +7,21 @@ from django.views.generic import RedirectView
 from django.conf.urls import url, include
 
 urlpatterns = [
-    path('', RedirectView.as_view(url='projects/'), name='index'),
+    path('', RedirectView.as_view(url='Products/'), name='index'),
     path('about/', views.about, name='about'),
     path('submit/', views.submit, name='submit'),
-    path('projects/', views.ProjectsView.as_view(), name='projects'),
-    path('project/<int:pk>', views.DetailView.as_view(), name='project-detail'),
+    path('Products/', views.ProductsView.as_view(), name='Products'),
+    path('Product/<int:pk>', views.DetailView.as_view(), name='Product-detail'),
     path('votes/', views.VoteView.as_view(), name='vote-detail'),
     path('votescid/', views.CidView.as_view(), name='votecid-detail'),
     path('admin_panel/', views.AdminView.as_view(), name='admin-panel'),
-    #path('import-old-projects/', importOldProjects.as_view(template_name="mab18/importold.html"), name='import-old-projects'),
+    #path('import-old-Products/', importOldProducts.as_view(template_name="mab18/importold.html"), name='import-old-Products'),
     #path('import-old-json/', importOldJson.as_view(template_name="mab18/importold.html"),name='import-old-json'),
     path('light-box/', lightboximg.as_view(template_name="mab18/importold.html"),name='lightbox'),
     path('register/', views.registerView.as_view(), name='registerView'),
-    path('addProject/', views.NewSubmitView.as_view(), name='NewSubmitView'),
-    path('myProjects/', views.UsersProjects.as_view(), name='MyProjects'),
-    path('editProject/<int:pk>', views.EditView.as_view(), name='edit-project'),
+    path('addProduct/', views.NewSubmitView.as_view(), name='NewSubmitView'),
+    path('myProducts/', views.UsersProducts.as_view(), name='MyProducts'),
+    path('editProduct/<int:pk>', views.EditView.as_view(), name='edit-Product'),
     path('addImage/<int:pk>', views.uploadView.as_view(), name='add-Image'),
     path('images/<int:pk>', views.MediaView.as_view(), name='media-overview'),
     url(r'^delete_media/(?P<pk>\d+)/$', views.delete_media, name='delete-media'),