diff --git a/.gitignore b/.gitignore index 9d72eee..701353a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,6 @@ db.* *.csv *.xls *.xlsx +*.xls .* diff --git a/cms/models.py b/cms/models.py index 17aa28e..8e27399 100644 --- a/cms/models.py +++ b/cms/models.py @@ -216,8 +216,13 @@ class UploadDoc(models.Model): def __str__(self): return self.titre - - +""" +class OffreEmploi(models.Model): + source = models.CharField(max_lenght=200, blank=False) + descr = model.HTMLField(blank=False) + published = models.BooleanField(default=False) +""" + class PDFResponse(HttpResponse): diff --git a/cms/views.py b/cms/views.py index 052b181..d1e870b 100644 --- a/cms/views.py +++ b/cms/views.py @@ -172,6 +172,11 @@ class DocumentListView(ListView): template_name = 'cms/document_list.html' model = Document + def get_queryset(self, **kwargs): + query = Document.objects.filter(published=True) + return query + + def get_context_data(self, **kwargs): context = super(DocumentListView, self).get_context_data(**kwargs) context['upload'] = UploadDoc.objects.filter(published=True) @@ -184,6 +189,10 @@ class DocumentDetailView(DetailView): class UploadDetailView(DetailView): + """ + Affiche les documents uploadés à la suite des doc. + DocumentsInline + """ template_name = 'cms/upload_detail.html' model = UploadDoc @@ -249,7 +258,6 @@ class ModulePDF(DetailView): doc = MyDocTemplate(response) doc.build(response.story) - return response diff --git a/common/urls.py b/common/urls.py index b65ec71..5af9ee4 100644 --- a/common/urls.py +++ b/common/urls.py @@ -39,5 +39,8 @@ urlpatterns = [ url(r'^documents/$', views.DocumentListView.as_view(), name='document-list'), url(r'^document/(?P\d+)$', views.DocumentDetailView.as_view(), name='document-detail'), url(r'^upload/(?P\d+)$', views.UploadDetailView.as_view(), name='upload-detail'), + + #url(r'^emplois/$', views.EmploiListView.as_view(), name='emploi-list'), url(r'^tinymce/', include('tinymce.urls'), name='tinymce-js'), + ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT ) diff --git a/media/doc/EDS_Calendrier_2017.pdf b/media/doc/EDS_Calendrier_2017.pdf new file mode 100644 index 0000000..009fe9f Binary files /dev/null and b/media/doc/EDS_Calendrier_2017.pdf differ diff --git a/media/doc/EDS_Calendrier_2018.pdf b/media/doc/EDS_Calendrier_2018.pdf new file mode 100644 index 0000000..d4e17eb Binary files /dev/null and b/media/doc/EDS_Calendrier_2018.pdf differ diff --git a/templates/cms/document_list.html b/templates/cms/document_list.html index 42a72e7..c6e1b93 100644 --- a/templates/cms/document_list.html +++ b/templates/cms/document_list.html @@ -18,7 +18,7 @@ {% endfor %} {% for fic in upload %} -
  • {{ fic.titre }} (pdf)
  • +
  • {{ fic.titre }}
  • {% endfor %} diff --git a/templates/cms/documents.html b/templates/cms/documents.html deleted file mode 100644 index 7948359..0000000 --- a/templates/cms/documents.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "./base_site.html" %} -{% load i18n static %} - -{% block extrastyle %}{{ block.super }} -{% endblock %} - -{% block coltype %}colMS{% endblock %} - -{% block bodyclass %}{{ block.super }} dashboard{% endblock %} - -{% block breadcrumbs %} - - {% endblock %} - -{% block content %} - -
    -

    Documents utiles

    -
    -{% endblock %} - - diff --git a/templates/cms/index.html b/templates/cms/index.html index 905d1d1..732b047 100644 --- a/templates/cms/index.html +++ b/templates/cms/index.html @@ -34,7 +34,7 @@ - {{M04.url_code|safe}}     + {{ M04.url_code|safe }}