Skip to content

Commit 417b5ca

Browse files
johnmhoranjohnmhoran
committed
Reorganize package and vulnerability details templates #813
Reference: #813 - Also deleted several model-diagram PNGs. Signed-off-by: John M. Horan <[email protected]>
1 parent c902c2f commit 417b5ca

File tree

5 files changed

+255
-220
lines changed

5 files changed

+255
-220
lines changed

‎my_project.png‎

-230 KB
Binary file not shown.

‎my_project_core.png‎

-95.1 KB
Binary file not shown.

‎vulnerabilities/templates/package_update.html‎

Lines changed: 106 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -88,139 +88,123 @@
8888
</div>
8989
</article>
9090

91-
<div class="tabs is-boxed" id="tabs">
92-
<ul>
93-
<li class="is-active" data-tab="1">
94-
<a>
95-
<span>Essentials</span>
96-
</a>
97-
</li>
98-
<li data-tab="2">
99-
<a>
100-
<span>
101-
Affected by vulnerabilities
102-
{% if impacted_vuln %}
103-
({{ impacted_vuln|length }})
104-
{% else %}
105-
(0)
106-
{% endif %}
107-
</span>
108-
</a>
109-
</li>
110-
<li data-tab="3">
111-
<a>
112-
<span>
113-
Fixing vulnerabilities
114-
{% if resolved_vuln %}
115-
({{ resolved_vuln|length }})
116-
{% else %}
117-
(0)
118-
{% endif %}
119-
</span>
120-
</a>
121-
</li>
122-
</ul>
91+
<div class="pl-3 pr-3 mb-5">
92+
<table class="table vcio-table width-100-pct mt-2">
93+
<tbody>
94+
<tr>
95+
<td class="two-col-left">
96+
<span class="has-tooltip-multiline has-tooltip-black has-tooltip-arrow has-tooltip-text-left" data-tooltip="The package url or purl is a URL string used to identify and locate a software package.">purl</span>
97+
</td>
98+
<td class="two-col-right">
99+
{{ package.package_url }}
100+
</td>
101+
</tr>
102+
</tbody>
103+
</table>
123104
</div>
124-
<div id="tab-content">
125-
<div class="tab-div is-active" data-content="1">
126-
<table class="table vcio-table width-100-pct mt-2">
127-
<tbody>
128-
<tr>
129-
<td class="two-col-left"><span class="has-tooltip-multiline has-tooltip-black has-tooltip-arrow has-tooltip-text-left" data-tooltip="The package url or purl is a URL string used to identify and locate a software package.">purl</span></td>
130-
<td class="two-col-right">
131-
{{ package.package_url }}
132-
</td>
133-
</tr>
134-
</tbody>
135-
</table>
136-
</div>
137105

138-
<div class="tab-div content" data-content="2">
139-
<table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
140-
<thead>
141-
<tr>
142-
<th style="width: 175px;">Vulnerability</th>
143-
<th>Summary</th>
144-
<th style="width: 225px;">Aliases</th>
145-
</tr>
146-
</thead>
147-
<tbody>
106+
<div class="content ml-3 mr-3">
107+
<div class="has-text-weight-bold ml-1 mb-0">
108+
Affected by vulnerabilities
109+
{% if impacted_vuln %}
110+
({{ impacted_vuln|length }})
111+
{% else %}
112+
(0)
113+
{% endif %}
114+
</div>
148115

