Skip to content

Commit

Permalink
added icons for survey
Browse files Browse the repository at this point in the history
  • Loading branch information
rosannamilner committed Feb 12, 2025
1 parent 73b747b commit 42c81bf
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,8 @@
</div>

<div>
<button class="btn btn-primary" onclick={() => {onDuplicateRequest()}}>Duplicate</button>
<button class="btn btn-danger" onclick={() => {onDeleteRequest()}}>Delete</button>
<button class="btn btn-primary" onclick={() => {onDuplicateRequest()}}><i class="bx bxs-duplicate"></i> Duplicate</button>
<button class="btn btn-danger" onclick={() => {onDeleteRequest()}}><i class="bx bxs-trash"></i> Delete</button>
</div>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
</div>
{/each}
<div>
<button class="btn btn-primary btn-sm" onclick={addOption}>Add option</button>
<button class="btn btn-primary btn-sm" onclick={addOption}><i class="bx bx-plus"></i> Add option</button>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
{/each}

{#if editable}
<button class="btn btn-primary" onclick={addField}>Add field</button>
<button class="btn btn-primary" onclick={addField}><i class="bx bx-plus"></i> Add field</button>
{/if}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions home/templates/components/search_bar.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
{% endif %}
{% endfor %}
{{ search_form.q }}
<button type="submit" class="btn btn-primary"><div class="d-flex flex-row align-items-center"><i class="bx bxs-search" alt=""></i> Search</div></button>
<button type="submit" class="btn btn-primary"><div class="d-flex flex-row align-items-center"><i class="bx bxs-search"></i> Search</div></button>
{% if current_search %}
<a href="{{ search_url }}" class="btn btn-light border"><div class="d-flex flex-row align-items-center"><i class="bx bxs-x-circle" alt=""></i> Clear</div></a>
<a href="{{ search_url }}" class="btn btn-light border"><div class="d-flex flex-row align-items-center"><i class="bx bxs-x-circle"></i> Clear</div></a>
{% endif %}
</form>

Expand Down
2 changes: 1 addition & 1 deletion home/templates/home/profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h1>Profile</h1>

<div class="text-center">
<button type="submit" class="btn btn-primary" style="background-color: #6933AD; border: none;">
<i class="bx bxs-user-check" alt=""></i> Update Profile
<i class="bx bxs-user-check"></i> Update Profile
</button>
<!-- <a href="{% url 'home' %}" class="btn btn-primary" style="background-color: #6933AD; border: none; margin-left: 10px;">
Cancel
Expand Down
8 changes: 4 additions & 4 deletions home/templates/organisation/organisation.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb mb-0">
<li class="breadcrumb-item active" aria-current="page">
<i class="bx bxs-buildings" alt=""></i> My Organisation
<i class="bx bxs-buildings"></i> My Organisation
</li>
</ol>
</nav>
Expand All @@ -26,7 +26,7 @@ <h2 class="text-2xl font-bold d-inline-block">Projects</h2>
{% if can_create %}
<a href="{% url 'project_create' organisation.id %}">
<button type="button" class="btn btn-primary">
<i class="bx bxs-folder-plus" alt=""></i> Create project
<i class="bx bxs-folder-plus"></i> Create project
</button>
</a>
{% endif %}
Expand All @@ -46,13 +46,13 @@ <h2 class="text-2xl font-bold d-inline-block">Projects</h2>
{% if can_edit|get_item:project.id %}
<a href="{% url 'project_edit' project.id %}">
<button type="button" class="btn btn-light">
<i class="bx bxs-edit" alt=""></i> Edit
<i class="bx bxs-edit"></i> Edit
</button>
</a>
{% endif %}
<a href="{% url 'project' project.id %}">
<button type="button" class="btn btn-dark">
<i class="bx bxs-folder-open" alt=""></i> View
<i class="bx bxs-folder-open"></i> View
</button>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion home/templates/projects/create.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1>Create Project</h1>
{% endfor %}
<div class="text-center">
<button type="submit" class="btn btn-primary" style="background-color: #6933AD; border: none;">
<i class="bx bxs-folder-plus" alt=""></i> Create Project
<i class="bx bxs-folder-plus"></i> Create Project
</button>
</div>
</form>
Expand Down
10 changes: 5 additions & 5 deletions home/templates/projects/project.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb mb-0">
<li class="breadcrumb-item" aria-current="page">
<i class="bx bxs-buildings" alt=""></i> <a href="{% url 'myorganisation' %}">My Organisation</a>
<i class="bx bxs-buildings"></i> <a href="{% url 'myorganisation' %}">My Organisation</a>
</li>
<li class="breadcrumb-item active" aria-current="page">
<i class="bx bxs-folder-open" alt=""></i> Project: {{ project.name }}
<i class="bx bxs-folder-open"></i> Project: {{ project.name }}
</li>
</ol>
</nav>
Expand All @@ -30,7 +30,7 @@ <h1>{{ project.name }}</h1>
<div></div>
<div></div>
<div>
<a href="{% url 'project_delete' project.pk %}" class="btn btn-danger"><i class="bx bxs-trash" alt=""></i>Delete project</a>
<a href="{% url 'project_delete' project.pk %}" class="btn btn-danger"><i class="bx bxs-trash"></i> Delete project</a>
</div>
</div>
</div>
Expand All @@ -44,7 +44,7 @@ <h2 class="text-2xl font-bold d-inline-block">Surveys</h2>
{% if can_create %}
<a href="{% url 'survey_create' project.id %}">
<button type="button" class="btn btn-primary">
<i class="bx bx-chart" alt=""></i> Create survey
<i class="bx bx-chart"></i> Create survey
</button>
</a>
{% endif %}
Expand All @@ -60,7 +60,7 @@ <h3 class="card-title">{{ survey.name }}</h3>
<div class="mt-2 w-100 d-flex flex-wrap justify-content-end gap-2">
<a href="{% url 'survey' survey.id %}">
<button type="button" class="btn btn-dark">
<i class="bx bxs-chart" alt=""></i> View
<i class="bx bxs-chart"></i> View
</button>
</a>
</div>
Expand Down
8 changes: 4 additions & 4 deletions static/templates/base_manager.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav ms-auto">
<li class="nav-item">
<a class="nav-link {% if request.path == invite_url %}active{% endif %}" href="{{ home_url }}"><i class="bx bxs-home" alt=""></i>Home</a>
<a class="nav-link {% if request.path == invite_url %}active{% endif %}" href="{{ home_url }}"><i class="bx bxs-home"></i>Home</a>
</li>
<li class="nav-item">
<a class="nav-link {% if '/profile' in request.path %}active{% endif %}" href="{% url 'profile' %}"><i class="bx bxs-user" alt=""></i>Profile</a>
<a class="nav-link {% if '/profile' in request.path %}active{% endif %}" href="{% url 'profile' %}"><i class="bx bxs-user"></i>Profile</a>
</li>
<li class="nav-item">
{% url 'organisation_create' as organisation_create_url %}
Expand All @@ -30,7 +30,7 @@
{% if '/projects' in request.path %}active{% endif %}
{% if '/survey' in request.path %}active{% endif %}
{% if '/completion' in request.path %}active{% endif %}"
href="{% url 'myorganisation' %}"><i class="bx bxs-buildings" alt=""></i>My Organisation</a>
href="{% url 'myorganisation' %}"><i class="bx bxs-buildings"></i>My Organisation</a>
</li>
{% if user.is_authenticated %}
<li class="nav-item">
Expand All @@ -39,7 +39,7 @@
method="POST"
style="display: inline">
{% csrf_token %}
<button type="submit" class="nav-link btn btn-link btn-primary"><i class="bx bxs-user-x" alt=""></i> Logout</button>
<button type="submit" class="nav-link btn btn-link btn-primary"><i class="bx bxs-user-x"></i> Logout</button>
</form>
</li>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion survey/templates/invitations/send_invitation.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h1>Invitations</h1>
</div>

<div class="text-center">
<button type="submit" class="btn btn-primary" style="background-color: #6933AD; border: none;"><i class="bx bxs-send" alt=""></i> Send</button>
<button type="submit" class="btn btn-primary" style="background-color: #6933AD; border: none;"><i class="bx bxs-send"></i> Send</button>
</div>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion survey/templates/survey/create.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1>Create Survey</h1>
{% endfor %}
<div class="text-center">
<button type="submit" class="btn btn-primary" style="background-color: #6933AD; border: none;">
<i class="bx bx-chart" alt=""></i> Create Survey
<i class="bx bx-chart"></i> Create Survey
</button>
</div>
</form>
Expand Down
10 changes: 5 additions & 5 deletions survey/templates/survey/survey.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item" aria-current="page">
<i class="bx bxs-buildings" alt=""></i> <a href="{% url 'myorganisation' %}">My Organisation</a>
<i class="bx bxs-buildings"></i> <a href="{% url 'myorganisation' %}">My Organisation</a>
</li>
<li class="breadcrumb-item" aria-current="page">
<i class="bx bxs-folder-open" alt=""></i> <a
<i class="bx bxs-folder-open"></i> <a
href="{% url 'project' survey.project.id %}">Project: {{ survey.project.name }}</a>
</li>
<li class="breadcrumb-item active" aria-current="page">
<i class="bx bxs-chart" alt=""></i> Survey: {{ survey.name }}
<i class="bx bxs-chart"></i> Survey: {{ survey.name }}
</li>
</ol>
</nav>
Expand All @@ -29,7 +29,7 @@ <h1>{{ survey.name }}</h1>
<div></div>
<div></div>
<div>
<a href="{% url 'survey_delete' survey.pk %}" class="btn btn-danger"><i class="bx bxs-trash" alt=""></i>Delete survey</a>
<a href="{% url 'survey_delete' survey.pk %}" class="btn btn-danger"><i class="bx bxs-trash"></i>Delete survey</a>
</div>
</div>
</div>
Expand All @@ -48,7 +48,7 @@ <h2>1. Configure Your Survey</h2>
<div class="mb-3 mt-3">
<p>First, configure you survey here. You are able to add and customise demographic questions asked
in the survey.</p>
<a href="{% url 'survey_configure' survey.id %}" class="btn btn-primary"><i class="bx bxs-cog" alt=""></i> Configure the survey</a>
<a href="{% url 'survey_configure' survey.id %}" class="btn btn-primary"><i class="bx bxs-cog"></i> Configure the survey</a>
</div>
</div>
</div>
Expand Down

0 comments on commit 42c81bf

Please sign in to comment.