Skip to content

Commit 4fc2b1c

Browse files
jwoglomjwoglom
committed
update other eighth signup templates; clear search when changing favorite
1 parent a3700de commit 4fc2b1c

File tree

5 files changed

+68
-16
lines changed

5 files changed

+68
-16
lines changed

‎intranet/static/js/eighth/signup.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,8 @@ $(function() {
311311
model.attributes.favorited = !model.attributes.favorited;
312312
view.render();
313313

314+
$("#activity-picker .search-wrapper input").val("").trigger("keyup");
315+
314316
$.ajax({
315317
url: $("#activity-list").data("toggle-favorite-endpoint"),
316318
type: "POST",

‎intranet/templates/eighth/display.html

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -509,10 +509,18 @@ <h4>
509509
</div>
510510
{% endif %}
511511

512-
<h5 class="sticky-header favorites-header">Favorites</h5>
513-
<ul class="favorite-activities"></ul>
514-
<h5 class="sticky-header all-header">All</h5>
515-
<ul class="all-activities"></ul>
512+
<h5 class="sticky-header favorites-header" data-header="favorites-header">
513+
Favorites
514+
</h5>
515+
<ul class="favorite-activities" data-header="favorites-header"></ul>
516+
<h5 class="sticky-header special-header" data-header="special-header">
517+
Special
518+
</h5>
519+
<ul class="special-activities" data-header="special-header"></ul>
520+
<h5 class="sticky-header all-header" data-header="all-header">
521+
All
522+
</h5>
523+
<ul class="all-activities" data-header="all-header"></ul>
516524
<ul class="search-noresults">
517525
<li>
518526
<span class="activity-name">

‎intranet/templates/eighth/multi_signup.html

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,15 +358,33 @@ <h3>
358358
<span>
359359
<input type="search" placeholder="Search names, sponsors, rooms..." disabled>
360360
</span>
361+
<h5 class="search-header">
362+
Search Results<a class="button small-button clear-button">Clear</a>
363+
</h5>
361364
</div>
362365
<div class="backbtn">
363366
<i class="fa fa-chevron-left"></i>
364367
</div>
365368
<div id="activity-list" data-toggle-favorite-endpoint="{% url 'eighth_toggle_favorite' %}">
366-
<h5 class="sticky-header favorites-header">Favorites</h5>
367-
<ul class="favorite-activities"></ul>
368-
<h5 class="sticky-header">All</h5>
369-
<ul class="all-activities"></ul>
369+
<h5 class="sticky-header favorites-header" data-header="favorites-header">
370+
Favorites
371+
</h5>
372+
<ul class="favorite-activities" data-header="favorites-header"></ul>
373+
<h5 class="sticky-header special-header" data-header="special-header">
374+
Special
375+
</h5>
376+
<ul class="special-activities" data-header="special-header"></ul>
377+
<h5 class="sticky-header all-header" data-header="all-header">
378+
All
379+
</h5>
380+
<ul class="all-activities" data-header="all-header"></ul>
381+
<ul class="search-noresults">
382+
<li>
383+
<span class="activity-name">
384+
No results found. Try your search again.
385+
</span>
386+
</li>
387+
</ul>
370388
</div>
371389
<div id="activity-detail" data-bid="{% for b in blocks %}{{ b.id }}{% if not forloop.last %},{% endif %}{% endfor %}" data-uid="{{ user.id }}" data-signup-endpoint="{% url 'eighth_multi_signup' %}">
372390
<div class="empty-state">

‎intranet/templates/eighth/profile_signup.html

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -437,15 +437,33 @@ <h4>
437437
<span>
438438
<input type="search" placeholder="Search names, sponsors, rooms..." disabled>
439439
</span>
440+
<h5 class="search-header">
441+
Search Results<a class="button small-button clear-button">Clear</a>
442+
</h5>
440443
</div>
441444
<div class="backbtn">
442445
<i class="fa fa-chevron-left"></i>
443446
</div>
444447
<div id="activity-list" data-toggle-favorite-endpoint="{% url 'eighth_toggle_favorite' %}">
445-
<h5 class="sticky-header favorites-header">Favorites</h5>
446-
<ul class="favorite-activities"></ul>
447-
<h5 class="sticky-header">All</h5>
448-
<ul class="all-activities"></ul>
448+
<h5 class="sticky-header favorites-header" data-header="favorites-header">
449+
Favorites
450+
</h5>
451+
<ul class="favorite-activities" data-header="favorites-header"></ul>
452+
<h5 class="sticky-header special-header" data-header="special-header">
453+
Special
454+
</h5>
455+
<ul class="special-activities" data-header="special-header"></ul>
456+
<h5 class="sticky-header all-header" data-header="all-header">
457+
All
458+
</h5>
459+
<ul class="all-activities" data-header="all-header"></ul>
460+
<ul class="search-noresults">
461+
<li>
462+
<span class="activity-name">
463+
No results found. Try your search again.
464+
</span>
465+
</li>
466+
</ul>
449467
</div>
450468
<div id="activity-detail" data-bid="{{ active_block.id }}" data-uid="{{ user.id }}" data-signup-endpoint="{% url 'eighth_signup' %}">
451469
<div class="empty-state">

‎intranet/templates/eighth/signup.html

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,18 +407,24 @@ <h4>
407407
<input type="search" placeholder="Search names, sponsors, rooms..." disabled>
408408
</span>
409409
<h5 class="search-header">
410-
Search Results<a class='button small-button clear-button'>Clear</a>
410+
Search Results<a class="button small-button clear-button">Clear</a>
411411
</h5>
412412
</div>
413413
<div class="backbtn">
414414
<i class="fa fa-chevron-left"></i>
415415
</div>
416416
<div id="activity-list" data-toggle-favorite-endpoint="{% url 'eighth_toggle_favorite' %}">
417-
<h5 class="sticky-header favorites-header" data-header="favorites-header">Favorites</h5>
417+
<h5 class="sticky-header favorites-header" data-header="favorites-header">
418+
Favorites
419+
</h5>
418420
<ul class="favorite-activities" data-header="favorites-header"></ul>
419-
<h5 class="sticky-header special-header" data-header="special-header">Special</h5>
421+
<h5 class="sticky-header special-header" data-header="special-header">
422+
Special
423+
</h5>
420424
<ul class="special-activities" data-header="special-header"></ul>
421-
<h5 class="sticky-header all-header" data-header="all-header">All</h5>
425+
<h5 class="sticky-header all-header" data-header="all-header">
426+
All
427+
</h5>
422428
<ul class="all-activities" data-header="all-header"></ul>
423429
<ul class="search-noresults">
424430
<li>

0 commit comments

Comments
 (0)