Skip to content

Commit

Permalink
Merge pull request #689 from alan-turing-institute/copy_edits
Browse files Browse the repository at this point in the history
Add in copy edits
  • Loading branch information
gedankenstuecke authored Jun 10, 2024
2 parents 97dbabf + bc06df4 commit d87d311
Show file tree
Hide file tree
Showing 19 changed files with 887 additions and 630 deletions.
14 changes: 7 additions & 7 deletions server/apps/main/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ShareExperienceForm(forms.Form):


experience_text = forms.CharField(label='Please share your experience', strip=True,
help_text='Write your experience here, you can take as much or little space as you need.',
help_text='Write your experience here. You can take as much or as little space as you need.',
widget=forms.Textarea(attrs={'placeholder':'Please share your story.',
'rows':'4',
'class':'form-control'}))
Expand All @@ -31,11 +31,11 @@ class ShareExperienceForm(forms.Form):
# add triggering here
abuse = forms.BooleanField(label = 'Abuse (physical, sexual, emotional and verbal)', required=False)
abuse.group = 2
violence = forms.BooleanField(label = 'Violence and Assault', required=False)
violence = forms.BooleanField(label = 'Violence and assault', required=False)
violence.group = 2
drug = forms.BooleanField(label = 'Drug and/or Alcohol misuse', required=False)
drug = forms.BooleanField(label = 'Drug and/or alcohol misuse', required=False)
drug.group = 2
mentalhealth = forms.BooleanField(label = 'Mental Health Issues', required=False)
mentalhealth = forms.BooleanField(label = 'Mental health issues', required=False)
mentalhealth.group = 2
negbody = forms.BooleanField(label = 'Negative body image', required=False)
negbody.group = 2
Expand Down Expand Up @@ -124,11 +124,11 @@ class ModerateExperienceForm(forms.Form):
# trigger labels
abuse = forms.BooleanField(label = 'Abuse (physical, sexual, emotional and verbal)', required=False)
abuse.group = 2
violence = forms.BooleanField(label = 'Violence and Assault', required=False)
violence = forms.BooleanField(label = 'Violence and assault', required=False)
violence.group = 2
drug = forms.BooleanField(label = 'Drug and/or Alcohol misuse', required=False)
drug = forms.BooleanField(label = 'Drug and/or alcohol misuse', required=False)
drug.group = 2
mentalhealth = forms.BooleanField(label = 'Mental Health Issues', required=False)
mentalhealth = forms.BooleanField(label = 'Mental health issues', required=False)
mentalhealth.group = 2
negbody = forms.BooleanField(label = 'Negative body image', required=False)
negbody.group = 2
Expand Down
262 changes: 176 additions & 86 deletions server/apps/main/templates/main/about_us.html

Large diffs are not rendered by default.

396 changes: 226 additions & 170 deletions server/apps/main/templates/main/content_moderation_guidelines.html

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions server/apps/main/templates/main/experiences_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,20 @@
<div class="container">
<div class="row">
<div class="col-lg-12 text-left">
<h1 class="big-heading">View Stories</h1>
<h1 class="big-heading">View stories</h1>
</div>
<div class="col-lg-12 text-left">
<p class="intro-text">Autistic people often have different sensory processing to people who are not autistic.
By collecting together lots of autistic people's experiences, we can change spaces so that they are
better for autistic people.
<p class="intro-text">
Autistic people’s senses often work differently to those of non-autistic people,
creating all sorts of challenges in day-to-day life. By collecting your experiences,
we can learn more and use the information to influence decision-makers to make spaces more autism-friendly.
</p>
</div>
</div>
<div class="row">
<div class="col">
<a href="{% url 'main:share_exp' %}" class="float-end btn btn-light btn-lg">
Add Story
Add story
</a>
</div>
</div>
Expand All @@ -52,12 +53,11 @@ <h1 class="big-heading">View Stories</h1>
<input class="form-control mb-2" id="inlineFormInput" placeholder="Search Stories" value="{{ searched }}" type="text" name="searched" />
</div>
<div class="col-md-2">
<button class="btn btn-primary mb-2" type="submit">Search Stories</button>
<button class="btn btn-primary mb-2" type="submit">Search stories</button>
</div>
</div>
<div class="trigger-warning-message"> We have excluded potentially
triggering content, please select any categories that you would be
comfortable seeing
<div class="trigger-warning-message">
We have <strong>excluded</strong> potentially triggering content. Please <strong>select any categories you would be comfortable seeing</strong>:
</div>
</div>

