Skip to content

Commit e13d66a

Browse files
gasscgassc
committed
new datetime picker
Bulk add events for Lenten dates (this one's for you, Mark Howe)
1 parent 9bd1df1 commit e13d66a

2 files changed

Lines changed: 292 additions & 67 deletions

File tree

‎core/templates/pages/fishfryform.html‎

Lines changed: 131 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -213,56 +213,143 @@ <h3>Fish Fry Details</h3>
213213
<!-- WHEN -->
214214
<div class="col-lg-5 col-md-12">
215215
<div id="event-dt-col" class="col-lg-12 col-md-8">
216-
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
217-
<div class="panel panel-default">
218-
<!-- Default panel contents -->
219-
<div class="panel-heading">
220-
<div class="panel-title">
221-
<a role="button" data-toggle="collapse" data-parent="#accordion"
222-
href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
223-
<h4>Dates/Times</h4>
224-
</a> </div>
216+
<!-- <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true"> -->
217+
<!-- BATCH EVENT PICKER -->
218+
<div class="panel panel-default">
219+
<div class="panel-heading" id="headingTwo">
220+
<div class="panel-title">
221+
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo"
222+
aria-expanded="true" aria-controls="collapseTwo">
223+
<h4>Add Fish Fry Dates/Times</h4>
224+
</a>
225225
</div>
226-
<!-- List group -->
227-
<div id="collapseOne" class="panel-collapse collapse in" role="tabpanel"
228-
aria-labelledby="headingOne">
229-
<ul id="events" class="list-group">
230-
{% set event_count = 0 %}
231-
<!-- generate list of events -->
232-
{% for event in form.events %}
233-
<li id="events-{{loop.index}}" class="list-group-item">
234-
<div class="row">
235-
<div class="col-sm-5">
236-
<div class="form-inline">
237-
{{ macros.render_field_small(event.dt_start) }}
238-
</div>
239-
</div>
240-
<div class="col-sm-5">
241-
<div class="form-inline">
242-
{{ macros.render_field_small(event.dt_end) }}
243-
</div>
226+
</div>
227+
<!-- List group -->
228+
<div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel"
229+
aria-labelledby="headingTwo">
230+
<div class="panel-body">
231+
232+
<div class="row">
233+
<div class="col-sm-12">Add a Fish Fry for this time:</div>
234+
</div>
235+
236+
<div class="row">
237+
<div class="col-sm-5">
238+
<div class="form-inline">
239+
<div class="form-group">
240+
<label for="events-bulk-t_start" class="control-label">
241+
<label for="events-bulk-t_start">Start Time</label>
242+
</label>
243+
<input class="form-control input-sm" id="events-bulk-t_start"
244+
name="events-bulk-t_start" value="4:00 PM" type="text">
244245
</div>
245-
<div class="col-sm-2">
246-
<div class="form-inline">
247-
<button type="button"
248-
class="btn btn-sm btn-danger event-delete-button">
249-
<i class="fa fa-minus-circle"></i>
250-
</button>
251-
</div>
246+
</div>
247+
</div>
248+
<div class="col-sm-5">
249+
<div class="form-inline">
250+
<div class="form-group">
251+
<label for="events-bulk-t_end" class="control-label">
252+
<label for="events-bulk-t_end">End Time</label>
253+
</label>
254+
<input class="form-control input-sm" id="events-bulk-t_end"
255+
name="events-bulk-t_end" value="7:00 PM" type="text">
252256
</div>
253257
</div>
254-
</li>
255-
{% set event_count = event_count + 1 %} {% endfor %}
256-
</ul>
257-
<div class="panel-footer">
258-
<button type="button" id="event-add-button" class="btn btn-block btn-primary">+
259-
Add an
260-
event</button>
258+
</div>
259+
</div>
260+
261+
<div class="row">
262+
<div class="col-sm-12"><br>...for these Lenten dates:</div>
263+
</div>
264+
265+
<div class="row">
266+
<div class="col-sm-12">
267+
<div class="checkbox">
268+
<label>
269+
<input type="checkbox" id="lentenFridays" value="events0">
270+
All Lenten Fridays (Except Good Friday)
271+
</label>
272+
</div>
273+
<div class="checkbox">
274+
<label>
275+
<input type="checkbox" id="ashWednesday" value="events1">
276+
Ash Wednesday
277+
</label>
278+
</div>
279+
<div class="checkbox">
280+
<label>
281+
<input type="checkbox" id="goodFriday" value="events2">
282+
Good Friday
283+
</label>
284+
</div>
285+
</div>
261286
</div>
287+
262288
</div>
263-
</div>
289+
<div class="panel-footer">
290+
<div class="btn-group btn-group-sm" role="group" aria-label="bulk-add-buttons">
291+
<button type="button" id="event-bulk-add-button"
292+
class="btn btn-primary event-bulk-add-button">
293+
+ Add to the event list (replacing all existing events)
294+
</button>
295+
<button type="button" id="event-bulk-append-button"
296+
class="btn btn-default event-bulk-add-button">
297+
+ Append to the event list
298+
</button>
299+
</div>
264300

301+
</div>
302+
</div>
265303
</div>
304+
<!-- EVENT LIST PANEL-->
305+
<div class="panel panel-default">
306+
<div class="panel-heading" id="headingOne">
307+
<div class="panel-title">
308+
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne"
309+
aria-expanded="true" aria-controls="collapseOne">
310+
<h4>Event List</h4>
311+
</a>
312+
</div>
313+
</div>
314+
<div id="collapseOne" class="panel-collapse collapse in" role="tabpanel"
315+
aria-labelledby="headingOne">
316+
<ul id="events" class="list-group">
317+
{% set event_count = 0 %}
318+
<!-- generate list of events -->
319+
{% for event in form.events %}
320+
<li id="events-{{loop.index}}" class="list-group-item">
321+
<div class="row">
322+
<div class="col-sm-5">
323+
<div class="form-inline">
324+
{{ macros.render_field_small(event.dt_start) }}
325+
</div>
326+
</div>
327+
<div class="col-sm-5">
328+
<div class="form-inline">
329+
{{ macros.render_field_small(event.dt_end) }}
330+
</div>
331+
</div>
332+
<div class="col-sm-2">
333+
<div class="form-inline">
334+
<button type="button"
335+
class="btn btn-sm btn-danger event-delete-button">
336+
<i class="fa fa-times"></i>
337+
</button>
338+
</div>
339+
</div>
340+
</div>
341+
</li>
342+
{% set event_count = event_count + 1 %} {% endfor %}
343+
</ul>
344+
<div class="panel-footer">
345+
<button type="button" id="event-add-button" class="btn btn-block btn-primary">
346+
+ Add an event
347+
</button>
348+
</div>
349+
</div>
350+
</div>
351+
352+
<!-- </div> -->
266353
</div>
267354
</div>
268355
</div>
@@ -326,13 +413,14 @@ <h4>Dates/Times</h4>
326413
<div class="col-sm-2">
327414
<div class="form-inline">
328415
<button type="button" class="btn btn-sm btn-danger event-delete-button">
329-
<i class="fa fa-minus-circle"></i>
416+
<i class="fa fa-times"></i>
330417
</button>
331418
</div>
332419
</div>
333420
</div>
334421
</li>
335422
</script>
423+
336424
{% endraw %}
337425

338426
{% endblock %}

0 commit comments

Comments
 (0)