arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-10 00:39:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'vagrant' into hotfixes

Browse Source
This commit is contained in:
Tom Price
2015-07-23 21:08:44 +01:00
parent 72bf28da53 0890a1ec01
commit 5bb7283f2d
25 changed files with 827 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RIGS/templates/RIGS/event_print_page.xml
View File

@@ -14,7 +14,7 @@
<b>{{object.start_date|date:"D jS N Y"}}</b>
</para>
<keepInFrame maxHeight="30">
<keepInFrame>
<para style="style.event_description">
{{ object.description|default_if_none:""|linebreaksbr }}
</para>
@@ -268,7 +268,7 @@
<para style="blockPara">
<b>
Conditions of hire available on request or on the TEC PA &amp; Lighting website. E&amp;OE
Conditions of hire attached and available on the TEC PA &amp; Lighting website. E&amp;OE
</b>
</para>
@@ -295,7 +295,7 @@
<para style="blockPara">
<b>
Conditions of hire available on request or on the TEC PA &amp; Lighting website. E&amp;OE
Conditions of hire attached and available on the TEC PA &amp; Lighting website. E&amp;OE
</b>
</para>