Skip to content

Commit 3983119

Browse files
sbs2001sbs2001
committed
🎨 Make aesthetic changes.
Add margins and paddings. Get rid of Remove button. Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>
1 parent 2a0b6d1 commit 3983119

4 files changed

Lines changed: 34 additions & 132 deletions

File tree

‎vulnerabilities/templates/package_create.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ <h1 class="title">
1010
{% block content %}
1111
<div class="columns">
1212
<div class="column is-one-third"></div>
13-
<div class="column is-one-third has-text-centered ">
13+
<div class="column is-one-third has-text-centered ">
1414
<form method="post" class="card has-background-success-light">
1515
{% csrf_token %}
16-
<header class="card-header">
16+
<header class="card-header mb-3">
1717
<p class="card-header-title is-centered">
1818
Package Details
1919
</p>
2020
</header>
2121
{% for field in form %}
22-
<div class="field">
22+
<div class="field mx-3">
2323
<div class="control">
2424
{% render_field field class="input is-primary" placeholder=field.label %}
2525
</div>
2626
</div>
2727
{% endfor %}
28-
<button class="button is-success", type="submit">
28+
<button class="button is-success mb-3", type="submit">
2929
Create
3030
</button>
3131
</form>

‎vulnerabilities/templates/package_update.html‎

Lines changed: 24 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ <h1 class="title">
77
{% endblock %}
88

99
{% block content %}
10-
<div class="columns is-5 is-variable">
10+
<div class="columns is-5 is-variable mx-6 mb-6">
1111
<div class="column is-half has-text-centered has-background-success-light">
1212
<form method="post" class="card has-background-success-light">
13-
<header class="card-header">
13+
<header class="card-header mb-3">
1414
<p class="card-header-title">
1515
Package Details
1616
</p>
1717
</header>
1818
{% csrf_token %}
1919
{% for field in form %}
20-
<div class="field">
20+
<div class="field px-3">
2121
<label class="label">{{field.label}}</label>
2222
{% render_field field class="input is-primary" %}
2323
</div>
2424
{% endfor %}
25-
<button class="button is-success", type="submit">
25+
<button class="button is-success mb-3", type="submit">
2626
Update
2727
</button>
2828
</form>
@@ -32,164 +32,66 @@ <h1 class="title">
3232
<div class="columns is-variable is-5 is-multiline">
3333
<div class="column is-full">
3434
<div class="card has-background-danger-light">
35-
<header class="card-header">
35+
<header class="card-header mb-3">
3636
<p class="card-header-title">Vulnerable To</p>
3737
</header>
38-
<div class="tags" id="unresolved_tags">
38+
<div class="tags mx-3">
3939
{% for vulnerability in impacted_vuln %}
4040
<span class="tag is-danger is-medium">
4141
<a href="{% url 'vulnerability_view' vulnerability.pk %}" class="has-text-white">{{vulnerability}}</a>
42-
</span>
42+
43+
<form method="POST" action="{% url 'impacted_package_delete' object.pk vulnerability.pk %}"">
44+
{% csrf_token %}<button class="delete is-small" type="submit"></button>
45+
</form>
46+
</span>
4347
{% endfor %}
4448
</div>
4549

46-
<div class="field is-grouped">
47-
<p class="control">
48-
49-
<a class="button is-success is-small" href = "{% url 'impacted_package_create' object.pk %}">
50+
<div class="field is-centered">
51+
<p class="control pb-3">
52+
<a class="button is-success" href = "{% url 'impacted_package_create' object.pk %}">
5053
<span>Add</span>
5154
<span class="icon is-small">
5255
<i class="fa fa-plus"></i>
5356
</span>
5457
</a>
5558
</p>
56-
<p class="control">
57-
<button class="button is-danger is-small id="rm-resolved" onclick="HandleRemoveButtonsOnImpacted()">
58-
<span>Remove</span>
59-
<span class="icon is-small">
60-
<i class="fa fa-minus"></i>
61-
</span>
62-
</button>
63-
</p>
6459
</div>
6560

6661
</div>
6762
</div>
6863

6964
<div class="column is-full">
7065
<div class="card has-background-danger-light">
71-
<header class="card-header">
66+
<header class="card-header mb-3">
7267
<p class="card-header-title">Safe To</p>
7368
</header>
74-
<div class="tags" id="resolved_tags">
69+
<div class="tags mx-3">
7570
{% for vulnerability in resolved_vuln %}
7671
<span class="tag is-primary is-medium">
7772
<a href="{% url 'vulnerability_view' vulnerability.pk %}" class="has-text-white">{{vulnerability}}</a>
73+
74+
<form method="POST" action="{% url 'resolved_package_delete' object.pk vulnerability.pk %}">
75+
{% csrf_token %}<button class="delete is-small" type="submit"></button>
76+
</form>
7877
</span>
7978
{% endfor %}
8079
</div>
8180

