From 8e103fea5f3340497eff6f3e70cd8ceec731d820 Mon Sep 17 00:00:00 2001
From: alazo <alain.zosso@webzos.com>
Date: Fri, 16 Feb 2018 15:37:11 +0100
Subject: [PATCH] Concept-detail

---
 cms/views.py                       |  2 +-
 templates/cms/competence_list.html |  4 +---
 templates/cms/concept.html         | 13 -------------
 templates/cms/concept_detail.html  | 13 +++++--------
 templates/cms/concept_list.html    | 20 --------------------
 templates/cms/domaine_detail.html  |  2 +-
 6 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 templates/cms/concept.html
 delete mode 100644 templates/cms/concept_list.html

diff --git a/cms/views.py b/cms/views.py
index 836bcbe..2d4f3f1 100644
--- a/cms/views.py
+++ b/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
diff --git a/templates/cms/competence_list.html b/templates/cms/competence_list.html
index d852df2..9bea879 100644
--- a/templates/cms/competence_list.html
+++ b/templates/cms/competence_list.html
@@ -20,6 +20,4 @@
         {% endfor %}
     </table>
 </div>
-{% endblock %}
-
-
+{% endblock %}
\ No newline at end of file
diff --git a/templates/cms/concept.html b/templates/cms/concept.html
deleted file mode 100644
index e6a3eb0..0000000
--- a/templates/cms/concept.html
+++ /dev/null
@@ -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 %}
-
-
diff --git a/templates/cms/concept_detail.html b/templates/cms/concept_detail.html
index b516cba..bc0f5a5 100644
--- a/templates/cms/concept_detail.html
+++ b/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 %}
diff --git a/templates/cms/concept_list.html b/templates/cms/concept_list.html
deleted file mode 100644
index bb0599a..0000000
--- a/templates/cms/concept_list.html
+++ /dev/null
@@ -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 %}
diff --git a/templates/cms/domaine_detail.html b/templates/cms/domaine_detail.html
index 4d5d014..3410919 100644
--- a/templates/cms/domaine_detail.html
+++ b/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>