149-
{% if impacted_vuln %}
150-
{% for vuln in impacted_vuln %}
151-
<tr>
152-
<td>
153-
<a href="{% url 'vulnerability_view' vuln.pk %}?vuln_id={{ vuln.vulnerability_id }}" target="_self">{{ vuln.vulnerability_id }}</a>
154-
</td>
155-
<td>
156-
{{ vuln.summary }}
157-
</td>
158-
<td>
159-
{% for alias in vuln.alias %}
160-
{% if alias.url %}
161-
<a href={{ alias.url }} target="_blank">{{ alias }}<i class="fa fa-external-link fa_link_custom"></i></a>
162-
<br />
163-
{% else %}
164-
{{ alias }}
165-
<br />
166-
{% endif %}
167-
{% endfor %}
168-
</td>
169-
</tr>
170-
{% endfor %}
171-
{% else %}
116+
<table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
117+
<thead>
118+
<tr>
119+
<th style="width: 175px;">Vulnerability</th>
120+
<th>Summary</th>
121+
<th style="width: 225px;">Aliases</th>
122+
</tr>
123+
</thead>
124+
<tbody>
125+
{% if impacted_vuln %}
126+
{% for vuln in impacted_vuln %}
172127
<tr>
173-
<td colspan="3">
174-
This package is not affected by any vulnerabilities.
128+
<td>
129+
<a href="{% url 'vulnerability_view' vuln.pk %}?vuln_id={{ vuln.vulnerability_id }}" target="_self">{{ vuln.vulnerability_id }}</a>
130+
</td>
131+
<td>
132+
{{ vuln.summary }}
133+
</td>
134+
<td>
135+
{% for alias in vuln.alias %}
136+
{% if alias.url %}
137+
<a href={{ alias.url }} target="_blank">{{ alias }}<i class="fa fa-external-link fa_link_custom"></i></a>
138+
<br />
139+
{% else %}
140+
{{ alias }}
141+
<br />
142+
{% endif %}
143+
{% endfor %}
175144
</td>
176145
</tr>
177-
{% endif %}
178-
</tbody>
179-
</table>
180-
</div>
181-
182-
<div class="tab-div content" data-content="3">
183-
<table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
184-
<thead>
146+
{% endfor %}
147+
{% else %}
185148
<tr>
186-
<th style="width: 175px;">Vulnerability</th>
187-
<th>Summary</th>
188-
<th style="width: 225px;">Aliases</th>
149+
<td colspan="3">
150+
This package is not affected by any vulnerabilities.
151+
</td>
189152
</tr>
190-
</thead>
191-
<tbody>
192-
{% if resolved_vuln %}
193-
{% for vuln in resolved_vuln %}
194-
<tr>
195-
<td>
196-
<a href="{% url 'vulnerability_view' vuln.pk %}?vuln_id={{ vuln.vulnerability_id }}" target="_self">{{ vuln.vulnerability_id }}</a>
197-
</td>
198-
<td>
199-
{{ vuln.summary }}
200-
</td>
201-
<td>
202-
{% for alias in vuln.alias %}
203-
{% if alias.url %}
204-
<a href={{ alias.url }} target="_blank">{{ alias }}<i class="fa fa-external-link fa_link_custom"></i></a>
205-
<br />
206-
{% else %}
207-
{{ alias }}
208-
<br />
209-
{% endif %}
210-
{% endfor %}
211-
</td>
212-
</tr>
213-
{% endfor %}
214-
{% else %}
153+
{% endif %}
154+
</tbody>
155+
</table>
156+
</div>
157+
158+
<div class="content ml-3 mr-3">
159+
<div class="has-text-weight-bold ml-1 mb-0">
160+
Fixing vulnerabilities
161+
{% if resolved_vuln %}
162+
({{ resolved_vuln|length }})
163+
{% else %}
164+
(0)
165+
{% endif %}
166+
</div>
167+
168+
<table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
169+
<thead>
170+
<tr>
171+
<th style="width: 175px;">Vulnerability</th>
172+
<th>Summary</th>
173+
<th style="width: 225px;">Aliases</th>
174+
</tr>
175+
</thead>
176+
<tbody>
177+
{% if resolved_vuln %}
178+
{% for vuln in resolved_vuln %}
215179
<tr>
216-
<td colspan="3">
217-
This package does not fix any vulnerabilities.
180+
<td>
181+
<a href="{% url 'vulnerability_view' vuln.pk %}?vuln_id={{ vuln.vulnerability_id }}" target="_self">{{ vuln.vulnerability_id }}</a>
182+
</td>
183+
<td>
184+
{{ vuln.summary }}
185+
</td>
186+
<td>
187+
{% for alias in vuln.alias %}
188+
{% if alias.url %}
189+
<a href={{ alias.url }} target="_blank">{{ alias }}<i class="fa fa-external-link fa_link_custom"></i></a>
190+
<br />
191+
{% else %}
192+
{{ alias }}
193+
<br />
194+
{% endif %}
195+
{% endfor %}
218196
</td>
219197
</tr>
220-
{% endif %}
221-
</tbody>
222-
</table>
223-
</div>
198+
{% endfor %}
199+
{% else %}
200+
<tr>
201+
<td colspan="3">
202+
This package does not fix any vulnerabilities.
203+
</td>
204+
</tr>
205+
{% endif %}
206+
</tbody>
207+
</table>
224208
</div>
225209
</div>
226210
</section>
@@ -246,7 +230,6 @@
246230
return false;
247231
}
248232
}
249-
250233
</script>
251234

252235
{% endblock %}

0 commit comments

Comments
 (0)