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.

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

new alerts front end #1846

Closed
wants to merge 51 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c0efe19
add mariadb-client to Docker packages
struan Oct 9, 2024
716d068
add categorised alerts to user data
struan Oct 9, 2024
7b9743c
optionally return alert parts from prettify and add parts to alerts
struan Oct 9, 2024
4ece5df
update alerts page to use new look for displaying alerts
lucascumsille Oct 1, 2024
db0494d
handle sections for alerts prettyCriteria
struan Oct 10, 2024
c861390
display which sections an alert is limited to
struan Oct 10, 2024
9fa20e4
new forms for editing keyword and speaker alerts
struan Oct 24, 2024
9b1fedc
fix some search tests
struan Oct 24, 2024
e52992b
add vector_search_suggestions table
struan Oct 28, 2024
09528b1
show suggested search terms when creating an alert
struan Oct 28, 2024
761080e
script to import search suggestions into the database
struan Oct 29, 2024
1c0311e
make new alert searches use OR for keywords
struan Oct 28, 2024
9e728ec
optionally enable matching all terms in an alert
struan Oct 28, 2024
70b1bbb
group MP alerts together on alert page
struan Oct 28, 2024
fe96373
do not display disambigation options after editing an alert
struan Oct 29, 2024
80d7624
only use alertsearch on alert page for queries from elsewhere
struan Oct 29, 2024
84f35cb
display your own MP's keywords alerts even if no speaks alert
struan Oct 31, 2024
e27eb1b
add in some more alert page tests
struan Oct 29, 2024
251f82c
Tidy up front-end
lucascumsille Nov 12, 2024
e83ea9d
Remove discard changes buttton
lucascumsille Nov 12, 2024
6020246
fixup! Tidy up front-end
lucascumsille Nov 12, 2024
99b8cb0
Added minor improvements to buttons
lucascumsille Nov 12, 2024
9d0db9d
fixup! Tidy up front-end
lucascumsille Nov 12, 2024
d5e75e5
add some diagnostics to the vector search import script
struan Nov 13, 2024
f017fcb
spelling fix
struan Nov 14, 2024
ec3a379
fixup! Tidy up front-end
lucascumsille Nov 18, 2024
954522e
Added frontend to MP section
lucascumsille Nov 18, 2024
2d70cf1
fixup! Tidy up front-end
lucascumsille Nov 18, 2024
98e3260
fix red border on abandon changed button
struan Dec 3, 2024
ad2000e
add abandon changes button to first step of alert wizard
struan Dec 3, 2024
54344b9
Moved button icons from right to left
lucascumsille Dec 3, 2024
70371c8
fixup! Moved button icons from right to left
lucascumsille Dec 3, 2024
5830227
Improved indent for accordion items
lucascumsille Dec 3, 2024
14fa6b7
improve suggested terms workflow
struan Dec 3, 2024
d5d1c38
select and disable all suggested terms if click add all
struan Dec 3, 2024
f37be22
Moved search tips to alert form
lucascumsille Dec 3, 2024
9ab7168
add abandon changes button to suggestions step
struan Dec 3, 2024
f8618d3
small improvements to own mp alert section
struan Dec 3, 2024
232c65d
better detection of MP related alerts for grouping
struan Dec 3, 2024
1f20bc3
Reduced the amount of colour in alert page
lucascumsille Dec 4, 2024
d9b60c1
Improve message front-end when user is not subscribed to MP
lucascumsille Dec 4, 2024
fb7d719
Improve layout for alert-page-header
lucascumsille Dec 4, 2024
0100cfc
Remove alert-mockup file
lucascumsille Dec 4, 2024
52b971f
Improve color for open accordion, so it's easier to scan alert page
lucascumsille Dec 4, 2024
52521db
fixup! better detection of MP related alerts for grouping
struan Dec 4, 2024
5638cfa
fixup! fixup! better detection of MP related alerts for grouping
struan Dec 4, 2024
1d3d075
fix alert criteria parsing if only a single quoted phrase
struan Dec 4, 2024
75679ba
fix delete all button on alerts page
struan Dec 4, 2024
0004aca
fixup! fixup! fixup! better detection of MP related alerts for grouping
struan Dec 4, 2024
d306bbf
fixup! fix delete all button on alerts page
struan Dec 4, 2024
fba24b9
show all reps if using postcode to signup to MP alert
struan Dec 4, 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
Prev Previous commit
Next Next commit
fixup! Tidy up front-end
lucascumsille committed Nov 18, 2024
commit ec3a379ac489cbbcaf166e7ecbd62f300c443d01
6 changes: 4 additions & 2 deletions www/docs/style/sass/parts/_accordion.scss
Original file line number Diff line number Diff line change
@@ -250,7 +250,9 @@ button {
border-color: $body-font-color;
}

fieldset {
column-count: 2;
.checkbox-group {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
gap: 1rem;
}
}
12 changes: 6 additions & 6 deletions www/includes/easyparliament/templates/html/alert/_alert_form.php
Original file line number Diff line number Diff line change
@@ -140,12 +140,12 @@

<fieldset>
<legend><?= gettext('Related Terms') ?></legend>
<div>
<?php foreach ($suggestions as $suggestion) { ?>
<input type="hidden" name="related_terms[]" value="<?= _htmlspecialchars($suggestion) ?>">
<label><input type="checkbox" name="selected_related_terms[]" value="<?= _htmlspecialchars($suggestion) ?>"<?= in_array($suggestion, $selected_related_terms) ? ' checked' : '' ?>><?= _htmlspecialchars($suggestion) ?></label><br>
<?php } ?>
<div class="checkbox-group">
<label><input type="checkbox" name="add_all_related" id="add-all"<?= $add_all_related == 'on' ? ' checked' : '' ?>><?= gettext('Add all related terms') ?></label>
<?php foreach ($suggestions as $suggestion) { ?>
<input type="hidden" name="related_terms[]" value="<?= _htmlspecialchars($suggestion) ?>">
<label><input type="checkbox" name="selected_related_terms[]" value="<?= _htmlspecialchars($suggestion) ?>"<?= in_array($suggestion, $selected_related_terms) ? ' checked' : '' ?>><?= _htmlspecialchars($suggestion) ?></label>
<?php } ?>
</div>
</fieldset>

@@ -164,7 +164,7 @@
</div>
<?php } ?>

<a href="/search/?q=<?= _htmlspecialchars($criteria) ?>" target="_blank" class="button small"><?= gettext('See results for this alert') ?></a>
<a href="/search/?q=<?= _htmlspecialchars($criteria) ?>" target="_blank" aria-label="See results for this alert - Opens in a new tab"><?= gettext('See results for this alert &rarr;') ?></a>
</dl>

<button type="submit" name="step" value="define" class="prev" aria-label="Go back to Step 2">Previous</button>