FIX_css_domain_list.html

cms/admin.py

@@ -39,6 +39,7 @@ class ModuleAdmin(admin.ModelAdmin):
     inlines = [CompetenceInline]
     readonly_fields = ('total_presentiel',)
     extra = 0
+
     fields = (('code', 'nom'),
               'situation',
               ('contenu', 'contenu_published'),
@@ -49,8 +50,8 @@ class ModuleAdmin(admin.ModelAdmin):
               ('type', ),
               'processus',
               )
-    
+
-    
+
 class ProcessusAdmin(admin.ModelAdmin):   
     form = ProcessusAdminForm
 

cms/models.py

@@ -70,7 +70,7 @@ class Domaine(models.Model):
         return '{0} - {1}'.format(self.code, self.nom)
     
     def url(self):
-        return "<a href='/domaine/{0}'>{1}</a>".format(self.pk, self.__str__())
+        return "<a href='/domaine/{0}/'>{1}</a>".format(self.pk, self.__str__())
 
 
 class Processus(models.Model):
@@ -121,10 +121,10 @@ class Module(models.Model):
         return '{0} - {1}'.format(self.code, self.nom)
     
     def url(self):
-        return "<a href='/module/{0}'>{1}</a>".format(self.pk, self.__str__())
+        return "<a href='/module/{0}/'>{1}</a>".format(self.pk, self.__str__())
     
     def url_code(self):
-        return "<a href='/module/{0}' title=\"{2}\">{1}</a>".format(self.pk, self.code, self.nom)
+        return "<a href='/module/{0}/' title=\"{2}\">{1}</a>".format(self.pk, self.code, self.nom)
 
     @property
     def total_presentiel(self):

cms/pdf.py

@@ -55,6 +55,7 @@ class EpcBaseDocTemplate(SimpleDocTemplate):
         self.title = title
 
     def header(self, canvas, doc):
