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 %} -{% 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 %} - -
- -
-{% 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 %}

{{object}}

-

{{object.texte|safe}}

-
-
- + {% if object.published %} +

{{object.texte|safe}}

+ {% else %} +

Le document est en travail

+ {% endif %}
{% 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 %} - -
-

Liste des documents

-
    - {% for doc in object_list %} -
  1. {{ doc }}
  2. - {% endfor %} - {% for fic in upload %} -
  3. {{ fic.titre }}
  4. - {% endfor %} -
-
-{% 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 %}

Processus: {{ p.url|safe }}

{% for m in p.module_set.all %} -
Module: {{ m }}
+
Module: {{ m }}
Compétences visées
{% for c in m.competences.all %}
{{ c }}