82-
<div class="field is-grouped">
83-
<p class="control">
84-
<a class="button is-success is-small" href= "{% url 'resolved_package_create' object.pk %}" >
81+
<div class="field is-centered">
82+
<p class="control pb-3">
83+
<a class="button is-success" href= "{% url 'resolved_package_create' object.pk %}" >
8584
<span>Add</span>
8685
<span class="icon is-small">
8786
<i class="fa fa-plus"></i>
8887
</span>
8988
</a>
9089
</p>
91-
<p class="control">
92-
<button class="button is-danger is-small id="rm-resolved" onclick="HandleRemoveButtonsOnResolved()">
93-
<span>Remove</span>
94-
<span class="icon is-small">
95-
<i class="fa fa-minus"></i>
96-
</span>
97-
</button>
98-
</p>
9990
</div>
10091
</div>
10192
</div>
10293

10394
</div>
10495

10596
</div>
106-
107-
{% endblock %}
108-
109-
{% block javascript %}
110-
<script>
111-
var remove_toggled = false ;
112-
var remove_vuln_toggled = false ;
113-
function HandleRemoveButtonsOnResolved()
114-
{
115-
if (remove_toggled)
116-
{
117-
var delete_buttons = document.getElementsByClassName('delete is-small')
118-
for(var i = delete_buttons.length-1 ; i>=0 ; i--)
119-
{
120-
delete_buttons[i].remove();
121-
}
122-
remove_toggled = false;
123-
124-
}
125-
else
126-
{
127-
var tags = document.getElementsByClassName('tag is-primary is-medium')
128-
for(var i = 0 ; i<tags.length ; i++)
129-
{
130-
let vuln_pk = extract_pk(tags[i].children[0].attributes['href'].nodeValue) ;
131-
// Do this in a cleaner way
132-
133-
url = "../relations/resolved/" + {{object.pk}} + "/" + vuln_pk
134-
let btnHTML = `
135-
<form method="POST" action=${url}>
136-
{% csrf_token %}<button class="delete is-small" type="submit"></button>
137-
</form>
138-
`
139-
140-
tags[i].innerHTML += btnHTML;
141-
}
142-
remove_toggled = true ;
143-
}
144-
145-
}
146-
function HandleRemoveButtonsOnImpacted()
147-
{
148-
if (remove_vuln_toggled)
149-
{
150-
var delete_buttons = document.getElementsByClassName('delete is-small')
151-
for(var i = delete_buttons.length-1 ; i>=0 ; i--)
152-
{
153-
delete_buttons[i].remove();
154-
}
155-
remove_vuln_toggled = false;
156-
157-
}
158-
else
159-
{
160-
var tags = document.getElementsByClassName('tag is-danger is-medium')
161-
for(var i = 0 ; i<tags.length ; i++)
162-
{
163-
let vuln_pk = extract_pk(tags[i].children[0].attributes['href'].nodeValue) ;
164-
// Do this in a cleaner way
165-
166-
url = "../relations/impacted/" + {{object.pk}} + "/" + vuln_pk
167-
let btnHTML = `
168-
<form method="POST" action=${url}>
169-
{% csrf_token %}<button class="delete is-small" type="submit"></button>
170-
</form>
171-
`
172-
173-
tags[i].innerHTML += btnHTML;
174-
}
175-
remove_vuln_toggled = true ;
176-
}
177-
178-
}
179-
180-
181-
182-
function extract_pk(url)
183-
{
184-
let splitted_url = url.split('/')
185-
// eg value of url = "/vulnerabilities/5909"
186-
187-
return splitted_url[splitted_url.length -1]
188-
}
189-
190-
</script>
191-
{% endblock %}
192-
193-
194-
195-
97+
{% endblock %}

‎vulnerabilities/templates/packagerelatedvulnerability_create.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ <h2 class="subtitle">
1313
<div class="column is-one-third"></div>
1414
<div class="column is-one-third has-text-centered ">
1515
<form method="post" class="card has-background-success-light">
16-
<header class="card-header">
16+
<header class="card-header mb-3">
1717
<p class="card-header-title is-centered">
1818
Vulnerability ID
1919
</p>
2020
</header>
2121
{% csrf_token %}
2222
{% for field in form %}
23-
<div class="field">
23+
<div class="field mx-3">
2424
<div class="selectpicker">
2525
{% render_field field class="is-primary" %}
2626
</div>
2727
</div>
2828
{% endfor %}
29-
<button class="button is-success", type="submit">
29+
<button class="button is-success mb-3", type="submit">
3030
Create
3131
</button>
3232
</form>

‎vulnerabilities/templates/vulnerability_create.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ <h1 class="title">
1212
<div class="column is-one-third"></div>
1313
<div class="column is-one-third has-text-centered ">
1414
<form method="post" class="card has-background-success-light">
15-
<header class="card-header">
15+
<header class="card-header mb-3">
1616
<p class="card-header-title is-centered">
1717
Vulnerability Details
1818
</p>
1919
</header>
2020
{% csrf_token %}
2121
{% for field in form %}
22-
<div class="field">
22+
<div class="field px-3">
2323
<div class="control">
2424
{% render_field field class="input is-primary" placeholder=field.label %}
2525
</div>
2626
</div>
2727
{% endfor %}
28-
<button class="button is-success", type="submit">
28+
<button class="button is-success mb-3", type="submit">
2929
Create
3030
</button>
3131
</form>

0 commit comments

Comments
 (0)