This is a suggestion because I think it would make more sense (we have attribute types, credit types, debit types, etc.) but also to help with translations. Right now, the term for a restriction on a specific patron and the term for the restriction type administration are the same, but they don't mean the same thing. #: koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt:130 #: koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt:38 #: koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt:57 #: koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt:167 #: koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt:218 #: koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt:1411 #: koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:58 #, c-format msgid "Patron restrictions" msgstr "Restrictions de l'utilisateur" In memberentrygen, it's to add a restriction to a specific patron In admin-home/menu and restrictions, it's to add restriction types Therefore, I think the administration page should be named 'Patron restriction types'. Opinions?
Created attachment 149780 [details] [review] Bug 33550: Rename Patron restrictions administration page to Patron restriction types This patch renames 'Patron restriction' to 'Patron restriction type' in the context of custom restriction type administration. To test: 0. Apply patch 1. Enable PatronRestrictionTypes 2. Go to Administration 3. Check the name, spelling/grammar of the following elements * Section name * Section caption 4. Click 'Patron restriction types' 5. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Left hand side menu * 'New' button * Page heading 6. Click 'New restriction type' 7. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading 8. Fill out the form and click 'Save' to create a new restriction type * Dialog message ('Restriction type added') 9. Click 'New restriction type' 10. Enter the same code as last time * Warning ('Restriction type code is already in use') 11. Click 'Cancel' 12. Click 'Edit' next to one of the types 13. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading 14. Without changing anything, click 'Save' * Warning ('Restriction type label is already in use') 15. Change the label and click 'Save' * Dialog message ('Restriction type updated') 16. Click 'Delete' next to one of the types 17. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading * Delete button 18. Click 'Delete this restriction type' * Dialog message ('Restriction type deleted')
Created attachment 149807 [details] [review] Bug 33550: Rename Patron restrictions administration page to Patron restriction types This patch renames 'Patron restriction' to 'Patron restriction type' in the context of custom restriction type administration. To test: 0. Apply patch 1. Enable PatronRestrictionTypes 2. Go to Administration 3. Check the name, spelling/grammar of the following elements * Section name * Section caption 4. Click 'Patron restriction types' 5. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Left hand side menu * 'New' button * Page heading 6. Click 'New restriction type' 7. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading 8. Fill out the form and click 'Save' to create a new restriction type * Dialog message ('Restriction type added') 9. Click 'New restriction type' 10. Enter the same code as last time * Warning ('Restriction type code is already in use') 11. Click 'Cancel' 12. Click 'Edit' next to one of the types 13. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading 14. Without changing anything, click 'Save' * Warning ('Restriction type label is already in use') 15. Change the label and click 'Save' * Dialog message ('Restriction type updated') 16. Click 'Delete' next to one of the types 17. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading * Delete button 18. Click 'Delete this restriction type' * Dialog message ('Restriction type deleted') Signed-off-by: Marius Mandrescu <marius.mandrescu@inLibro.com>
Putting this back to Needs signoff since Marius works with me :)
Unfortunately this patch set no longer applies cleanly to current master.
Created attachment 150229 [details] [review] Bug 33550: Rename Patron restrictions administration page to Patron restriction types This patch renames 'Patron restriction' to 'Patron restriction type' in the context of custom restriction type administration. To test: 0. Apply patch 1. Enable PatronRestrictionTypes 2. Go to Administration 3. Check the name, spelling/grammar of the following elements * Section name * Section caption 4. Click 'Patron restriction types' 5. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Left hand side menu * 'New' button * Page heading 6. Click 'New restriction type' 7. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading 8. Fill out the form and click 'Save' to create a new restriction type * Dialog message ('Restriction type added') 9. Click 'New restriction type' 10. Enter the same code as last time * Warning ('Restriction type code is already in use') 11. Click 'Cancel' 12. Click 'Edit' next to one of the types 13. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading 14. Without changing anything, click 'Save' * Warning ('Restriction type label is already in use') 15. Change the label and click 'Save' * Dialog message ('Restriction type updated') 16. Click 'Delete' next to one of the types 17. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading * Delete button 18. Click 'Delete this restriction type' * Dialog message ('Restriction type deleted') Signed-off-by: Marius Mandrescu <marius.mandrescu@inLibro.com>
Created attachment 150230 [details] [review] Bug 33550: (follow-up) Rename Patron restrictions administration page to Patron restriction types)
I tried rebasing. Not sure what I'm doing so crossing my fingers it worked ;)
Hi Caroline. Your rebase worked, as I was able to successfully apply the patch! Some minor things I noted when testing: 1. Administration page: There is a full stop at the end of the description. No other administration menu options on the administration have this. 2. Page title when modifying and deleting a restriction type: in the page title that shows in the browser tab, the <span> tag is visible and has ' either side of it. For example: Modify restriction type '<span>Test patron restriction type</span>' > Patron restriction types > Administration > Koha. Note that this was the case before the patch was applied. 3. Breadcrumb when deleting a restriction type: I'm not sure I've have seen a question mark in breadcrumbs before, except for this one (although I haven't looked very hard). Maybe the breadcrumb should be "Confirm restriction type deletion", to match the page title. David
> 2. Page title when modifying and deleting a restriction type: in the page > title that shows in the browser tab, the <span> tag is visible and has ' > either side of it. For example: Modify restriction type '<span>Test patron > restriction type</span>' > > Patron restriction types > Administration > Koha. Note that this was the > case before the patch was applied. I believe this problem is fixed in Bug 33551.
(In reply to Lucas Gass from comment #9) > > 2. Page title when modifying and deleting a restriction type: in the page > > title that shows in the browser tab, the <span> tag is visible and has ' > > either side of it. For example: Modify restriction type '<span>Test patron > > restriction type</span>' > > > Patron restriction types > Administration > Koha. Note that this was the > > case before the patch was applied. > > I believe this problem is fixed in Bug 33551. Thanks Lucas for identifying that!
Created attachment 150312 [details] [review] Bug 33550: Remove period in patron restriction type description
Created attachment 150313 [details] [review] Bug 33550: Remove question mark in breadcrumb
Hi David, Thanks for you input! I removed the period in the admin section description and changed the breadcrumb of the delete page to "Delete restriction type 'something'" to match the Modify page. Let me know if it worked! Caroline
Created attachment 150316 [details] [review] Bug 33550: Rename Patron restrictions administration page to Patron restriction types This patch renames 'Patron restriction' to 'Patron restriction type' in the context of custom restriction type administration. To test: 0. Apply patch 1. Enable PatronRestrictionTypes 2. Go to Administration 3. Check the name, spelling/grammar of the following elements * Section name * Section caption 4. Click 'Patron restriction types' 5. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Left hand side menu * 'New' button * Page heading 6. Click 'New restriction type' 7. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading 8. Fill out the form and click 'Save' to create a new restriction type * Dialog message ('Restriction type added') 9. Click 'New restriction type' 10. Enter the same code as last time * Warning ('Restriction type code is already in use') 11. Click 'Cancel' 12. Click 'Edit' next to one of the types 13. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading 14. Without changing anything, click 'Save' * Warning ('Restriction type label is already in use') 15. Change the label and click 'Save' * Dialog message ('Restriction type updated') 16. Click 'Delete' next to one of the types 17. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading * Delete button 18. Click 'Delete this restriction type' * Dialog message ('Restriction type deleted') Signed-off-by: Marius Mandrescu <marius.mandrescu@inLibro.com> Signed-off-by: David Nind <david@davidnind.com>
Created attachment 150317 [details] [review] Bug 33550: (follow-up) Rename Patron restrictions administration page to Patron restriction types) Signed-off-by: David Nind <david@davidnind.com>
Created attachment 150318 [details] [review] Bug 33550: Remove period in patron restriction type description Signed-off-by: David Nind <david@davidnind.com>
Created attachment 150319 [details] [review] Bug 33550: Remove question mark in breadcrumb Signed-off-by: David Nind <david@davidnind.com>
(In reply to Caroline Cyr La Rose from comment #13) > Hi David, > > Thanks for you input! I removed the period in the admin section description > and changed the breadcrumb of the delete page to "Delete restriction type > 'something'" to match the Modify page. > > Let me know if it worked! > > Caroline Thanks Caroline! It worked 8-) David
Created attachment 150900 [details] [review] Bug 33550: Rename Patron restrictions administration page to Patron restriction types This patch renames 'Patron restriction' to 'Patron restriction type' in the context of custom restriction type administration. To test: 0. Apply patch 1. Enable PatronRestrictionTypes 2. Go to Administration 3. Check the name, spelling/grammar of the following elements * Section name * Section caption 4. Click 'Patron restriction types' 5. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Left hand side menu * 'New' button * Page heading 6. Click 'New restriction type' 7. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading 8. Fill out the form and click 'Save' to create a new restriction type * Dialog message ('Restriction type added') 9. Click 'New restriction type' 10. Enter the same code as last time * Warning ('Restriction type code is already in use') 11. Click 'Cancel' 12. Click 'Edit' next to one of the types 13. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading 14. Without changing anything, click 'Save' * Warning ('Restriction type label is already in use') 15. Change the label and click 'Save' * Dialog message ('Restriction type updated') 16. Click 'Delete' next to one of the types 17. Check the name, spelling/grammar of the following elements * Title of the page (in the browser tab) * Breadcrumb * Page heading * Delete button 18. Click 'Delete this restriction type' * Dialog message ('Restriction type deleted') Signed-off-by: Marius Mandrescu <marius.mandrescu@inLibro.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> https://bugs.koha-community.org/show_bug.cgi?id=33500
Created attachment 150901 [details] [review] Bug 33550: (follow-up) Rename Patron restrictions administration page to Patron restriction types) Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> https://bugs.koha-community.org/show_bug.cgi?id=33500
Created attachment 150902 [details] [review] Bug 33550: Remove period in patron restriction type description Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> https://bugs.koha-community.org/show_bug.cgi?id=33500
Created attachment 150903 [details] [review] Bug 33550: Remove question mark in breadcrumb Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> https://bugs.koha-community.org/show_bug.cgi?id=33500
Created attachment 150904 [details] [review] Bug 33550: (QA follow-up) Switch from double to single quotes in text As we use single quotes in general and also in breadcrumbs and page title on this specific page, we shoudl also use them for the main content: Are you sure you want to delete 'T'? Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> https://bugs.koha-community.org/show_bug.cgi?id=33500
Pushed to master for 23.05. Nice work everyone, thanks!
Enhancement - not backporting to 22.11.x