Skip to content

Commit baaa8f1

Browse files
larseggertlarseggert
authored
feat: Only show IPR search form when not showing search results (ietf-tools#4793)
* feat: Only show IPR search form when not showing search results Put it into a collapsible that is only expanded by default when not showing search results. Fixes ietf-tools#4569 * Don't use example target name
1 parent 6eabd4a commit baaa8f1

1 file changed

Lines changed: 96 additions & 79 deletions

File tree

‎ietf/templates/ipr/search_form.html‎

Lines changed: 96 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -3,86 +3,103 @@
33
{% load origin %}
44
{% origin %}
55
<h1>IPR Search</h1>
6-
<form class="ipr-search">
7-
{% if user|has_role:"Secretariat" %}
8-
<h2 class="mt-4">State Filter</h2>
9-
{% bootstrap_field form.state %}
10-
{% endif %}
11-
<h2 class="mt-4">Document search</h2>
12-
<div class="mb-3">
13-
{% bootstrap_label form.draft.label label_for=form.draft.id_for_label label_class="form-label" %}
14-
<div class="input-group">
15-
{% render_field form.draft class="form-control" placeholder="draft-..." %}
16-
<button class="btn btn-primary" type="submit" value="draft">
17-
<i class="bi bi-search"></i> Search
18-
</button>
19-
</div>
6+
7+
<div class="accordion" id="ipr-search-form">
8+
<div class="accordion-item">
9+
<h2 class="accordion-header" id="ipr-search-form-heading">
10+
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#ipr-search-collapse" aria-expanded="{{ request.GET|yesno:'false,true'}}" aria-controls="ipr-search-collapse">
11+
IPR search criteria...
12+
</button>
13+
</h2>
14+
<div id="ipr-search-collapse" class="accordion-collapse collapse{% if not request.GET %} show{% endif %}" aria-labelledby="ipr-search-form-heading" data-bs-parent="#ipr-search-form">
15+
<div class="accordion-body">
16+
17+
<form class="ipr-search">
18+
{% if user|has_role:"Secretariat" %}
19+
<h2>State Filter</h2>
20+
{% bootstrap_field form.state %}
21+
{% endif %}
22+
<h2>Document search</h2>
23+
<div class="mb-3">
24+
{% bootstrap_label form.draft.label label_for=form.draft.id_for_label label_class="form-label" %}
25+
<div class="input-group">
26+
{% render_field form.draft class="form-control" placeholder="draft-..." %}
27+
<button class="btn btn-primary" type="submit" value="draft">
28+
<i class="bi bi-search"></i> Search
29+
</button>
30+
</div>
31+
</div>
32+
<div class="mb-3">
33+
{% bootstrap_label form.rfc.label label_for=form.rfc.id_for_label label_class="form-label" %}
34+
<div class="input-group">
35+
{% render_field form.rfc class="form-control" placeholder="123..." %}
36+
<button class="btn btn-primary" type="submit" value="rfc">
37+
<i class="bi bi-search"></i> Search
38+
</button>
39+
</div>
40+
</div>
41+
<div class="mb-3">
42+
{% bootstrap_label form.doctitle.label|cut:":" label_for=form.doctitle.id_for_label label_class="form-label" %}
43+
<div class="input-group">
44+
{% render_field form.doctitle class="form-control" placeholder="protocol..." %}
45+
<button class="btn btn-primary" type="submit" value="doctitle">
46+
<i class="bi bi-search"></i> Search
47+
</button>
48+
</div>
49+
</div>
50+
<div class="mb-3">
51+
{% bootstrap_label form.group.label|cut:":" label_for=form.group.id_for_label label_class="form-label" %}
52+
<div class="input-group">
53+
{% render_field form.group class="form-select" %}
54+
<button class="btn btn-primary btn-block"
55+
type="submit"
56+
value="group">
57+
<i class="bi bi-search"></i> Search
58+
</button>
59+
</div>
60+
</div>
61+
<h2>IPR search</h2>
62+
<div class="mb-3">
63+
{% bootstrap_label form.holder.label|cut:":" label_for=form.holder.id_for_label label_class="form-label" %}
64+
<div class="input-group">
65+
{% render_field form.holder class="form-control" placeholder="John Doe..." %}
66+
<button class="btn btn-primary" type="submit" value="holder">
67+
<i class="bi bi-search"></i> Search
68+
</button>
69+
</div>
70+
</div>
71+
<div class="mb-3">
72+
{% bootstrap_label form.iprtitle.label|cut:":" label_for=form.iprtitle.id_for_label label_class="form-label" %}
73+
<div class="input-group">
74+
{% render_field form.iprtitle class="form-control" placeholder="protocol..." %}
75+
<button class="btn btn-primary" type="submit" value="iprtitle">
76+
<i class="bi bi-search"></i> Search
77+
</button>
78+
</div>
79+
</div>
80+
<div class="mb-3">
81+
{% bootstrap_label form.patent.label|cut:":" label_for=form.patent.id_for_label label_class="form-label" %}
82+
<div class="input-group">
83+
{% render_field form.patent class="form-control" %}
84+
<button class="btn btn-primary" type="submit" value="patent">
85+
<i class="bi bi-search"></i> Search
86+
</button>
87+
</div>
88+
<div class="form-text">
89+
This search string must contain at least three characters, including
90+
at least one digit, and include punctuation marks. For best results,
91+
please enter the entire string, or as much of it as possible.
92+
</div>
93+
</div>
94+
<input type="hidden" name="submit">
95+
</form>
96+
97+
</div>
2098
</div>
21-
<div class="mb-3">
22-
{% bootstrap_label form.rfc.label label_for=form.rfc.id_for_label label_class="form-label" %}
23-
<div class="input-group">
24-
{% render_field form.rfc class="form-control" placeholder="123..." %}
25-
<button class="btn btn-primary" type="submit" value="rfc">
26-
<i class="bi bi-search"></i> Search
27-
</button>
28-
</div>
29-
</div>
30-
<div class="mb-3">
31-
{% bootstrap_label form.doctitle.label|cut:":" label_for=form.doctitle.id_for_label label_class="form-label" %}
32-
<div class="input-group">
33-
{% render_field form.doctitle class="form-control" placeholder="protocol..." %}
34-
<button class="btn btn-primary" type="submit" value="doctitle">
35-
<i class="bi bi-search"></i> Search
36-
</button>
37-
</div>
38-
</div>
39-
<div class="mb-3">
40-
{% bootstrap_label form.group.label|cut:":" label_for=form.group.id_for_label label_class="form-label" %}
41-
<div class="input-group">
42-
{% render_field form.group class="form-select" %}
43-
<button class="btn btn-primary btn-block"
44-
type="submit"
45-
value="group">
46-
<i class="bi bi-search"></i> Search
47-
</button>
48-
</div>
49-
</div>
50-
<h2 class="mt-4">IPR search</h2>
51-
<div class="mb-3">
52-
{% bootstrap_label form.holder.label|cut:":" label_for=form.holder.id_for_label label_class="form-label" %}
53-
<div class="input-group">
54-
{% render_field form.holder class="form-control" placeholder="John Doe..." %}
55-
<button class="btn btn-primary" type="submit" value="holder">
56-
<i class="bi bi-search"></i> Search
57-
</button>
58-
</div>
59-
</div>
60-
<div class="mb-3">
61-
{% bootstrap_label form.iprtitle.label|cut:":" label_for=form.iprtitle.id_for_label label_class="form-label" %}
62-
<div class="input-group">
63-
{% render_field form.iprtitle class="form-control" placeholder="protocol..." %}
64-
<button class="btn btn-primary" type="submit" value="iprtitle">
65-
<i class="bi bi-search"></i> Search
66-
</button>
67-
</div>
68-
</div>
69-
<div class="mb-3">
70-
{% bootstrap_label form.patent.label|cut:":" label_for=form.patent.id_for_label label_class="form-label" %}
71-
<div class="input-group">
72-
{% render_field form.patent class="form-control" %}
73-
<button class="btn btn-primary" type="submit" value="patent">
74-
<i class="bi bi-search"></i> Search
75-
</button>
76-
</div>
77-
<div class="form-text">
78-
This search string must contain at least three characters, including
79-
at least one digit, and include punctuation marks. For best results,
80-
please enter the entire string, or as much of it as possible.
81-
</div>
82-
</div>
83-
<input type="hidden" name="submit">
84-
</form>
85-
<p class="alert alert-info my-3">
99+
</div>
100+
</div>
101+
102+
<p class="alert alert-warning my-3">
86103
The material posted as IPR disclosures should be viewed as originating
87104
from the source of that information, and any issue or question related
88105
to the material should be directed to the source rather than the

0 commit comments

Comments
 (0)