Pārlūkot izejas kodu

Merge branch 'feature/V8-6901-finaliser-le-format-de-la-licenc' into develop

Olivier Massot 9 mēneši atpakaļ
vecāks
revīzija
9f7ac44101

BIN
public/fonts/CaviarDreams/CaviarDreams.ttf


BIN
public/fonts/CaviarDreams/CaviarDreams_Bold.ttf


BIN
public/fonts/CaviarDreams/CaviarDreams_BoldItalic.ttf


BIN
public/fonts/CaviarDreams/CaviarDreams_Italic.ttf


+ 130 - 100
templates/export/licence_cmf.html.twig

@@ -1,3 +1,8 @@
+{#
+    La licence CMF d'une structure
+    Important: la carte doit mesurer précisément 85 x 54 mm, et être au format paysage.
+#}
+
 <!DOCTYPE html>
 <html lang="fr">
 <head>
@@ -5,6 +10,19 @@
     <style media="all">
 
         {% block style %}
+        @font-face {
+            font-family: 'CaviarDreams';
+            src: url('/fonts/CaviarDreams/CaviarDreams.ttf') format('truetype');
+            font-weight: normal;
+            font-style: normal;
+        }
+        @font-face {
+            font-family: 'CaviarDreams';
+            src: url('/fonts/CaviarDreams/CaviarDreams_Bold.ttf') format('truetype');
+            font-weight: bold;
+            font-style: normal;
+        }
+
         html {
             word-wrap: break-word;
         }
@@ -17,47 +35,47 @@
         }
 
         .Style1 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
             font-size: 12px;
             font-weight: bold;
             color: #FFFFFF;
         }
 
         .Style2 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
-            font-size: 12px;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
+            font-size: 10px;
             font-weight: bold;
         }
 
         .Style3 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
             font-size: 8px;
             color: #FFFFFF;
             vertical-align: text-top;
         }
 
         .Style4 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
-            font-size: 9px;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
+            font-size: 8px;
         }
 
         .Style5 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
             font-size: 10px;
         }
 
         .Style7 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
             font-size: 16px;
         }
 
         .Style8 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
             font-size: 12px;
         }
 
         .Style9 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
             font-size: 12px;
             font-weight: bold;
         }
@@ -82,8 +100,8 @@
 
         #year_card {
             position: absolute;
-            bottom: 94px;
-            left: 55px;
+            bottom: 52px;
+            left: 52px;
             color: #9d1348;
             font-size: 14px;
             font-weight: bold;
@@ -94,6 +112,15 @@
             padding: 0;
         }
 
+        .Style2 p {
+            line-height: 10px;
+            max-width: 220px;
+        }
+
+        .Style4 p {
+            line-height: 9px;
+        }
+
         .page_break {
             page-break-before: always;
             top: 0 !important;
@@ -110,13 +137,18 @@
         }
 
         .card_dimension {
-            width: 110mm;
-            height: 72mm;
+            width: 85mm;
+            height: 54mm;
+        }
+
+        .card_internal_dimension {
+            width: 82mm;
+            height: 50mm;
         }
 
         #dashed {
-            width: 106mm;
-            height: 66mm;
+            width: 85mm;
+            height: 54mm;
             border: 1px dashed #0f0f0f;
             position: absolute;
             border-radius: 4px;
@@ -163,7 +195,7 @@
 {% block content %}
     {% for licence in model.licences %}
         <page data-iri="{{ licence.id }}">
-            <table width="500" border="0" cellspacing="0" cellpadding="0">
+            <table width="550" border="0" cellspacing="0" cellpadding="0">
                 <tbody>
                 <tr>
                     <td width="500">
@@ -225,95 +257,93 @@
 
             <div id="card" class="card_dimension">
                 <table class="card_dimension" align="center" cellpadding="0" cellspacing="0">
-                    <tbody>
-                    <tr>
-                        <td height="26" colspan="3" align="center" valign="bottom" bgcolor="{{ licence.color }}">
-                            <div align="center"><span class="Style1">Licence CMF</span></div>
-                        </td>
-                    </tr>
-                    <tr class="up">
-                        {% if licence.isOrganizationLicence %}
-                            <td height="82" width="80" id="avatar">
-                                <div align="center">
-                                    {% if(licence.logo is null) %}
-                                        <img src="{{ 'images/picto_face.png' }}"
-                                             width="85"
-                                             height="82"/>
-                                    {% else %}
-                                        <img src="{{ fileImagePath(licence.logo, 'sm') }}"
-                                             width="85"
-                                             height="82"/>
-                                    {% endif %}
-                                </div>
-                            </td>
-                            <td colspan="2">
-                                <span class="Style2">
-                                    <p>{{ licence.personLastName }} {{ licence.personFirstName }}</p>
-                                    <p>{{ licence.organizationName }}</p>
-                                    <p>{{ licence.federationName }}</p>
-                                    <p>N° : {{ licence.organizationIdentifier }}</p>
-                                    <p>Licence valable jusqu’au 31/12/{{ licence.year }}</p>
-                                </span>
+                    <tbody class="card_internal_dimension">
+                        <tr>
+                            <td height="18" colspan="3" align="center" valign="bottom" bgcolor="{{ licence.color }}">
+                                <div align="center"><span class="Style1">Licence CMF</span></div>
                             </td>
