Skip to content
This repository has been archived by the owner on Aug 26, 2023. It is now read-only.

Commit

Permalink
Explain survey at event creation
Browse files Browse the repository at this point in the history
Resolves #114
Hopefully appropriately given my track record today.
  • Loading branch information
nmorduch committed Jul 19, 2014
1 parent 685a4a1 commit 1926282
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions brambling/static/brambling/brambling.kickoff.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ $(function() {
// Add tooltips to elements with class "tipped".
$('.tipped').tooltip();

// Add popovers to elements with class "popover-dismiss".
$('.popped').popover();

This comment has been minimized.

Copy link
@melinath

melinath Jul 31, 2014

Contributor

Unless there's a strong preference, could we switch this to:

$('.popped').popover({trigger: 'focus'})

That way, the popover will disappear on next click instead of requiring a click on the (?) again. Seems more intuitive to me.

(Also, the comment doesn't accurately reflect what's being done.)

This comment has been minimized.

Copy link
@nmorduch

nmorduch Jul 31, 2014

Contributor

oops yeah i a long time trying to get the dismissable popover working, and then i gave up. there's a firefox/chrome bug, and we can do it as described here: twbs/bootstrap#14156

This comment has been minimized.

Copy link
@harrislapiroff

harrislapiroff Sep 8, 2014

Contributor

👍 I'm gonna do this now, barring any objection.

This comment has been minimized.

Copy link
@nmorduch

nmorduch Sep 8, 2014

Contributor

Go for it.


// Bind some brambling-specific events to the countdown timer.
$('[data-countdown="timer"]').on("updated.countdown", function (e, data) {
var alert,
Expand Down
1 change: 1 addition & 0 deletions brambling/templates/brambling/__base.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
{% block javascripts %}
{{ block.super }}
<script type="text/javascript" src="{% static "zenaida/js/bootstrap/tooltip.js" %}"></script>
<script type="text/javascript" src="{% static "zenaida/js/bootstrap/popover.js" %}"></script>
<script type="text/javascript" src="{% static "zenaida/js/bootstrap/dropdown.js" %}"></script>
<script type="text/javascript" src="{% static "brambling/brambling.kickoff.js" %}"></script>
<script type="text/javascript" src="{% static "brambling/brambling.countdown.js" %}"></script>
Expand Down
2 changes: 1 addition & 1 deletion brambling/templates/brambling/forms/event.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ <h4 class="panel-title">Settings</h4>
{% endwith %}
{% with field=form.collect_survey_data %}
<div class='checkbox'>
<label for="{{ field|id }}">{% formfield field %} {{ field.label }}</label>
<label for="{{ field|id }}">{% formfield field %} {{ field.label }}</label> <a class="popped" data-container="body" data-toggle="popover" data-placement="top" data-title="Survey Contents" data-content="Where did they hear about the event; would they like promotional materials to distribute; are they providing housing?"><i class="fa fa-question-circle"></i></a>
</div>
{% endwith %}
</div>
Expand Down

0 comments on commit 1926282

Please sign in to comment.