Skip to content

Commit d4d1a9f

Browse files
committed
msgbox or modal depends on View config
1 parent da074a3 commit d4d1a9f

File tree

4 files changed

+30
-21
lines changed

4 files changed

+30
-21
lines changed

chipy_org/apps/contact/templates/contact/contact.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
</table>
2020
<div class="text-center">
2121
<input class="btn btn-primary" type="submit" value="Send Email">
22-
<!-- <input class="btn btn-primary" type="submit" value="Send Email" data-bs-toggle="modal" data-bs-target="#contact-modal"> -->
2322
</div>
24-
<div id="contact-modal-show" style="display:none" data-bs-toggle="modal" data-bs-target="#contact-modal"></div>
2523
</form>
2624
</div>
2725
</div>
@@ -40,6 +38,8 @@ <h3>Did you know ChiPy has a mailing list?</h3>
4038

4139
{% if messages %}
4240
<!-- CONTACT MODAL STARTS-->
41+
<div id="contact-modal-show" style="display:none" data-bs-toggle="modal" data-bs-target="#contact-modal"></div>
42+
4343
<div class="modal fade" id="contact-modal" tabindex="-1" aria-labelledby="contactModalLabel" aria-hidden="true">
4444
<div class="modal-dialog modal-dialog-centered">
4545
<div class="modal-content">

chipy_org/apps/contact/views.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ class ContactView(FormView):
88
template_name = "contact/contact.html"
99
form_class = ContactForm
1010
success_url = "/contact"
11+
message_as_modal = True
1112

1213
def form_valid(self, form):
1314
try:
@@ -17,3 +18,9 @@ def form_valid(self, form):
1718
messages.error(self.request, "Your message was NOT sent to Chipy's organizers")
1819

1920
return super().form_valid(form)
21+
22+
def get_context_data(self, **kwargs):
23+
""" Used to access message_as_modal in template as context """
24+
context = super(ContactView, self).get_context_data(**kwargs)
25+
context.update({'message_as_modal': self.message_as_modal})
26+
return context

chipy_org/templates/_messages.html

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
1-
{% for message in messages %}
2-
<div>{{ message|linebreaks }}</div>
3-
{% endfor %}
1+
{% if message_as_modal %}
2+
{% for message in messages %}
3+
<div>{{ message|linebreaks }}</div>
4+
{% endfor %}
45

5-
<!-- ORIGINAL
6-
{% for message in messages %}
7-
<div class="alert alert-dismissible {% if message.tags %} {% for tag in message.tags.split %}alert-{{ tag }} {% endfor %}{% endif %} fade show">
8-
<a class="close" href="#" data-bs-dismiss="alert" aria-label="Close">&times;</a>
9-
{{ message|linebreaks }}
10-
</div>
11-
{% endfor %}
12-
-->
6+
{% else %}
7+
{% for message in messages %}
8+
<div class="container-xl">
9+
<div class="row">
10+
<div class="col-md-12">
11+
<div class="alert alert-dismissible {% if message.tags %} {% for tag in message.tags.split %}alert-{{ tag }} {% endfor %}{% endif %} fade show">
12+
<a class="close" href="#" data-bs-dismiss="alert" aria-label="Close">&times;</a>
13+
{{ message|linebreaks }}
14+
</div>
15+
</div>
16+
</div>
17+
</div><!--closes container xl-->
18+
{% endfor %}
19+
{% endif %}

chipy_org/templates/shiny/slim.html

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,9 @@
1717

1818
{% block content %}
1919

20-
{% if messages %}
21-
<div class="container-xl">
22-
<div class="row">
23-
<div class="col-md-12">
24-
{% include "_messages.html" %}
25-
</div>
26-
</div>
27-
</div><!--closes container xl-->
20+
<!-- Renders message box unless View declares message_as_modal instead -->
21+
{% if messages and not message_as_modal %}
22+
{% include "_messages.html" %}
2823
{% endif %}
2924

3025
<div class="container-xl">

0 commit comments

Comments
 (0)