From 2d3262cb0bd5b435520c3be0c5ca7b279cff9b84 Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Thu, 7 Jan 2016 20:02:07 +0000
Subject: [PATCH] Add processing for <ul> in RML

---
 RIGS/templates/RIGS/event_print_page.xml | 288 ++++++++++++-----------
 RIGS/templatetags/markdown_tags.py       |  14 ++
 db.sqlite3                               | Bin 94208 -> 106496 bytes
 3 files changed, 170 insertions(+), 132 deletions(-)

diff --git a/RIGS/templates/RIGS/event_print_page.xml b/RIGS/templates/RIGS/event_print_page.xml
index 850d0534..a9fa3a46 100644
--- a/RIGS/templates/RIGS/event_print_page.xml
+++ b/RIGS/templates/RIGS/event_print_page.xml
@@ -5,15 +5,19 @@
 
 {% if invoice %}
 
-<blockTable style="invoiceLayout" colWidths="330,165">
-<tr>
+    <blockTable style="invoiceLayout" colWidths="330,165">
+    <tr>
     <td>
-        {% endif %}
+{% endif %}
 
-<h1><b>N{{ object.pk|stringformat:"05d" }}:</b> '{{ object.name }}'<small></small></h1>
+<h1>
+    <b>N{{ object.pk|stringformat:"05d" }}:</b>
+    '{{ object.name }}'
+    <small></small>
+</h1>
 
 <para style="style.event_description">
-<b>{{object.start_date|date:"D jS N Y"}}</b>
+    <b>{{ object.start_date|date:"D jS N Y" }}</b>
 </para>
 
 <keepInFrame>
@@ -28,19 +32,25 @@
         <spacer length="10"/>
         <blockTable style="eventDetails" colWidths="100,175">
             <tr>
-                <td><para style="invoice_titles">Invoice Number</para></td>
+                <td>
+                    <para style="invoice_titles">Invoice Number</para>
+                </td>
                 <td>
                     <para style="invoice_numbers">{{ invoice.pk|stringformat:"05d" }}</para>
                 </td>
             </tr>
             <tr>
-                <td><para style="invoice_titles">Invoice Date</para></td>
+                <td>
+                    <para style="invoice_titles">Invoice Date</para>
+                </td>
                 <td>
                     <para style="invoice_numbers">{{ invoice.invoice_date|date:"d/m/Y" }}</para>
                 </td>
             </tr>
             <tr>
-                <td><para style="invoice_titles">PO Number</para></td>
+                <td>
+                    <para style="invoice_titles">PO Number</para>
+                </td>
                 <td>
                     <para style="invoice_numbers">{{ object.purchase_order|default_if_none:"" }}</para>
                 </td>
@@ -48,94 +58,100 @@
 
         </blockTable>
     </td>
-</tr>
-</blockTable>
+    </tr>
+    </blockTable>
 
 
 {% endif %}
 
 <spacer length="15"/>
 <blockTable style="eventSpecifics" colWidths="165,165,165">
-    <tr>
-        <td leftPadding="0">
-                <h2>Hirer</h2>
-                <h3>{{ object.person.name }}</h3>
-                <h3>{{ object.organisation.name|default_if_none:"" }}</h3>
-                {% if invoice %}
-                    <keepInFrame>
-                        {% if object.organisation.address %}
-                            <para style="specific_description">{{ object.organisation.address|default_if_none:""|linebreaksbr }}</para>
-                        {% elif object.person.address %}
-                            <para style="specific_description">{{ object.person.address|default_if_none:""|linebreaksbr }}</para>
-                        {% endif %}
-                    </keepInFrame>
-                {% endif %}
-                <keepInFrame>
-                    {% if object.person.phone %}
-                        <para style="specific_description">{{ object.person.phone }}</para>
-                    {% elif object.organisation.phone %}
-                        <para style="specific_description">{{ object.organisation.phone }}</para>
-                    {% endif %}
-                </keepInFrame>
-                <keepInFrame>
-                    {% if invoice %}
-                        {% if object.organisation.email %}
-                            <para style="specific_description">{{ object.organisation.email }}</para>
-                        {% elif object.person.email %}
-                            <para style="specific_description">{{ object.person.email }}</para>
-                        {% endif %}
-                    {% else %}
-                        {% if object.person.email %}
-                            <para style="specific_description">{{ object.person.email }}</para>
-                        {% elif object.organisation.email %}
-                            <para style="specific_description">{{ object.organisation.email }}</para>
-                        {% endif %}
-                    {% endif %}
-                </keepInFrame>
-        </td>
-        <td>
-            <h2>Venue</h2>
-            <h3>{{ object.venue.name }}</h3>
-            {% if not invoice %}
+<tr>
+    <td leftPadding="0">
+        <h2>Hirer</h2>
+        <h3>{{ object.person.name }}</h3>
+        <h3>{{ object.organisation.name|default_if_none:"" }}</h3>
+        {% if invoice %}
             <keepInFrame>
