|
Description
Owen Leonard
2016-02-11 16:16:58 UTC
*** Bug 15805 has been marked as a duplicate of this bug. *** Created attachment 47934 [details] [review] Bug 15804 - Use standard dialog style for confirmation of MARC subfield deletion When deleting a MARC framework subfield, the confirmation message is not styled. This patch modifies the template to style the confirmation message like similar ones. Depends on Bug 15785 - Use Font Awesome icons in confirmation dialogs To test, apply the patch and go to Administration -> MARC framworks. - Click 'MARC structure' for a framework you can edit. - Click 'subfields' for a tag you can edit. - Click 'Delete' for a subfield you can delete. You should see a confirmation dialog styled like other "alert" type dialogs. - Test both canceling and confirming deletion to confirm that both function correctly. Hi Owen The patch fails Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt I applied 15785 on top and fails Created attachment 48183 [details] [review] Bug 15804 [Revised] Use standard dialog style for confirmation of MARC subfield deletion When deleting a MARC framework subfield, the confirmation message is not styled. This patch modifies the template to style the confirmation message like similar ones. Depends on Bug 15785 - Use Font Awesome icons in confirmation dialogs To test, apply the patch and go to Administration -> MARC framworks. - Click 'MARC structure' for a framework you can edit. - Click 'subfields' for a tag you can edit. - Click 'Delete' for a subfield you can delete. You should see a confirmation dialog styled like other "alert" type dialogs. - Test both canceling and confirming deletion to confirm that both function correctly. Revised to fix conflicts with rollback of Bug 13618 Created attachment 48239 [details] [review] [SIGNED-OFF]Bug 15804: [Revised] Use standard dialog style for confirmation of MARC subfield deletion When deleting a MARC framework subfield, the confirmation message is not styled. This patch modifies the template to style the confirmation message like similar ones. Depends on Bug 15785 - Use Font Awesome icons in confirmation dialogs To test, apply the patch and go to Administration -> MARC framworks. - Click 'MARC structure' for a framework you can edit. - Click 'subfields' for a tag you can edit. - Click 'Delete' for a subfield you can delete. You should see a confirmation dialog styled like other "alert" type dialogs. - Test both canceling and confirming deletion to confirm that both function correctly. Revised to fix conflicts with rollback of Bug 13618 Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> Works as expected. Revised according with bug revert 13618 Created attachment 48240 [details] [review] [SIGNED-OFF]Bug 15804: [Revised] Use standard dialog style for confirmation of MARC subfield deletion When deleting a MARC framework subfield, the confirmation message is not styled. This patch modifies the template to style the confirmation message like similar ones. Depends on Bug 15785 - Use Font Awesome icons in confirmation dialogs To test, apply the patch and go to Administration -> MARC framworks. - Click 'MARC structure' for a framework you can edit. - Click 'subfields' for a tag you can edit. - Click 'Delete' for a subfield you can delete. You should see a confirmation dialog styled like other "alert" type dialogs. - Test both canceling and confirming deletion to confirm that both function correctly. Revised to fix conflicts with rollback of Bug 13618 Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> Works as expected. Revised according with bug revert 13618 Created attachment 48453 [details] [review] Bug 15804: [Revised] Use standard dialog style for confirmation of MARC subfield deletion When deleting a MARC framework subfield, the confirmation message is not styled. This patch modifies the template to style the confirmation message like similar ones. Depends on Bug 15785 - Use Font Awesome icons in confirmation dialogs To test, apply the patch and go to Administration -> MARC framworks. - Click 'MARC structure' for a framework you can edit. - Click 'subfields' for a tag you can edit. - Click 'Delete' for a subfield you can delete. You should see a confirmation dialog styled like other "alert" type dialogs. - Test both canceling and confirming deletion to confirm that both function correctly. Revised to fix conflicts with rollback of Bug 13618 Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> Works as expected. Revised according with bug revert 13618 Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Created attachment 48454 [details] [review] Bug 15804: [Revised] Use standard dialog style for confirmation of MARC subfield deletion When deleting a MARC framework subfield, the confirmation message is not styled. This patch modifies the template to style the confirmation message like similar ones. Depends on Bug 15785 - Use Font Awesome icons in confirmation dialogs To test, apply the patch and go to Administration -> MARC framworks. - Click 'MARC structure' for a framework you can edit. - Click 'subfields' for a tag you can edit. - Click 'Delete' for a subfield you can delete. You should see a confirmation dialog styled like other "alert" type dialogs. - Test both canceling and confirming deletion to confirm that both function correctly. Revised to fix conflicts with rollback of Bug 13618 Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> Works as expected. Revised according with bug revert 13618 Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Created attachment 48455 [details] [review] Bug 15804: [Revised] Use standard dialog style for confirmation of MARC subfield deletion When deleting a MARC framework subfield, the confirmation message is not styled. This patch modifies the template to style the confirmation message like similar ones. Depends on Bug 15785 - Use Font Awesome icons in confirmation dialogs To test, apply the patch and go to Administration -> MARC framworks. - Click 'MARC structure' for a framework you can edit. - Click 'subfields' for a tag you can edit. - Click 'Delete' for a subfield you can delete. You should see a confirmation dialog styled like other "alert" type dialogs. - Test both canceling and confirming deletion to confirm that both function correctly. Revised to fix conflicts with rollback of Bug 13618 Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> Works as expected. Revised according with bug revert 13618 Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Pushed to Master - Should be in the May 2016 Release. Thanks Created attachment 48744 [details] [review] [3.22.x] Bug 15804: Use standard dialog style for confirmation of MARC subfield deletion Patch for 3.22.x Patch pushed to 3.22.x, will be in 3.22.5 This patch has been pushed to 3.20.x, will be in 3.20.10. |