Concept-detail

cms/views.py

@@ -81,7 +81,7 @@ class UploadDocListView(ListView):
 
 class UploadDocDetailView(DetailView):
     """
-    Display first recorded documents and next uploaded documents
+    Display uploaded docs
     """
     template_name = 'cms/uploaddoc_detail.html'
     model = UploadDoc

templates/cms/competence_list.html

@@ -20,6 +20,4 @@
         {% endfor %}
     </table>
 </div>
-{% endblock %}
-
-
+{% endblock %}

templates/cms/concept.html

@@ -1,13 +0,0 @@
-{% extends "./base_site.html" %}
-{% load i18n static %}
-
-{% block coltype %}colMS{% endblock %}
-
-{% block content %}
-
-<div id="content-main">
-    <iframe src="{{document.url}}" width="1200" height="800" align="middle"></iframe>
-</div>
-{% endblock %}
-
-

templates/cms/concept_detail.html

@@ -1,19 +1,16 @@
 {% extends "./base_site.html" %}
 {% load i18n static %}
-
 {% block coltype %}colMS{% endblock %}
-
-
-
 {% block content %}
 
 <div id="content-main">
     <div style="margin:auto;width:50%;">
         <h1><b>{{object}}</b></h1>
-        <p>{{object.texte|safe}}</p>
-    </div>
-    <div style="height: 600px;width: 400px;">
-        <object data="media/media/EDS_Calendrier_2017.pdf" type="text/html" codetype="application/pdf" ></object>
+        {% if object.published %}
+            <p>{{object.texte|safe}}</p>
+        {% else %}
+            <p>Le document est en travail</p>
+        {% endif %}
     </div>
 </div>
 {% endblock %}

templates/cms/concept_list.html

@@ -1,20 +0,0 @@
-{% extends "./base_site.html" %}
-{% load i18n static %}
-{% block coltype %}colMS{% endblock %}
-
-{% block bodyclass %}{{ block.super }}{% endblock %}
-
-{% block content %}
-
-<div id="content-main">
-    <h1>Liste des documents</h1>
-    <ol>
-        {% for doc in object_list %}
-            <li><a href="{% url 'document-detail' doc.id %}">{{ doc }}</a></li>
-        {% endfor %}
-        {% for fic in upload %}
-            <li><a href="{% url 'upload-detail' fic.id %}">{{ fic.titre }}</a></li>
-        {% endfor %}
-    </ol>
-</div>
-{% endblock %}

templates/cms/domaine_detail.html

@@ -10,7 +10,7 @@
     {% for p in object.processus_set.all %}
         <div class="processus"><h2>Processus:  {{ p.url|safe }}</h2></div>
         {% for m in p.module_set.all %}
-            <div class="module">Module:  <a href="/module/{{m.id}}">{{ m }}</a></div>
+            <div class="module">Module:  <a href="{% url 'module-detail' c.module.id %}">{{ m }}</a></div>
             <div class="competence">Compétences visées</div>
             {% for c in m.competences.all %}
                 <div class="competence">{{ c }}</div>