-            <para style="specific_description">{{ object.venue.address|default_if_none:""|linebreaksbr }}</para>
+                {% if object.organisation.address %}
+                    <para style="specific_description">{{ object.organisation.address|default_if_none:""|linebreaksbr }}</para>
+                {% elif object.person.address %}
+                    <para style="specific_description">{{ object.person.address|default_if_none:""|linebreaksbr }}</para>
+                {% endif %}
             </keepInFrame>
+        {% endif %}
+        <keepInFrame>
+            {% if object.person.phone %}
+                <para style="specific_description">{{ object.person.phone }}</para>
+            {% elif object.organisation.phone %}
+                <para style="specific_description">{{ object.organisation.phone }}</para>
             {% endif %}
-        </td>
-        <td rightPadding="0">
-            
-                <h2>Timings</h2>
-                <blockTable style="eventDetails" colWidths="55,75">
+        </keepInFrame>
+        <keepInFrame>
+            {% if invoice %}
+                {% if object.organisation.email %}
+                    <para style="specific_description">{{ object.organisation.email }}</para>
+                {% elif object.person.email %}
+                    <para style="specific_description">{{ object.person.email }}</para>
+                {% endif %}
+            {% else %}
+                {% if object.person.email %}
+                    <para style="specific_description">{{ object.person.email }}</para>
+                {% elif object.organisation.email %}
+                    <para style="specific_description">{{ object.organisation.email }}</para>
+                {% endif %}
+            {% endif %}
+        </keepInFrame>
+    </td>
+    <td>
+        <h2>Venue</h2>
+        <h3>{{ object.venue.name }}</h3>
+        {% if not invoice %}
+            <keepInFrame>
+                <para style="specific_description">{{ object.venue.address|default_if_none:""|linebreaksbr }}</para>
+            </keepInFrame>
+        {% endif %}
+    </td>
+    <td rightPadding="0">
+
+        <h2>Timings</h2>
+        <blockTable style="eventDetails" colWidths="55,75">
+            <tr>
+                <td leftPadding="0" topPadding="0">
+                    <h3>Start</h3>
+                </td>
+                <td>
+                    <para style="times">{{ object.start_time|time:"H:i" }}
+                        {{ object.start_date|date:"d/m/Y" }}
+                    </para>
+                </td>
+            </tr>
+            <tr>
+                <td leftPadding="0">
+                    <h3>End</h3>
+                </td>
+                <td>
+                    <para style="times">{{ object.end_time|default_if_none:""|time:"H:i" }}
+                        {{ object.end_date|date:"d/m/Y" }}
+                    </para>
+                </td>
+            </tr>
+            {% if object.access_at and not invoice %}
                 <tr>
-                    <td leftPadding="0" topPadding="0"><h3>Start</h3></td>
-                    <td>
-                        <para style="times">{{ object.start_time|time:"H:i" }}
-                            {{ object.start_date|date:"d/m/Y" }}
-                        </para>
+                    <td leftPadding="0">
+                        <h3>Access</h3>
                     </td>
-                </tr>
-                <tr>
-                    <td leftPadding="0"><h3>End</h3></td>
-                    <td>
-                        <para style="times">{{ object.end_time|default_if_none:""|time:"H:i" }}
-                            {{ object.end_date|date:"d/m/Y" }}
-                        </para>
-                    </td>
-                </tr>
-                {% if object.access_at and not invoice%}
-                <tr>
-                    <td leftPadding="0"><h3>Access</h3></td>
                     <td>
                         <para style="times">{{ object.access_at|time:"H:i" }}
                             {{ object.access_at|date:"d/m/Y" }}
                         </para>
                     </td>
                 </tr>
-                {% endif %}
-                </blockTable>
-        </td>
+            {% endif %}
+        </blockTable>
+    </td>
 
-    </tr>
+</tr>
 </blockTable>
 
 <spacer length="15"/>
@@ -173,12 +189,12 @@
             <para>{{ item.name }}
                 {% if item.description %}
                     </para>
