Juan Carlos 4 ani în urmă
părinte
comite
30f2b388e3

+ 0 - 82
marktplatz/templates/marktplatz/add.html

@@ -1,82 +0,0 @@
-{% extends "base_generic.html" %}
-{% load static %}
-{% load compress %}
-{% load crispy_forms_tags %}
-{% crispy product product.helper %}
-{% crispy credits credits.helper %}
-
-{% block content %}
-<link rel="stylesheet" href="{% static "ajaxuploader/css/fileuploader.css" %}">
-
-<style media="screen">
-  .form-error {
-    padding: 60 0 0 20;
-    color: #F00;
-
-  }
-</style>
-
-<div class="container-lg">
-  <form id='upload_mab' enctype="multipart/form-data" method="post">
-    {% csrf_token %}
-        <div class="col-sm-10">
-          <div class="">
-  &nbsp;
-</div>
-<h3>Reichen Sie Ihr Projekt ein</h3>
-               <div class="">
-  &nbsp;
-</div>
-                  <div class="col-sm-10" style="margin-bottom: 5px">{{info_txt|safe}}</div>
-               <div class="">
-  &nbsp;
-</div>
-        </div>
-    <div class="col-sm-10">
-      {% crispy product %}
-    </div>
-
-
-    <div class="col-sm-10">
-
-    </div>
-
-
-
-       <div class="col-sm-10">
-
-         <div class='form-error' style="" >{{ product_errors }}</div>
-      {{ product.terms|as_crispy_field  }}
-
-    </div>
-             <div class="col-sm-10">
-
-
-             </div>
-
-    <div class="col-sm-10" style="margin-bottom: 5px">
-      <br><br>
-      <div class="buttonHolder">
-        <input type="submit" name="submit" class=" btn border-thin mybtn" style="margin-right: " value="Absenden">
-        <span class="">
-          &nbsp;&nbsp;&nbsp;
-        </span>
-        <input type="submit" name="add-image" class="btn border-thin mybtn" value="Absenden & Bilder hochladen">
-        <br><br>
-      </div>
-    </div>
-
-  </form>
-
-</div>
-
-<div class="">
-  &nbsp; &nbsp;
-</div>
-
-
-<script>
-
-
-</script>
-{% endblock %}

+ 1 - 60
marktplatz/templates/marktplatz/modal-share.html

@@ -10,7 +10,7 @@
     <!-- The Modal -->
     <div id="ShareModal" class="modal" onclick="function hide(e){ e.style.display='None'; } hide(this);" >
       <!-- Modal content -->
-      <div class="modal-content">
+      <div class="modal-content" onclick="event.stopPropagation(); return;">
         <span id="ShareClose" onclick = "(function() { document.getElementById('ShareModal').style.display = 'none'; } )(); return false;" class="close">&times;</span>
 
         <div class=""> &nbsp; </div>
@@ -73,62 +73,3 @@
 
       </div>
     </div>
-
-
-    <!-- <script>
-    // var ShareModal = document.getElementById('ShareModal');
-    // var ShareBtn = document.getElementById('ShareButton');
-    // var ShareSpan = document.getElementById('ShareClose');
-    // ShareBtn.onclick = function () {
-    //   ShareModal.style.display = 'block';
-    // }
-    // ShareSpan.onclick = function() {
-    //   ShareModal.style.display = 'none';
-    // }
-    // function copyiframecode() {
-    //   var copyText = document.getElementById('iframecode');
-    //   copyText.select();
-    //   copyText.setSelectionRange(0, 99999)
-    //   document.execCommand('copy');
-    //   alert('Der Text wurde in der Zwischenablage kopiert: ' + copyText.value);
-    // }
-    //
-    // function copyembedlinkcode() {
-    //   var copyText = document.getElementById('embedlink');
-    //   copyText.select();
-    //   copyText.setSelectionRange(0, 99999)
-    //   document.execCommand('copy');
-    //   alert('Der Text wurde in der Zwischenablage kopiert: ' + copyText.value);
-    // }
-
-
-
-    // ShareBtn.onclick = "(function () { document.getElementById('ShareModal').style.display = 'block'; })(); return false;";
-    //
-    //
-    // ShareSpan.onclick = "(function() { document.getElementById('ShareModal').style.display = 'none'; } )(); return false;"
-    //
-    //
-    //
-    //
-    // onclick = "function copyiframecode() {
-    //   var copyText = document.getElementById('iframecode');
-    //   copyText.select();
-    //   copyText.setSelectionRange(0, 99999)
-    //   document.execCommand('copy');
-    //   alert('Der Text wurde in der Zwischenablage kopiert: ' + copyText.value);
-    // }; copyiframecode();"
-
-    // onclick = "function copyembedlinkcode() {
-    //   var copyText = document.getElementById('embedlink');
-    //   copyText.select();
-    //   copyText.setSelectionRange(0, 99999)
-    //   document.execCommand('copy');
-    //   alert('Der Text wurde in der Zwischenablage kopiert: ' + copyText.value);
-    // }; copyembedlinkcode();"
-
-
-
-
-
-    </script> -->

+ 3 - 10
marktplatz/templates/marktplatz/product_detail.html

@@ -288,8 +288,7 @@
 					<h5 class="mediumkur">Mehr über das Projekt</h5>
 					<p>Posts tagged {{ object.name|slugify }}</p>
 					<br />
-					<ul>
-					<div class="" id="blog-post-demo" >
+					<ul class="" id="blog-post-demo" >
 
 					<blog-post
 					  v-for="post in posts"
@@ -297,8 +296,7 @@
 					  v-bind:title="post.title"
 					  v-bind:link="post.link"
 					></blog-post>
-					</div>
-				</ul>
+					</ul>
 
 
 
@@ -457,16 +455,11 @@ $(document).ready(function($) {
 		 }
 	 })
 
-		// function myFunction(value, index, array) {
-		// 	console.log(value);
-		// }
-		//
-		// resp.data.forEach(myFunction);
-
 	}
 
 
 
+
  }); // document ready
 
 

+ 3 - 3
marktplatz/templates/marktplatz/product_overview.html

@@ -344,7 +344,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.urbanem %}urbanem_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.realitylab %}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">
           <!--  -->
@@ -384,8 +384,8 @@ $(document).ready(function(){
                 <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}}_realitylab_{{product.mitmachen}}' data-toggler='begleitet_true' class="border-thin mybtn btn-toggle begleitet_true" style="">#Begleitet von RealityLab</button>
+                {% if product.realitylab %}
+                <button id='product_{{product.pk}}_realitylab_{{product.realitylab}}' data-toggler='begleitet_true' class="border-thin mybtn btn-toggle begleitet_true" style="">#Begleitet von RealityLab</button>
                 {% endif %}
 
                 {% if product.urbanem %}