-                        {% else %}
-                            <td height="26" width="80" id="avatar">
+                        </tr>
+                        <tr class="up">
+                            {% if licence.isOrganizationLicence %}
+                                <td height="62" width="62" id="avatar">
+                                    <div align="center">
+                                        {% if(licence.logo is null) %}
+                                            <img src="{{ 'images/picto_face.png' }}"
+                                                 height="62"/>
+                                        {% else %}
+                                            <img src="{{ fileImagePath(licence.logo, 'sm') }}"
+                                                 height="62"/>
+                                        {% endif %}
+                                    </div>
+                                </td>
+                                <td height="72" colspan="2">
+                                    <span class="Style2">
+                                        <p>{{ licence.personLastName }} {{ licence.personFirstName }}</p>
+                                        <p>{{ licence.organizationName }}</p>
+                                        <p>{{ licence.federationName }}</p>
+                                        <p>N° : {{ licence.organizationIdentifier }}</p>
+                                        <p>Licence valable jusqu’au 31/12/{{ licence.year }}</p>
+                                    </span>
+                                </td>
+                            {% else %}
+                                <td height="62" width="62" id="avatar">
+                                    <div align="center">
+                                        {% if(licence.personAvatar is null) %}
+                                            <img
+                                                    src="{{ 'images/picto_face.png' }}"
+                                                    height="62"/>
+                                        {% else %}
+                                            <img class="avatar"
+                                                 src="{{ fileImagePath(licence.personAvatar, 'sm') }}"/>
+                                        {% endif %}
+                                    </div>
+                                </td>
+                                <td colspan="2">
+                                    <span class="Style2">
+                                       <p>{{ licence.personLastName }} {{ licence.personFirstName }}</p>
+                                       <p>{{ licence.organizationName }}</p>
+                                       <p>?</p>
+                                       <p>N° : {{ licence.organizationIdentifier }}-{{ licence.personId }}</p>
+                                       <p>Licence valable jusqu’au 31/12/{{ licence.year }}</p>
+                                    </span>
+                                </td>
+                            {% endif %}
+                        </tr>
+
+                        <tr class="top">
+                            <td height="54" width="84" valign="middle"
+                                style="vertical-align: bottom;">
                                 <div align="center">
-                                    {% if(licence.personAvatar is null) %}
-                                        <img
-                                                src="{{ 'images/picto_face.png' }}"
-                                                width="85"
-                                                height="82"/>
-                                    {% else %}
-                                        <img class="avatar"
-                                             src="{{ fileImagePath(licence.personAvatar, 'sm') }}"/>
-                                    {% endif %}
+                                    <img src="{{ 'images/cmf_licence.png' }}"
+                                         height="35"/>
+                                    <span id="year_card">{{ licence.year }}</span>
                                 </div>
                             </td>
-                            <td colspan="2">
-                                <span class="Style2">
-                                   <p>{{ licence.personLastName }} {{ licence.personFirstName }}</p>
-                                   <p>{{ licence.organizationName }}</p>
-                                   <p>?</p>
-                                  <p>N° : {{ licence.organizationIdentifier }}-{{ licence.personId }}</p>
-                                <p>Licence valable jusqu’au 31/12/{{ licence.year }}</p>
-                                </span>
+
+                            <td width="112" align="right" valign="middle">
+                                <div align="right"><span class="Style4">
+                                    <p>Consultez vos</p>
+                                    <p> avantages sur</p>
+                                    <p>www.cmf-musique.org</p>
+                                    <p> ou flashez ce code</p></span>
+                                </div>
                             </td>
-                        {% endif %}
-                    </tr>
-
-                    <tr class="bottom">
-                        <td height="45" width="70" valign="middle"
-                            style="vertical-align: top;">
-                            <div align="center">
-                                <img src="{{ 'images/cmf_licence.png' }}"
-                                     height="45"/>
-                                <span id="year_card">{{ licence.year }}</span>
-                            </div>
-                        </td>
-                        <td width="140" align="right" valign="middle">
-                            <div align="right"><span class="Style4">
-                                <p>Consultez vos</p>
-                                <p> avantages sur</p>
-                                <p>www.cmf-musique.org</p>
-                                <p> ou flashez ce code</p></span>
-                            </div>
-                        </td>
-                        <td height="65" width="70" align="right" valign="middle" id="qrCode">
-                            {% if(licence.qrCode) %}
-                                <img style="margin-right: 10px;"
-                                     src="{{ fileImagePath(licence.qrCode, 'sm') }}"
-                                     alt=""
-                                     width="65" height="65"/>
-                            {% endif %}
-                        </td>
-                    </tr>
 
-                    <tr>
-                        <td height="26" colspan="3" align="center" bgcolor="{{ licence.color }}">
-                            <span class="Style3">CMF ● cmf@cmf-musique.org ● 01 55 58 22 82 ● www.cmf-musique.org</span>
-                        </td>
-                    </tr>
+                            <td height="45" width="45" align="right" valign="middle" id="qrCode">
+                                {% if(licence.qrCode) %}
+                                    <img style="margin-right: 10px;"
+                                         src="{{ fileImagePath(licence.qrCode, 'sm') }}"
+                                         alt=""
+                                         width="50" height="50"/>
+                                {% endif %}
+                            </td>
+                        </tr>
 
+                        <tr>
+                            <td height="22" colspan="3" align="center" bgcolor="{{ licence.color }}">
+                                <span class="Style3">CMF - cmf@cmf-musique.org - 01 55 58 22 82 - www.cmf-musique.org</span>
+                            </td>
+                        </tr>
                     </tbody>
                 </table>
 
@@ -322,7 +352,7 @@
             </div>
 
 
-            <table width="500" border="0" cellspacing="0" cellpadding="0">
+            <table width="550" border="0" cellspacing="0" cellpadding="0">
                 <tbody>
                 <tr>
                     <td></td>