-                    <indent left="1cm">
+                    <indent left="0.5cm">
                         {{ item.description|markdown:"rml" }}
                     </indent>
                     <para>
                 {% endif %}
-            </para>
+                </para>
         </td>
         <td>£ {{ item.cost|floatformat:2 }}</td>
         <td>{{ item.quantity }}</td>
@@ -187,7 +203,7 @@
 {% endfor %}
 </blockTable>
 <keepTogether>
-    <blockTable style="totalTable" colWidths="300,115,80">
+<blockTable style="totalTable" colWidths="300,115,80">
     <tr>
         <td>{% if not invoice %}VAT Registration Number: 116252989{% endif %}</td>
         <td>Total (ex. VAT)</td>
@@ -196,9 +212,9 @@
     <tr>
         <td>
             {% if not invoice %}
-            <para>
-                <b>The full hire fee is payable at least 10 days before the event.</b>
-            </para>
+                <para>
+                    <b>The full hire fee is payable at least 10 days before the event.</b>
+                </para>
             {% endif %}
         </td>
         <td>VAT @ {{ object.vat_rate.as_percent|floatformat:2 }}%</td>
@@ -206,7 +222,7 @@
     </tr>
     <tr>
         <td>
-             
+
             <para>
                 {% if invoice %}
                     VAT Registration Number: 116252989
@@ -214,7 +230,7 @@
                     <b>This contract is not an invoice.</b>
                 {% endif %}
             </para>
-            
+
         </td>
         <td>
             <para>
@@ -227,92 +243,100 @@
             </para>
         </td>
     </tr>
-    </blockTable>
+</blockTable>
 </keepTogether>
 {% if not invoice %}
     <keepTogether>
     <blockTable style="infoTable">
-    <tr>
-        <td>
-            <para>Bookings will
-                <b>not</b>
-                be confirmed until payment is received and the contract is signed.
-            </para>
-        </td>
-    </tr>
-    <tr>
-        <td>24 Hour Emergency Contacts: 07825 065681 and 07825 065678</td>
-    </tr>
+        <tr>
+            <td>
+                <para>Bookings will
+                    <b>not</b>
+                    be confirmed until payment is received and the contract is signed.
+                </para>
+            </td>
+        </tr>
+        <tr>
+            <td>24 Hour Emergency Contacts: 07825 065681 and 07825 065678</td>
+        </tr>
     </blockTable>
     </keepTogether>
     <spacer length="15"/>
     <keepTogether>
 
     <para style="blockPara">
-    <b>To be signed on booking:</b>
+        <b>To be signed on booking:</b>
     </para>
     {% if object.organisation.union_account %}
         <para style="blockPara">
-        <i>
-            I agree that am authorised to sign this invoice. I agree that I am the President/Treasurer of the hirer, or
-            that I have provided written permission from either the President or Treasurer of the hirer stating that I can
-            sign for this invoice.
-        </i>
+            <i>
+                I agree that am authorised to sign this invoice. I agree that I am the President/Treasurer of the hirer,
+                or
+                that I have provided written permission from either the President or Treasurer of the hirer stating that
+                I can
+                sign for this invoice.
+            </i>
         </para>
         <para style="blockPara">
-        <i>
-            I have read, understood and fully accepted the current conditions of hire. I agree to return any dry hire
-            items to TEC PA &amp; Lighting in the same condition at the end of the hire period.
-        </i>
+            <i>
+                I have read, understood and fully accepted the current conditions of hire. I agree to return any dry
+                hire
+                items to TEC PA &amp; Lighting in the same condition at the end of the hire period.
+            </i>
         </para>
 
         <para style="blockPara">
-        <b>
-            Conditions of hire attached and available on the TEC PA &amp; Lighting website. E&amp;OE
-        </b>
+            <b>
+                Conditions of hire attached and available on the TEC PA &amp; Lighting website. E&amp;OE
+            </b>
         </para>
 
         <para style="blockPara">
-        Please return this form directly to TEC PA &amp; Lighting and not the Students' Union Finance Department.
+            Please return this form directly to TEC PA &amp; Lighting and not the Students' Union Finance Department.
         </para>
 
         <blockTable style="signatureTable" colWidths="70,100,325">
-        <tr>
-            <td>Account Code</td>
-            <td></td>
-            <td></td>
-        </tr>
+            <tr>
+                <td>Account Code</td>
+                <td></td>
+                <td></td>
+            </tr>
         </blockTable>
 
     {% else %}
         <para style="blockPara">