Expand Down Expand Up @@ -87,41 +87,41 @@ <h1 class="big-heading">View Stories</h1>
<input class="form-check-input"
type="checkbox"
role="switch"
id="drug-checkbox"
name="drug"
id="violence-checkbox"
name="violence"
value="True"
{{ checkdrug|yesno:"checked,unchecked" }} />
<label class="form-check-label" for="drug-checkbox">Drug and/or Alcohol misuse</label>
{{ checkviolence|yesno:"checked,unchecked" }} />
<label class="form-check-label" for="violence-checkbox">Violence and assault</label>
</div>
<div class="form-check form-switch">
<input class="form-check-input"
type="checkbox"
role="switch"
id="negbody-checkbox"
name="negbody"
id="drug-checkbox"
name="drug"
value="True"
{{ checknegbody|yesno:"checked,unchecked" }} />
<label class="form-check-label" for="negbody-checkbox">Negative body image</label>
{{ checkdrug|yesno:"checked,unchecked" }} />
<label class="form-check-label" for="drug-checkbox">Drug and/or alcohol misuse</label>
</div>
<div class="form-check form-switch">
<input class="form-check-input"
type="checkbox"
role="switch"
id="violence-checkbox"
name="violence"
id="mentalhealth-checkbox"
name="mentalhealth"
value="True"
{{ checkviolence|yesno:"checked,unchecked" }} />
<label class="form-check-label" for="violence-checkbox">Violence and Assault</label>
{{ checkmentalhealth|yesno:"checked,unchecked" }} />
<label class="form-check-label" for="mentalhealth-checkbox">Mental health issues</label>
</div>
<div class="form-check form-switch">
<input class="form-check-input"
type="checkbox"
role="switch"
id="mentalhealth-checkbox"
name="mentalhealth"
id="negbody-checkbox"
name="negbody"
value="True"
{{ checkmentalhealth|yesno:"checked,unchecked" }} />
<label class="form-check-label" for="mentalhealth-checkbox">Mental Health Issues</label>
{{ checknegbody|yesno:"checked,unchecked" }} />
<label class="form-check-label" for="negbody-checkbox">Negative body image</label>
</div>
<div class="form-check form-switch">
<input class="form-check-input"
Expand Down Expand Up @@ -161,7 +161,7 @@ <h1 class="big-heading">View Stories</h1>
<span class="badge text-bg-warning float-end" style="font-size: 1rem; margin-top:1%; margin-left:1%;">{{experience.other}}</span>
{% endif %}
{% if experience.mentalhealth %}
<span class="badge text-bg-warning float-end" style="font-size: 1rem; margin-top:1%; margin-left:1%;">Mental Health issues</span>
<span class="badge text-bg-warning float-end" style="font-size: 1rem; margin-top:1%; margin-left:1%;">Mental health issues</span>
{% endif %}
{% if experience.violence %}
<span class="badge text-bg-warning float-end" style="font-size: 1rem; margin-top:1%; margin-left:1%;">Violence</span>
Expand All @@ -170,7 +170,7 @@ <h1 class="big-heading">View Stories</h1>
<span class="badge text-bg-warning float-end" style="font-size: 1rem; margin-top:1%; margin-left:1%;">Negative body image</span>
{% endif %}
{% if experience.drug %}
<span class="badge text-bg-warning float-end" style="font-size: 1rem; margin-top:1%; margin-left:1%;">Drug and/or Alcohol misuse</span>
<span class="badge text-bg-warning float-end" style="font-size: 1rem; margin-top:1%; margin-left:1%;">Drug and/or alcohol misuse</span>
{% endif %}
{% if experience.abuse %}
<span class="badge text-bg-warning float-end" style="font-size: 1rem; margin-top:1%; margin-left:1%;">Abuse</span>
Expand Down
Loading

0 comments on commit d87d311

Please sign in to comment.