Skip to content

Commit e11e654

Browse files
ojongeriusojongerius
committed
Use cards to improve display of results, update warning button wording and look.
1 parent 74f66a5 commit e11e654

File tree

5 files changed

+44
-30
lines changed

5 files changed

+44
-30
lines changed

‎vol/static/css/vol.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ body {
1515
}
1616

1717
/* Individual results */
18-
.vol-results-results {
18+
.vol-results-intro {
19+
margin-bottom: 3rem;
20+
}
21+
/* Individual results */
22+
.vol-results-result {
1923
margin: 3rem 0;
2024
}
2125

‎vol/templates/vol/base.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
{% analytical_body_top %}
3131
<nav class="navbar navbar-dark fixed-top" style="background-color: #2c3e50;">
3232
<div class="container">
33-
<a class="navbar-brand" href="/" aria-label="Navigate home"><i class="fa fa-recycle" aria-hidden="true" title="Navigate home"></i></a>
34-
<a href="https://github.com/ojongerius/vol/issues" target="_blank">
33+
<a class="navbar-brand" href="/" aria-label="Navigate home"><i class="fa fa-mail-reply" aria-hidden="true" title="Navigate home"></i></a>
34+
<a href="https://github.com/volCommunity/vol-django/issues" target="_blank">
3535
<button class="btn btn-info" type="button">
36-
<span class="badge">This is a pre alpha version, click this button to see or raise any issues, or come back soon!</span>
36+
<span class="badge"><i class="fa fa-gears" aria-hidden="true"></i> This is a prototype! Please hit this button to raise any issues, or come back soon <i class="fa fa-gears" aria-hidden="true"></i></span>
3737
</button>
3838
</a>
3939
</div>

‎vol/templates/vol/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="vol-footer">
22
<div class="container">
3-
<a href="/" target="_blank" aria-label="Home"><i class="fa fa-home text-muted" aria-hidden="true" title="Home"></i></a>
3+
<a href="/" target="_blank" aria-label="Home"><i class="fa fa-reply text-muted" aria-hidden="true" title="Home"></i></a>
44
<a href="https://www.twitter.com/xzu" target="_blank" aria-label="Twitter page"><i class="fa fa-twitter-square text-muted" aria-hidden="true" title="Twitter page" ></i></a>
55
<!--<a href="https://nz.linkedin.com/in/ottojongerius">Linkedin</a> |-->
66
<a href="https://github.com/volCommunity/vol-django" target="_blank" aria-label="Github project page"><i class="fa fa-github-square text-muted" aria-hidden="true" title="Github project page"></i></a>

‎vol/templates/vol/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<input type="text" class="form-control typeahead" id="locationInput" placeholder="Wellington, NZ">
2727
{# ^^ Needed a workaround in vol.css #}
2828
</div>
29-
<button type="submit" class="btn btn-outline-secondary" id="submit">Submit</button>
29+
<button type="submit" class="btn btn-secondary" id="submit">Submit</button>
3030
</form>
3131
</div>
3232
<script>

‎vol/templates/vol/results.html

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
{% block title %}Vol results{% endblock %}
33
{% block content %}
44
<div class="container">
5-
{% if locations == "all" %}
6-
<p> Showing all jobs matching interests for <strong>all</strong> locations.</p>
7-
{% elif interests == "all" %}
8-
<p> Showing all jobs for all interests matching locations.</p>
9-
{% elif matched_intersection == 0 %}
5+
<div class="vol-results-intro">
6+
{% if locations == "all" %}
7+
<p> Showing all jobs matching interests for <strong>all</strong> locations.</p>
8+
{% elif interests == "all" %}
9+
<p> Showing all jobs for all interests matching locations.</p>
10+
{% elif matched_intersection == 0 %}
1011
<p>
1112
{% if matched_interests_count == 0 and locationmatches == 0 %}
1213
<strong> No matches were found! </strong>
@@ -28,6 +29,7 @@
2829
{% endif %}
2930
<p><i>Not the result you were hoping for? Use the location and interest results below to fine tune
3031
results.</i></p>
32+
</div>
3133
<div class="row">
3234
<div class="col-sm-6 d-flex align-self-stretch">
3335
<div class="card border-info mb-3">
@@ -36,29 +38,31 @@
3638
<p class="card-text text-info">
3739
{% if matched_interests_count != 0 %}
3840
Found {{ matched_interests_count }} matched interests in all locations.
39-
{# {% for matched_interest in matched_interests %}#}
40-
{# <li> {{ matched_interest }} </li>#}
41-
{# {% endfor %}#}
41+
{# {% for matched_interest in matched_interests %}#}
42+
{# <li> {{ matched_interest }} </li>#}
43+
{# {% endfor %}#}
4244
{% elif unmatched_interests_count != 0 %}
4345
Amount of unmatched interests, in all areas: {{ unmatched_interests_count }}.
44-
{# {% for unmatched_interest in unmatched_interests %}#}
45-
{# <li> {{ unmatched_interest }}</li>#}
46-
{# {% endfor %}#}
46+
{# {% for unmatched_interest in unmatched_interests %}#}
47+
{# <li> {{ unmatched_interest }}</li>#}
48+
{# {% endfor %}#}
4749
{% endif %}
4850
</p>
49-
<a href="/results/all/{{ interests }}" class="btn btn-outline-secondary">Show interest matches, globally</a>
51+
<a href="/results/all/{{ interests }}" class="btn btn-secondary">Show interest matches,
52+
globally</a>
5053
</div>
5154
</div>
5255
</div>
53-
<div class="col-sm-6 d-flex align-self-stretch">
56+
<div class="col-sm-6">
5457
<div class="card border-info mb-3">
5558
<div class="card-header">Locations</div>
5659
<div class="card-body">
5760
<p class="card-text text-info">
5861
{% if location_matches != 0 %}
5962
Found a total of {{ location_matches }} matches in your location.
6063
</p>
61-
<a href="/results/{{ locations }}/all" class="btn btn-outline-secondary">Show all matches in my location</a>
64+
<a href="/results/{{ locations }}/all" class="btn btn-secondary">Show all
65+
matches in my location</a>
6266
{% else %}
6367
No jobs found for your location, try widening your search area. Sorry!
6468
</p>
@@ -68,17 +72,23 @@
6872
</div>
6973
</div>
7074

71-
<div class="row vol-results-results">
75+
<div class="vol-results-results">
7276
{% for job in jobs %}
73-
<div class="col-lg-6">
74-
<h4> {{ job.title }}</h4>
75-
<strong>URL</strong>: <a href="{{ job.url }}">{{ job.url }}</a><br>
76-
<strong>Original URL</strong>: {% for v in job.site.values %}
77-
<a href="{{ v.url }}">{{ v.url }}</a> {% endfor %} <br> <!-- Surely a better way to do this-->
78-
<strong>Organisation</strong> <a href="{{ job.organisation.url }}">{{ job.organisation }}</a> <br>
79-
<!-- Include link and logo -->
80-
<strong>City</strong> {{ job.city }}<br>
81-
<p> {{ job.text }}</p>
77+
<div class="card border-info mb-3">
78+
<div class="card-header"><h4 class="card-title">{{ job.title }}</h4></div>
79+
<div class="card-header">
80+
<strong>URL</strong>: <a href="{{ job.url }}">{{ job.url }}</a><br>
81+
<strong>Original URL</strong>: {% for v in job.site.values %}
82+
<a href="{{ v.url }}">{{ v.url }}</a> {% endfor %} <br> <!-- Surely a better way to do this-->
83+
<strong>Organisation</strong> <a href="{{ job.organisation.url }}">{{ job.organisation }}</a> <br>
84+
<!-- Include link and logo -->
85+
<strong>City</strong> {{ job.city }}
86+
</div>
87+
<div class="card-body">
88+
<p class="card-text text-dark">
89+
{{ job.text }}
90+
</p>
91+
</div>
8292
</div>
8393
{% endfor %}
8494
</div>

0 commit comments

Comments
 (0)