-        <i>
-            I, the hirer, have read, understand and fully accept the current conditions of hire. This document forms a
-            binding contract between TEC PA &amp; Lighting and the hirer, the aforementioned conditions of hire forming
-            an integral part of it.
-        </i>
+            <i>
+                I, the hirer, have read, understand and fully accept the current conditions of hire. This document forms
+                a
+                binding contract between TEC PA &amp; Lighting and the hirer, the aforementioned conditions of hire
+                forming
+                an integral part of it.
+            </i>
         </para>
 
         <para style="blockPara">
-        <b>
-            Conditions of hire attached and available on the TEC PA &amp; Lighting website. E&amp;OE
-        </b>
+            <b>
+                Conditions of hire attached and available on the TEC PA &amp; Lighting website. E&amp;OE
+            </b>
         </para>
 
         {% include "RIGS/event_print_signature.xml" %}
         <spacer length="10"/>
         <para style="blockPara">
-        <b>To be signed on the day of the event/hire:</b>
+            <b>To be signed on the day of the event/hire:</b>
         </para>
         <para style="blockPara">
-        <i>
-            I, the hirer, have received the goods/services as requested and in good order. I agree to return any dry hire
-            items to TEC PA &amp; Lighting in a similar condition at the end of the hire period.
-        </i>
+            <i>
+                I, the hirer, have received the goods/services as requested and in good order. I agree to return any dry
+                hire
+                items to TEC PA &amp; Lighting in a similar condition at the end of the hire period.
+            </i>
         </para>
     {% endif %}
 
     {% include "RIGS/event_print_signature.xml" %}
     </keepTogether>
-    {% endif %}
-<namedString id="lastPage"><pageNumber/></namedString>
+{% endif %}
+<namedString id="lastPage">
+<pageNumber/>
+</namedString>
diff --git a/RIGS/templatetags/markdown_tags.py b/RIGS/templatetags/markdown_tags.py
index 1faf6fff..8bdf53e4 100644
--- a/RIGS/templatetags/markdown_tags.py
+++ b/RIGS/templatetags/markdown_tags.py
@@ -30,6 +30,20 @@ def markdown_filter(text, format='html'):
             bq.name = 'pre'
             bq.string = bq.text
 
+        for ul in soup('ul'):
+            ul['value'] = 'square'
+            ul['bulletFontSize'] = '8'
+            for li in ul.findAll('li'):
+                p = soup.new_tag('p')
+                p.string = li.text
+                li.string = ''
+                li.append(p)
+            indent = soup.new_tag('indent')
+            indent['left'] = '1.2cm'
+
+            content = ul.replace_with(indent)
+            indent.append(content)
+
         # Paragraphs have a different tag
         for p in soup('p'):
             p.name = 'para'
diff --git a/db.sqlite3 b/db.sqlite3
index 4d19182313a987fca70b6688c558351949787753..a716944892dc5d5ca7e9627b23ae5d54d9a6a378 100644
GIT binary patch
delta 3961
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

delta 474
zcmZ|L%}Z2K7{~GRoZrki-s4+EG&+W(BD!!Rf<&Mq7^0$!n1zcWTa*;&M%0BcFbNWF
zG&#g2cLN3@V<2~NooS&E<Ko_!ump9XR0f%EWuTI|@R>ir<$>?{@H|g!#TWbPeHHYM
z3LzrXp=KIgd^~LU)SW8SlU}4-`q-$YJS(UU<~)M}gVv3}Gx%R9$`!#e=uW#%cD3r5
z9kyu6TjWUyBskfTde7<BJ#K-i9#P<CzL9TKhFU`5=R^HZ%d;;t-a$>ihg2-?w&^DK
zo*Z~$9lC+q5+&LAjt`i{IQr0r8sy4->B_7-DfP&|LhJoSySLOphKCjr{KpwiaEPD$
zZ5x~Tf{az?pC{XSKptskKn*1dj=&|(@fSzf!!CBPg>`&_!)gMilSB78iVB?K7b|N>
zBZ&pX@fs6|a?}eus_3P^G!N-(D5SZ23p1TV&736#k9LaR4DK?y!KlmZGLoFVftd_a
zCugawc7{LL#}6KB6QA)Bt5`vbvl*DFGV0)~Gzu2p@l7JAhatboB{?PgWFxOyCS|oU
Rrz_~TUcOLvZw1A>t^i*2nPmU~