Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repos:
hooks:
- id: check-github-workflows
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.16.5
rev: v0.16.7
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down Expand Up @@ -57,7 +57,7 @@ repos:
args: [-I, .codespell_ignore.txt]
exclude: ^main/static/assets/|^package-lock.json$|^direct_webapp/fixtures/framework-2-0.json$
- repo: https://github.com/djlint/djLint
rev: v1.44.2
rev: v1.46.1
hooks:
- id: djlint-django
- id: djlint-reformat-django
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<h2>Success!</h2>
<p>Welcome {{ user }}! You have registered and are now logged in.</p>
<p>
<a class="btn btn-lg btn-primary" href="{% url 'index' %}">Start exploring</a>
<a class="btn btn-lg btn-primary"
href="{% url 'index' %}">Start exploring</a>
</p>
{% else %}
<h2>Oops!</h2>
Expand Down
3 changes: 2 additions & 1 deletion main/templates/main/base.account.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ <h4 class="fs-xs fw-medium text-body-secondary text-uppercase pb-1 mb-2">Dashboa
<nav class="nav flex-column pb-2 pb-lg-4 mb-3">
<form method="post" action="{% url 'logout' %}">
{% csrf_token %}
<button type="submit" class="btn btn-link nav-link fw-semibold py-0 px-2">Sign out</button>
<button type="submit"
class="btn btn-link nav-link fw-semibold py-0 px-2">Sign out</button>
</form>
</nav>
</div>
Expand Down
3 changes: 2 additions & 1 deletion main/templates/main/base.auth.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
{% block content %}
{% endblock content %}
</div>
<p class="nav w-100 fs-sm pt-5 mt-auto mb-5" style="max-width: 526px;">
<p class="nav w-100 fs-sm pt-5 mt-auto mb-5"
style="max-width: 526px">
<span class="text-body-secondary">© DIRECT Framework 2023 - {% now "Y" %}</span>
</p>
</div>
Expand Down
9 changes: 6 additions & 3 deletions main/templates/main/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ <h2 class="text-white pb-2 pb-md-3 mb-lg-4">How does it work?</h2>
<i class="fa-solid fa-play"></i>
</a>
</div>
<div class="w-100 flex-md-shrink-0 mx-auto" style="max-width: 472px;">
<div class="w-100 flex-md-shrink-0 mx-auto"
style="max-width: 472px">
<img src="{% static 'assets/img/landing/skills-wheel-usage.png' %}"
alt="Skills wheel example"
class="img-fluid">
Expand All @@ -39,7 +40,8 @@ <h2 class="text-white pb-2 pb-md-3 mb-lg-4">How does it work?</h2>
<div class="card-body">
<h3>Chart and manage professional development</h3>
<p>Create individual skill profiles.</p>
<a class="btn btn-lg btn-primary" href="{% url 'self_assess' %}">Create
<a class="btn btn-lg btn-primary"
href="{% url 'self_assess' %}">Create
a skills profile</a>
</div>
</div>
Expand Down Expand Up @@ -86,7 +88,8 @@ <h3>Plan your career</h3>
<div class="card-body">
<h3>Building a stronger future for digital research</h3>
<p class="mb-4">Browse a variety of roles across digital research themes</p>
<a class="btn btn-lg btn-primary" href="{% url 'roles' %}">Explore
<a class="btn btn-lg btn-primary"
href="{% url 'roles' %}">Explore
roles</a>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion main/templates/main/pages/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
<li class="breadcrumb-item">
<a href="{% url 'index' %}">Home</a>
</li>
<li class="breadcrumb-item active" aria-current="page">About the project</li>
<li class="breadcrumb-item active"
aria-current="page">About the project</li>
</ol>
</nav>
<h1 class="display-2 pb-2 pb-sm-3">Building a stronger future for digital research</h1>
Expand Down
16 changes: 12 additions & 4 deletions main/templates/main/pages/skill.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ <h2 class="h4 mt-5">Learning resources</h2>
{% for resource in learning_resources %}
<li>
{% if resource.url %}
<a href="{{ resource.url }}" target="_blank" rel="noopener noreferrer">{{ resource.name }}</a>
<a href="{{ resource.url }}"
target="_blank"
rel="noopener noreferrer">{{ resource.name }}</a>
{% else %}
{{ resource.name }}
{% endif %}
Expand All @@ -51,7 +53,9 @@ <h2 class="h4 mt-5">Tools</h2>
{% for item in tools %}
<li>
{% if item.url %}
<a href="{{ item.url }}" target="_blank" rel="noopener noreferrer">{{ item.name }}</a>
<a href="{{ item.url }}"
target="_blank"
rel="noopener noreferrer">{{ item.name }}</a>
{% else %}
{{ item.name }}
{% endif %}
Expand All @@ -65,7 +69,9 @@ <h2 class="h4 mt-5">Languages</h2>
{% for item in languages %}
<li>
{% if item.url %}
<a href="{{ item.url }}" target="_blank" rel="noopener noreferrer">{{ item.name }}</a>
<a href="{{ item.url }}"
target="_blank"
rel="noopener noreferrer">{{ item.name }}</a>
{% else %}
{{ item.name }}
{% endif %}
Expand All @@ -79,7 +85,9 @@ <h2 class="h4 mt-5">Methodologies</h2>
{% for item in methodologies %}
<li>
{% if item.url %}
<a href="{{ item.url }}" target="_blank" rel="noopener noreferrer">{{ item.name }}</a>
<a href="{{ item.url }}"
target="_blank"
rel="noopener noreferrer">{{ item.name }}</a>
{% else %}
{{ item.name }}
{% endif %}
Expand Down
9 changes: 6 additions & 3 deletions main/templates/main/pages/skills-and-competencies.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ <h1 class="pb-2 pb-lg-3">Skills and competencies</h1>
<p class="fs-lg mb-3">
Skills are organised into a number of competencies, which are in turn grouped into bigger competency domains which you can explore using the links in the sidebar.
</p>
<a class="btn btn-primary mb-4" href="{% url 'framework_json' %}">Download framework JSON</a>
<a class="btn btn-primary mb-4"
href="{% url 'framework_json' %}">Download framework JSON</a>
</div>
</div>
<div class="row pt-sm-2 pt-lg-0">
Expand All @@ -36,7 +37,8 @@ <h1 class="pb-2 pb-lg-3">Skills and competencies</h1>
<nav class="nav flex-column pb-2 pb-lg-4 mb-3">
{% for domain in domains %}
<div class="mb-2">
<a class="nav-link fw-semibold py-2 px-0" href="#{{ domain.slug }}">
<a class="nav-link fw-semibold py-2 px-0"
href="#{{ domain.slug }}">
<i class="ai-user-check fs-5 opacity-60 me-2"></i>
{{ domain.name }}
</a>
Expand All @@ -63,7 +65,8 @@ <h1 class="pb-2 pb-lg-3">Skills and competencies</h1>
{% for domain in domains %}
<section class="card border-0 py-1 p-md-2 p-xl-3 p-xxl-4 mb-4">
<div class="card-body">
<h2 id="{{ domain.slug }}" class="card-title text-primary">{{ domain.name }}</h2>
<h2 id="{{ domain.slug }}"
class="card-title text-primary">{{ domain.name }}</h2>
<p class="card-text">{{ domain.description }}</p>
{% with competencies=domain.competency_set.all %}
<p class="card-text">
Expand Down
3 changes: 2 additions & 1 deletion main/templates/main/pages/tools-languages-methodologies.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<li class="breadcrumb-item">
<a href="{% url 'framework_overview' %}">Framework</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Tools, languages and methodologies</li>
<li class="breadcrumb-item active"
aria-current="page">Tools, languages and methodologies</li>
{% endblock breadcrumb_items %}
{% block content %}
<section id="tools-languages-methodologies">
Expand Down
3 changes: 2 additions & 1 deletion main/templates/main/shared-skills-profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ <h1>Shared Skills profile</h1>
</p>
<div id="dataviz_root" style="width:100%"></div>
{% if error_message %}
<div class="alert alert-danger" role="alert">{{ error_message }}</div>
<div class="alert alert-danger"
role="alert">{{ error_message }}</div>
{% else %}
{% include "main/snippets/skill-wheel.html" %}
{% endif %}
Expand Down
42 changes: 28 additions & 14 deletions main/templates/main/snippets/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
</p>
<div class="mb-4 pb-lg-3">
<p class="fs-xs text-uppercase text-body-secondary fw-semibold mb-2">Current releases</p>
<div class="d-flex flex-wrap gap-2" aria-label="Current project releases">
<div class="d-flex flex-wrap gap-2"
aria-label="Current project releases">
<a href="https://github.com/direct-framework/direct-webapp/releases"
target="_blank"
rel="noopener">
Expand Down Expand Up @@ -70,56 +71,69 @@
<h6 class="text-muted text-uppercase fs-xs fw-semibold mb-3">About</h6>
<ul class="nav flex-column mb-0">
<li class="nav-item mb-2">
<a class="nav-link p-0" href="{% url 'about' %}">Vision and roadmap</a>
<a class="nav-link p-0"
href="{% url 'about' %}">Vision and roadmap</a>
</li>
<li class="nav-item mb-2">
<a class="nav-link p-0" href="">Our team</a>
</li>
<li class="nav-item mb-2">
<a class="nav-link p-0" href="">History of the project</a>
<a class="nav-link p-0"
href="">History of the project</a>
</li>
<li class="nav-item mb-2">
<a class="nav-link p-0" href="{% url 'get_involved' %}">Get involved</a>
<a class="nav-link p-0"
href="{% url 'get_involved' %}">Get involved</a>
</li>
<li class="nav-item mb-2">
<a class="nav-link p-0" href="{% url 'events' %}">Communtiy events</a>
<a class="nav-link p-0"
href="{% url 'events' %}">Communtiy events</a>
</li>
</ul>
</div>
<div class="col">
<h6 class="text-muted text-uppercase fs-xs fw-semibold mb-3">Framework</h6>
<ul class="nav flex-column mb-0">
<li class="nav-item mb-2">
<a class="nav-link p-0" href="{% url 'framework_overview' %}">Overview</a>
<a class="nav-link p-0"
href="{% url 'framework_overview' %}">Overview</a>
</li>
<li class="nav-item mb-2">
<a class="nav-link p-0" href="{% url 'skills_and_competencies' %}">Competencies framework</a>
<a class="nav-link p-0"
href="{% url 'skills_and_competencies' %}">Competencies framework</a>
</li>
<li class="nav-item mb-2">
<a class="nav-link p-0" href="{% url 'skill_levels' %}">Skill levels</a>
<a class="nav-link p-0"
href="{% url 'skill_levels' %}">Skill levels</a>
</li>
<li class="nav-item mb-2">
<a class="nav-link p-0" href="{% url 'learning_resources' %}">Learning resources</a>
<a class="nav-link p-0"
href="{% url 'learning_resources' %}">Learning resources</a>
</li>
<li class="nav-item mb-2">
<a class="nav-link p-0" href="{% url 'roles' %}">Roles and career pathways</a>
<a class="nav-link p-0"
href="{% url 'roles' %}">Roles and career pathways</a>
</li>
</ul>
</div>
<div class="col">
<h6 class="text-muted text-uppercase fs-xs fw-semibold mb-3">Policies</h6>
<ul class="nav flex-column mb-0">
<li class="nav-item mb-2">
<a class="nav-link p-0" href="{% url 'licensing' %}">Licensing</a>
<a class="nav-link p-0"
href="{% url 'licensing' %}">Licensing</a>
</li>
<li class="nav-item mb-2">
<a class="nav-link p-0" href="{% url 'governance' %}">Governance</a>
<a class="nav-link p-0"
href="{% url 'governance' %}">Governance</a>
</li>
<li class="nav-item mb-2">
<a class="nav-link p-0" href="{% url 'privacy' %}">Privacy policy</a>
<a class="nav-link p-0"
href="{% url 'privacy' %}">Privacy policy</a>
</li>
<li class="nav-item mb-2">
<a class="nav-link p-0" href="{% url 'terms' %}">Terms of use</a>
<a class="nav-link p-0"
href="{% url 'terms' %}">Terms of use</a>
</li>
</ul>
</div>
Expand Down
3 changes: 2 additions & 1 deletion main/templates/main/snippets/hero.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ <h3>Competencies for digital research</h3>
<p class="mb-4">
Define the knowledge and behaviours individuals need to succeed in digital research and technical roles in academia.
</p>
<a class="btn btn-lg btn-primary" href="{% url 'framework_overview' %}">Explore
<a class="btn btn-lg btn-primary"
href="{% url 'framework_overview' %}">Explore
the framework</a>
</div>
</div>
Expand Down
21 changes: 14 additions & 7 deletions main/templates/main/snippets/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -103,23 +103,28 @@ <h6 class="dropdown-header fs-xs fw-medium text-body-secondary text-uppercase pb
aria-expanded="false">Framework</a>
<ul class="dropdown-menu">
<li>
<a class="dropdown-item" href="{% url 'framework_overview' %}">Overview</a>
<a class="dropdown-item"
href="{% url 'framework_overview' %}">Overview</a>
</li>
<li>
<a class="dropdown-item" href="{% url 'skills_and_competencies' %}">Skills and competencies</a>
<a class="dropdown-item"
href="{% url 'skills_and_competencies' %}">Skills and competencies</a>
</li>
<li>
<a class="dropdown-item" href="{% url 'skill_levels' %}">Skill levels</a>
<a class="dropdown-item"
href="{% url 'skill_levels' %}">Skill levels</a>
</li>
<li>
<a class="dropdown-item" href="{% url 'learning_resources' %}">Learning resources</a>
<a class="dropdown-item"
href="{% url 'learning_resources' %}">Learning resources</a>
</li>
<li>
<a class="dropdown-item"
href="{% url 'tools_languages_methodologies' %}">Tools, languages and methodologies</a>
</li>
<li>
<a class="dropdown-item" href="{% url 'roles' %}">Roles and career pathways</a>
<a class="dropdown-item"
href="{% url 'roles' %}">Roles and career pathways</a>
</li>
</ul>
</li>
Expand All @@ -131,10 +136,12 @@ <h6 class="dropdown-header fs-xs fw-medium text-body-secondary text-uppercase pb
aria-expanded="false">Community</a>
<ul class="dropdown-menu">
<li>
<a class="dropdown-item" href="{% url 'get_involved' %}">Get involved</a>
<a class="dropdown-item"
href="{% url 'get_involved' %}">Get involved</a>
</li>
<li>
<a class="dropdown-item" href="{% url 'events' %}">Events</a>
<a class="dropdown-item"
href="{% url 'events' %}">Events</a>
</li>
</ul>
</li>
Expand Down
Loading