+
         canvas.saveState()
         canvas.drawImage(LOGO_EPC, doc.leftMargin, doc.height - 0.5 * cm, 5 * cm, 3 * cm, preserveAspectRatio=True)
         canvas.drawImage(LOGO_ESNE, doc.width - 2 * cm, doc.height - 0.5 * cm, 5 * cm, 3 * cm,

common/settings.py

@@ -16,7 +16,6 @@ import os
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-print(BASE_DIR)
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/
@@ -25,7 +24,7 @@ print(BASE_DIR)
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = ['eds.webzos.net', 'eds.webzos.ch', 'localhost', '127.0.0.1']
+ALLOWED_HOSTS = ['eds.webzos.net', 'localhost', '127.0.0.1']
 
 
 # Application definition

common/urls.py

@@ -14,7 +14,7 @@ Including another URLconf
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
 import os
-from django.urls import path, include
+from django.urls import path, re_path, include
 from django.contrib import admin
 from django.conf import settings
 from django.views.static import serve

periode_formation.pdf

@@ -0,0 +1,80 @@
+%PDF-1.4
+%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
+1 0 obj
+<<
+/F1 2 0 R /F2 3 0 R
+>>
+endobj
+2 0 obj
+<<
+/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
+>>
+endobj
+3 0 obj
+<<
+/BaseFont /Helvetica-Bold /Encoding /WinAnsiEncoding /Name /F2 /Subtype /Type1 /Type /Font
+>>
+endobj
+4 0 obj
+<<
+/Contents 8 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 7 0 R /Resources <<
+/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
+>> /Rotate 0 /Trans <<
+
+>> 
+  /Type /Page
+>>
+endobj
+5 0 obj
+<<
+/Outlines 9 0 R /PageMode /UseNone /Pages 7 0 R /Type /Catalog
+>>
+endobj
+6 0 obj
+<<
+/Author (anonymous) /CreationDate (D:20171030180401-01'00') /Creator (ReportLab PDF Library - www.reportlab.com) /Keywords () /ModDate (D:20171030180401-01'00') /Producer (ReportLab PDF Library - www.reportlab.com) 
+  /Subject (unspecified) /Title (untitled) /Trapped /False
+>>
+endobj
+7 0 obj
+<<
+/Count 1 /Kids [ 4 0 R ] /Type /Pages
+>>
+endobj
+8 0 obj
+<<
+/Filter [ /ASCII85Decode /FlateDecode ] /Length 1262
+>>
+stream
+Gb!#\9lJcG&A@sBbcSK?E5`?9p"%qn$P[=&1d:>]Q"`aB,c^][gOJ+S6ohN9MNl]n$6t.fE9<:QH1-lh&E&<Rc`@9EHOYJ<Tg0Ks[m1*/YeGjmor<Tt,#QK\$6l/h8^[_YAL'q_!AkCAKa\k'\#Z\_C3,8s6p\a7U_0;P`X&dUL;,UXeH!O<"p5FC0_jBO3WdGQX@r?K<gB]P0KK(FemDh`nmj"?)%d;K:B?CZE(>on&$)-$UO33f]3]ZkY$0I+f]VO$QjF)0_6e40A'"Q.BfM'^INc$kQaPUK\>6-Ws*.'nI>2uN#E6n]M\=(j$?VT'`1;1(l9KdDMS@%U3A>:I/4Q"e.oBF8SSU42p'nAiIsO3b":7t"D8VO)b[R[0lagtUG,M"!R!:*8A*,\8L,8YY=Jq4>mSme=Redd4>$2:rjaaSoZOgW+?6@dD7+pk&oNB;'!aG:&`Gk)_rd;!Kq=GG0^*+p[Q:4UO@hFQ-duO3,+:E,W;ZWde<P!^d*"*N<+X#k*4O-\YRQ/JqS@&ASIbYnqc;(a`*R7Z=D4'Fjn0:ij5pXc'5NNFIi6UeOG%eHBs4Y(!`eHULBog@,^+[&[_aiV*,55ee)`Tolg\Nil<n-\PVlI`oD]:UL*G71j?<WpuQ8uebaUqtNoq!iBP@FnH+qg$Iag!ZK0oa&hKG!H'@CV4L2Lt>ZKUE8>UMR/1np8qqF<M6`*CmHB*-.L>bqj,M'=4lB$]Sl><lt@<1052SY'QT[m:32#@s=1f>!Fm3KsA#a7ou1-4;_ULdi^&BX3Bo?:-QC9XitCH79jH1Va<[4K]6>pj1Qpa9jiT_n[VJ.3V@'GA>%ig<UG9uk8a<-23:tuN3WSlLTZbdRC`V!GEiasabMX'YE++`>=B%9bB\?(N1BaIG^eOu48D/Q]12PfcpC2iYRG)MahEtLdj8h5d*%K:$csU(SZa7r`@Qu0b#27nT\'M"2nI9'/<hU8N.4o4H+@u/P(9Gmp3((@;hBSuIpYK/h^^+H_p?#J?BqqtVOCr&NQ:[^Y&nqdcTHn@.e2U_'78Pm4NP4YTKnBOAXO?gZTk)>-Q2NcNE3@[dAkS)NS3bRIB($Hm`Z]e<+08ll`/EfhDqWR_e3lk(V>`KES:5f2h)@P87R)aJZ&O)9`0kir3bSL'7T#:YAL>(mDaM;2R!&&C5Ij>W&7oOL>MG^ZjVpN46's.l?UY8Zl&u7ArPE\?Gs=P'd$sNR*+BG!En_`(8oW.Kp</[*GtL@^L6^J[_M^b~>endstream
+endobj
+9 0 obj
+<<
+/Count 0 /Type /Outlines
+>>
+endobj
+xref
+0 10
+0000000000 65535 f 
+0000000073 00000 n 
+0000000114 00000 n 
+0000000221 00000 n 
+0000000333 00000 n 
+0000000536 00000 n 
+0000000620 00000 n 
+0000000916 00000 n 
+0000000975 00000 n 
+0000002328 00000 n 
+trailer
+<<
+/ID 
+[<0e2e2fec18011ae2c0893bcb52b1c1e1><0e2e2fec18011ae2c0893bcb52b1c1e1>]
+% ReportLab generated PDF document -- digest (http://www.reportlab.com)
+
+/Info 6 0 R
+/Root 5 0 R
+/Size 10
+>>
+startxref
+2374
+%%EOF

templates/cms/base.html

@@ -1,4 +1,5 @@
-{% load i18n static %}<!DOCTYPE html>
+<!DOCTYPE html>
+{% load i18n static %}
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
 <html lang="{{ LANGUAGE_CODE|default:"fr" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 <head>
@@ -6,7 +7,7 @@
 
     <link rel="stylesheet" type="text/css" href="{% static 'admin/css/base.css' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'admin/css/dashboard.css' %}" />
-    <link rel="stylesheet" type="text/css" href="{% static 'css/main.css' %}" />
+    <link rel="stylesheet" type="text/css" href="{% static 'css/main3.css' %}" />
     <script type="text/javascript" src="{% static 'js/tiny_mce/tiny_mce.js' %}"></script>
     {% block extrastyle %}{% endblock %}
     {% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static 'admin/css/rtl.css' %}{% endblock %}" />{% endif %}

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="{% url 'module-detail' c.module.id %}">{{ m }}</a></div>
+            <div class="module">Module:  <a href="{% url 'module-detail' m.id %}">{{ m }}</a></div>
             <div class="competence">Compétences visées</div>
             {% for c in m.competences.all %}
                 <div class="competence">{{ c }}</div>

templates/cms/domaine_list.html

@@ -1,5 +1,6 @@
 {% extends "./base_site.html" %}
 {% load i18n static %}
+
 {% block coltype %}colMS{% endblock %}
 {% block bodyclass %}{{ block.super }}{% endblock %}
 {% block content %}