Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove inline styles #657

Merged
merged 3 commits into from
Sep 9, 2024
Merged

Remove inline styles #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2eb516f
Replace inline styles with Tailwind classes
tomodwyer Sep 6, 2024
db1354a
Fix inline styles in forms
tomodwyer Sep 6, 2024
c9cec01
Fix missing hint_below prop
tomodwyer Sep 9, 2024
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
24 changes: 12 additions & 12 deletions airlock/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@ class GroupEditForm(forms.Form):
help_text=mark_safe(
"""
<div class="c2-help">
Please describe the contents of these outputs to help reviewers. This includes:
<ul style="margin-top: 0;">
<li>Variable descriptions</li>
<li>A description and count of the underlying population for each output if it is not included in the output.</li>
<li>Specify population size and degrees of freedom for all regression outputs.</li>
<li>Relationship to other data/tables which through combination may introduce secondary disclosive risks.</li>
</ul>
<p>Please describe the contents of these outputs to help reviewers. This includes:</p>
<ul>
<li>Variable descriptions</li>
<li>A description and count of the underlying population for each output if it is not included in the output.</li>
<li>Specify population size and degrees of freedom for all regression outputs.</li>
<li>Relationship to other data/tables which through combination may introduce secondary disclosive risks.</li>
</ul>
</div>
"""
),
Expand All @@ -146,11 +146,11 @@ class GroupEditForm(forms.Form):
help_text=mark_safe(
"""
<div class="c2-help">
Please describe the statistical disclosure controls you have applied to these outputs. This includes:
<ul>
<li>The threshold used for low number suppression.</li>
<li>The rounding approach used.</li>
</ul>
<p>Please describe the statistical disclosure controls you have applied to these outputs. This includes:</p>
<ul>
<li>The threshold used for low number suppression.</li>
<li>The rounding approach used.</li>
</ul>
</div>
"""
),
Expand Down
22 changes: 17 additions & 5 deletions airlock/templates/_includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,29 @@
</span>
</summary>
<div class="absolute border-0 origin-top-right top-full mt-2 right-20 z-10 w-48 rounded-md shadow-lg overflow-hidden bg-white ring-1 ring-black ring-opacity-5 focus:outline-none text-sm">
<p class="pt-3 pb-2 px-4" style="background-color: var(--color-red-500);">TEST MODE ONLY</p>
<p class="pt-3 pb-2 px-4 bg-red-700 text-red-50">TEST MODE ONLY</p>
{% for username, token in dev_users.items %}
<form
{% if username == request.user.username %}style="background-color: var(--color-emerald-50);"{% endif %}
class="border-t block px-4 py-2 text-oxford hover:text-bn-strawberry-700 hover:bg-oxford-50 focus:text-bn-strawberry-700 focus:outline-none focus:ring-2 focus:ring-oxford-500 focus:ring-inset w-full text-left"
method="POST" action="{% url 'login' %}">
action="{% url 'login' %}"
method="POST"
>
{% csrf_token %}
<input type="hidden" name="next" value="{{ request.path }}" />
<input type="hidden" name="user" value="{{ username }}" />
<input type="hidden" name="token" value="{{ token }}" />
<button type="submit">{{ username }}</button>
<button
class="
border-t block px-4 py-2 focus:outline-none focus:ring-2 focus:ring-oxford-500 focus:ring-inset w-full text-left
{% if username == request.user.username %}
bg-emerald-200 text-emerald hover:text-bn-emerald-700 hover:bg-emerald-50 focus:text-bn-emerald-700
{% else %}
text-oxford hover:text-bn-strawberry-700 hover:bg-oxford-50 focus:text-bn-strawberry-700
{% endif %}
"
type="submit"
>
{{ username }}
</button>
</form>
{% endfor %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion airlock/templates/activity.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{% if activity %}
<div id="airlock-table">
<p class="spinner">Loading table data...</p>
<table class="datatable" style="display: none" id="customTable">
<table class="datatable hidden" id="customTable">
<thead>
<tr>
<th><div class="flex flex-row gap-2">Time{% datatable_sort_icon %}</div></th>
Expand Down
2 changes: 1 addition & 1 deletion airlock/templates/file_browser/file_content/csv.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div id="airlock-table">
{% if use_datatables %}
<p class="spinner">Loading table data...</p>
<table class="datatable" style="display: none" id="customTable">
<table class="datatable hidden" id="customTable">
{% else %}
<table>
{% endif %}
Expand Down
24 changes: 10 additions & 14 deletions airlock/templates/file_browser/request/filegroup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,21 @@
</style>
{% #card title=group.title container=True class="group_modal" %}
<div data-testid="c3">
<form action="{{ group.c2_edit_url }}" method="POST" aria-label="group-edit-form">
<form
action="{{ group.c2_edit_url }}"
aria-label="group-edit-form"
class="grid grid-cols-2 gap-x-6 gap-y-4 items-start"
method="POST"
>
{% csrf_token %}
<div style="display: flex; flex-direction: row; width: 100%; flex-wrap: wrap; gap: 1rem;">
<div style="display: flex: flex-direction: column; flex-basis: 100%; flex: 1;">

{% form_textarea field=group.c2_edit_form.context resize=True hint_below=True show_placeholder=True placeholder="Describe the data to be released in this group of files" class="w-full max-w-lg mx-auto" rows=6 disabled=group.c2_readonly readonly=group.c2_readonly %}
</div>
<div style="display: flex: flex-direction: column; flex-basis: 100%; flex: 1; gap: 1rem;">
{% form_textarea field=group.c2_edit_form.controls resize=True hint_below=True show_placeholder=True placeholder="Describe the disclosure controls that have been applied to these files" class="w-full max-w-lg mx-auto" rows=6 disabled=group.c2_readonly readonly=group.c2_readonly %}
</div>
</div>
{% form_textarea field=group.c2_edit_form.context resize=True hint_below=True show_placeholder=True placeholder="Describe the data to be released in this group of files" class="w-full max-w-lg mx-auto" rows=6 disabled=group.c2_readonly readonly=group.c2_readonly %}
{% form_textarea field=group.c2_edit_form.controls resize=True hint_below=True show_placeholder=True placeholder="Describe the disclosure controls that have been applied to these files" class="w-full max-w-lg mx-auto" rows=6 disabled=group.c2_readonly readonly=group.c2_readonly %}
{% if not group.c2_readonly %}
<div class="mt-2">
{% #button type="submit" variant="success" id="edit-group-button" disabled=group.c2_readonly %}Save{% /button %}
</div>
{% #button type="submit" variant="success" id="edit-group-button" class="w-min" disabled=group.c2_readonly %}Save{% /button %}
{% endif %}
</form>

<div class="comments" style="margin-top: 1rem;">
<div class="comments mt-4">
{% #list_group %}
{% for comment, comment_class in group.comments %}

Expand Down
2 changes: 1 addition & 1 deletion airlock/templates/file_browser/request/request.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="pb-8">
Please confirm that you have read the OpenSAFELY
documentation on data release. In particular note that:
<blockquote style="margin-left: 1rem; margin-top: 1rem">
<blockquote class="ml-4 mt-4">
<p>
All outputs from the NHS England OpenSAFELY COVID-19 service must be
aggregated data with small number suppression applied. The service operates as
Expand Down