Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ticket-testing' into 'master'

Browse source 
Tweak invoice template so that instructional text does not print.

See merge request LCA2018/symposion_app!63
This commit is contained in:
James Polley 2017-10-11 11:16:40 +00:00
commit 1725664aec
9 changed files with 100 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pinaxcon/templates/registrasion/invoice.html
View file

@ -8,11 +8,11 @@
<p>Monday 22 January&ndash;Friday 26 January 2018.</p>
<p>University of Technology Sydney, New South Wales, Australia.</p>
{% endblock %}
{% block header_inset_image %}{% illustration "tuz.svg" %}{% endblock %}
{% block header_inset_image %}{% illustration "LCA18_nodate.svg" %}{% endblock %}
{% block header_background_image %}{% static "lca2018/images/wp_bg_optimised.jpg" %}{% endblock %}
{% block content %}
<div class="hidden-print">
{% if invoice.is_unpaid %}
<p>
<strong>NOTICE:</strong> The below invoice is automatically generated, and
@ -43,7 +43,7 @@
</div>
{% endif %}
{% endif %}
</div>
<hr />
{% include "registrasion/_invoice_details.html" %}

5
pinaxcon/templates/site_base.html
View file

@ -27,10 +27,11 @@
</head>
<body class="{% block body_class %}{% endblock %}">
<div class="container">
<header class="banner clearfix hidden-print">
{% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %}
</header>
{% if messages %}
<ul class="messagelist">
<ul class="messagelist hidden-print">
{% for message in messages %}
<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
{% endfor %}

2
pinaxcon/templatetags/lca2018_tags.py
View file

@ -36,7 +36,7 @@ def proposal_permission(context, permname, proposal):
@register.simple_tag(takes_context=False)
def illustration(name):
return staticfiles.static('lca2018/images/svgs/illustrations/') + name
return staticfiles.static('lca2018/images/') + name
@register.simple_tag(takes_context=True)

5
static/src/css/app.css
View file

