aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2018-04-20 16:52:17 +0100
committerStruan Donald <struan@exo.org.uk>2018-04-23 09:43:40 +0100
commita51125241505d15f9b0d48cc2f9b6551d186cd8f (patch)
tree28c44a2995e6c18e7e427a411ef9211cc84fb302
parent73aa0acbead3d508192f21a3d63e336fc813a8ea (diff)
hide deleted contacts by default
If JavaScript is enabled hide the deleted contacts from the list on the body page. Display as normal if no JavaScript. Fixes #1962
-rw-r--r--CHANGELOG.md1
-rw-r--r--web/cobrands/fixmystreet/admin.js2
-rw-r--r--web/cobrands/sass/_admin.scss4
3 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cabaf7cd..f8a0ef7e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@
- Bulk user import admin page. #2057
- Add link to admin edit page for reports. #2071
- Nicer Open311 errors. #2078
+ - Deleted body categories now hidden by default #1962
- Development improvements:
- Add HTML email previewer.
- Add CORS header to Open311 output. #2022
diff --git a/web/cobrands/fixmystreet/admin.js b/web/cobrands/fixmystreet/admin.js
index f5ae082c0..d1a75a6dc 100644
--- a/web/cobrands/fixmystreet/admin.js
+++ b/web/cobrands/fixmystreet/admin.js
@@ -51,7 +51,7 @@ $(function(){
// on a body's page, hide/show deleted contact categories
var $table_with_deleted_contacts = $('table tr.is-deleted td.contact-category').closest('table');
if ($table_with_deleted_contacts.length == 1) {
- var $toggle_deleted_btn = $("<input type='submit' class='btn' value='Hide deleted contacts' id='toggle-deleted-contacts-btn' style='margin:1em 0;'/>");
+ var $toggle_deleted_btn = $("<input type='submit' class='btn' value='Show deleted contacts' id='toggle-deleted-contacts-btn' style='margin:1em 0;'/>");
$table_with_deleted_contacts.before($toggle_deleted_btn);
$toggle_deleted_btn.on('click', function(e){
e.preventDefault();
diff --git a/web/cobrands/sass/_admin.scss b/web/cobrands/sass/_admin.scss
index bf96dd08f..9b4f8e20f 100644
--- a/web/cobrands/sass/_admin.scss
+++ b/web/cobrands/sass/_admin.scss
@@ -69,6 +69,10 @@ $button_bg_col: #a1a1a1; // also search bar (tables)
}
}
+.js tr.is-deleted {
+ display: none;
+}
+
.admin-box { // for delimiting forms, etc
border:1px solid #999;
padding:0.5em 1em;