1
=== modified file 'summit/schedule/templates/schedule/attend.html'
2
--- summit/schedule/templates/schedule/attend.html	2012-10-20 20:12:17 +0000
3
+++ summit/schedule/templates/schedule/attend.html	2012-10-26 01:04:21 +0000
4
@@ -32,7 +32,7 @@
5
32
                {{ form.as_template }}
32
                {{ form.as_template }}
6
33
		{% if meeting.drafter.name = meeting.approver.name %}
33
		{% if meeting.drafter.name = meeting.approver.name %}
7
34
                <p id="twitter_update_list" style="color: black;">If you feel that your participation is required for this topic, please contact {{ meeting.approver.name }}, otherwise, please select one of the options above.</p>
34
                <p id="twitter_update_list" style="color: black;">If you feel that your participation is required for this topic, please contact {{ meeting.approver.name }}, otherwise, please select one of the options above.</p>
9
35
		{% else}
35
		{% else %}
10
36
                <p id="twitter_update_list" style="color: black;">If you feel that your participation is required for this topic, please contact {{ meeting.drafter.name }} or {{ meeting.approver.name }}, otherwise, please select one of the options above.</p>
36
                <p id="twitter_update_list" style="color: black;">If you feel that your participation is required for this topic, please contact {{ meeting.drafter.name }} or {{ meeting.approver.name }}, otherwise, please select one of the options above.</p>
11
37
		{% endif %}
37
		{% endif %}
12
38
                {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
38
                {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
Status:	Merged
Approved by:	Nigel Babu on 2012-10-26
Approved revision:	466
Merged at revision:	466
Proposed branch:	lp:~jose/summit/plain-else-attend-fix
Merge into:	lp:summit
Diff against target:	12 lines (+1/-1) 1 file modified summit/schedule/templates/schedule/attend.html (+1/-1)
To merge this branch:	bzr merge lp:~jose/summit/plain-else-attend-fix
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Nigel Babu (community)		2012-10-26	Approve on 2012-10-26
Review via email: mp+131508@code.launchpad.net
1	=== modified file 'summit/schedule/templates/schedule/attend.html'
2	--- summit/schedule/templates/schedule/attend.html 2012-10-20 20:12:17 +0000
3	+++ summit/schedule/templates/schedule/attend.html 2012-10-26 01:04:21 +0000
4	@@ -32,7 +32,7 @@
5	32	{{ form.as_template }}	32	{{ form.as_template }}
6	33	{% if meeting.drafter.name = meeting.approver.name %}	33	{% if meeting.drafter.name = meeting.approver.name %}
7	34	<p id="twitter_update_list" style="color: black;">If you feel that your participation is required for this topic, please contact {{ meeting.approver.name }}, otherwise, please select one of the options above.</p>	34	<p id="twitter_update_list" style="color: black;">If you feel that your participation is required for this topic, please contact {{ meeting.approver.name }}, otherwise, please select one of the options above.</p>
9	35	{% else}	35	{% else %}
10	36	<p id="twitter_update_list" style="color: black;">If you feel that your participation is required for this topic, please contact {{ meeting.drafter.name }} or {{ meeting.approver.name }}, otherwise, please select one of the options above.</p>	36	<p id="twitter_update_list" style="color: black;">If you feel that your participation is required for this topic, please contact {{ meeting.drafter.name }} or {{ meeting.approver.name }}, otherwise, please select one of the options above.</p>
11	37	{% endif %}	37	{% endif %}
12	38	{% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}	38	{% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}