@ -108,6 +108,11 @@ div.system-message p.system-message-title {
padding: 5px 0 0 12px;
}
.bio {
font-family: Hack, monospace;
white-space: pre-wrap;
}
/**
* The CSS shown here will not be introduced in the Quickstart guide, but shows
* how you can use CSS to style your Element's container.

BIN
static/src/lca2018/images/LA_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.6 KiB

1
static/src/lca2018/images/LCA18_full.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 9.5 KiB

16
static/src/lca2018/images/LCA18_minimal.svg Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 314 129" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
<g transform="matrix(1,0,0,1,-140.826,-647.568)">
<path d="M358.061,775.769L358.061,769.59L361.186,766.573C364.527,763.304 366.431,761.795 366.431,759.927C366.431,758.633 365.82,758.49 363.629,758.49C361.33,758.49 358.492,759.029 358.492,759.029L358.133,752.886C358.133,752.886 361.869,751.557 365.928,751.557C371.317,751.557 374.658,753.999 374.658,758.741C374.658,762.872 373.472,764.884 369.557,767.614L367.15,769.303L374.514,769.303L374.514,775.769L358.061,775.769Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M384.978,764.029C384.978,768.843 385.229,769.597 386.199,769.597C387.169,769.597 387.421,768.843 387.421,764.029C387.421,759.215 387.205,758.497 386.199,758.497C385.194,758.497 384.978,759.215 384.978,764.029M395.575,764.029C395.575,772.507 393.384,776.351 386.199,776.351C379.015,776.351 376.823,772.507 376.823,764.029C376.823,755.551 379.194,751.743 386.199,751.743C393.42,751.743 395.575,755.551 395.575,764.029" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M404.996,752.096L411.857,752.096L411.857,775.77L403.703,775.77L403.703,760.825L398.745,762.801L396.59,756.982L404.996,752.096Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M423.532,758.944C423.532,760.058 424.215,760.74 424.215,760.74L425.184,760.74C425.184,760.74 425.867,760.022 425.867,758.944C425.867,757.902 425.58,757.327 424.646,757.327C423.712,757.327 423.532,757.938 423.532,758.944M426.119,768.284C426.119,766.991 425.184,766.165 425.184,766.165L424.215,766.165C424.215,766.165 423.245,766.955 423.245,768.284C423.245,769.398 423.712,769.865 424.682,769.865C425.651,769.865 426.119,769.506 426.119,768.284M433.734,757.759C433.734,760.776 433.195,762.141 431.004,763.434C433.483,764.656 434.094,765.841 434.094,769.182C434.094,774.535 429.711,775.936 424.682,775.936C419.652,775.936 415.27,774.535 415.27,769.11C415.27,765.841 416.168,764.728 418.395,763.399C416.311,762.141 415.701,760.812 415.701,757.723C415.701,752.873 419.58,751.328 424.682,751.328C429.783,751.328 433.734,752.55 433.734,757.759" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M140.827,680.848L140.827,763.405L174.107,730.124L174.107,647.568L140.827,680.848Z" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
<path d="M174.107,730.124L140.827,763.405L140.826,763.405L223.383,763.405L256.663,730.124L174.107,730.124Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M290.485,647.568L255.642,682.411L232.109,705.944L279.174,705.944L337.551,647.568L290.485,647.568Z" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
<path d="M290.485,764.32L232.109,705.944L279.174,705.944L337.551,764.32L290.485,764.32Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M396.077,659.618L396.077,659.772L395.924,659.618L395.924,706.684L396.077,706.531L396.077,706.684L454.453,765.06L454.453,717.995L396.077,659.618Z" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
<path d="M337.701,717.995L396.077,659.619L396.077,706.684L337.701,765.061L337.701,717.995Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

27
static/src/lca2018/images/LCA18_nodate.svg Normal file
View file

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 318 162" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
<g transform="matrix(1,0,0,1,-138.874,-368.79)">
<path d="M358.868,486.722L358.868,480.47L362.03,477.417C365.411,474.109 367.338,472.583 367.338,470.691C367.338,469.383 366.72,469.237 364.502,469.237C362.176,469.237 359.304,469.783 359.304,469.783L358.941,463.568C358.941,463.568 362.721,462.222 366.829,462.222C372.281,462.222 375.662,464.694 375.662,469.492C375.662,473.672 374.462,475.708 370.5,478.47L368.065,480.179L375.516,480.179L375.516,486.722L358.868,486.722Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M386.106,474.843C386.106,479.714 386.36,480.477 387.342,480.477C388.323,480.477 388.578,479.714 388.578,474.843C388.578,469.972 388.36,469.245 387.342,469.245C386.324,469.245 386.106,469.972 386.106,474.843M396.829,474.843C396.829,483.422 394.611,487.311 387.342,487.311C380.072,487.311 377.854,483.422 377.854,474.843C377.854,466.264 380.254,462.411 387.342,462.411C394.648,462.411 396.829,466.264 396.829,474.843" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M406.361,462.768L413.304,462.768L413.304,486.723L405.052,486.723L405.052,471.601L400.036,473.6L397.855,467.712L406.361,462.768Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M425.117,469.697C425.117,470.824 425.808,471.515 425.808,471.515L426.789,471.515C426.789,471.515 427.48,470.788 427.48,469.697C427.48,468.643 427.189,468.061 426.244,468.061C425.299,468.061 425.117,468.679 425.117,469.697M427.734,479.148C427.734,477.84 426.789,477.003 426.789,477.003L425.808,477.003C425.808,477.003 424.826,477.803 424.826,479.148C424.826,480.275 425.299,480.748 426.28,480.748C427.262,480.748 427.734,480.384 427.734,479.148M435.441,468.497C435.441,471.551 434.895,472.932 432.678,474.241C435.186,475.477 435.804,476.676 435.804,480.057C435.804,485.473 431.369,486.891 426.28,486.891C421.191,486.891 416.756,485.473 416.756,479.984C416.756,476.676 417.665,475.549 419.919,474.204C417.811,472.932 417.193,471.587 417.193,468.461C417.193,463.554 421.118,461.991 426.28,461.991C431.442,461.991 435.441,463.227 435.441,468.497" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M139.053,402.466L139.053,486.004L172.729,452.328L172.729,368.79L139.053,402.466Z" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
<path d="M172.729,452.328L139.053,486.004L222.591,486.004L256.267,452.328L172.729,452.328Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M290.489,368.791L255.231,404.048L231.419,427.861L279.044,427.861L338.114,368.791L290.489,368.791Z" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
<path d="M290.489,486.931L231.419,427.861L279.044,427.861L338.114,486.931L290.489,486.931Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M397.336,369.191L397.336,369.346L397.181,369.191L397.181,416.816L397.336,416.661L397.336,416.816L456.406,475.886L456.406,428.261L397.336,369.191Z" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
<path d="M338.266,428.262L397.336,369.192L397.336,416.817L338.266,475.887L338.266,428.262Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M138.874,529.534L138.874,495.345L150.713,495.345L150.713,519.89L161.837,519.89L161.837,529.534L138.874,529.534Z" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
<rect x="163.827" y="495.344" width="11.839" height="34.189" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
<path d="M178.727,495.344L190.362,495.344L198.22,508.305L198.934,508.305L198.934,495.344L210.773,495.344L210.773,529.533L199.087,529.533L191.331,515.602L190.566,515.602L190.566,529.533L178.727,529.533L178.727,495.344Z" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
<path d="M225.468,517.746C225.468,519.685 226.335,520.451 228.683,520.451C231.03,520.451 231.847,519.685 231.847,517.746L231.847,495.344L243.685,495.344L243.685,517.083C243.685,527.033 238.633,530.197 228.683,530.197C218.732,530.197 213.629,527.237 213.629,517.287L213.629,495.344L225.468,495.344L225.468,517.746Z" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
<path d="M259.759,504.734L263.739,495.345L275.374,495.345L267.975,511.623L274.915,529.534L262.77,529.534L259.759,520.451L256.646,529.534L244.603,529.534L251.901,513.154L244.603,495.345L256.646,495.345L259.759,504.734Z" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
<path d="M299.816,528.87C299.816,528.87 294.407,530.197 288.845,530.197C277.618,530.197 274.251,526.216 274.251,512.337C274.251,498.865 277.516,494.681 289.355,494.681C293.182,494.681 299.816,496.058 299.816,496.058L299.51,505.193C299.51,505.193 295.325,504.682 291.702,504.682C287.161,504.682 286.191,505.601 286.191,512.337C286.191,519.226 287.212,520.195 291.702,520.195C295.325,520.195 299.663,519.889 299.663,519.889L299.816,528.87Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M321.503,512.439C321.503,507.183 321.095,504.274 317.166,504.274C313.389,504.274 312.828,507.183 312.828,512.439C312.828,517.695 313.389,520.604 317.166,520.604C321.044,520.604 321.503,517.644 321.503,512.439M300.887,512.439C300.887,499.988 305.786,494.681 317.166,494.681C328.545,494.681 333.444,499.988 333.444,512.439C333.444,524.89 328.545,530.197 317.166,530.197C305.939,530.197 300.887,524.89 300.887,512.439" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M335.791,495.344L347.426,495.344L355.284,508.305L355.998,508.305L355.998,495.344L367.837,495.344L367.837,529.533L356.152,529.533L348.395,515.602L347.63,515.602L347.63,529.533L335.791,529.533L335.791,495.344Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M370.898,495.344L395.545,495.344L395.545,504.988L382.737,504.988L382.737,510.5L392.483,510.5L392.483,520.144L382.737,520.144L382.737,529.533L370.898,529.533L370.898,495.344Z" style="fill:rgb(78,135,160);fill-rule:nonzero;"/>
<path d="M406.873,516.572L411.925,516.572L410.088,504.631L408.812,504.631L406.873,516.572ZM400.443,495.344L418.354,495.344L426.06,529.533L414.119,529.533L413.15,525.604L405.342,525.604L404.526,529.533L392.891,529.533L400.443,495.344Z" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
<path d="M438.153,517.746C438.153,519.685 439.021,520.451 441.368,520.451C443.715,520.451 444.532,519.685 444.532,517.746L444.532,495.344L456.37,495.344L456.37,517.083C456.37,527.033 451.318,530.197 441.368,530.197C431.417,530.197 426.314,527.237 426.314,517.287L426.314,495.344L438.153,495.344L438.153,517.746Z" style="fill:rgb(91,194,231);fill-rule:nonzero;"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

44
static/src/lca2018/images/Tux-simple.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 9.9 KiB