[Bug 20741] New: Update two-column templates with Bootstrap grid: Administration part 5
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Bug ID: 20741 Summary: Update two-column templates with Bootstrap grid: Administration part 5 Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: ASSIGNED Severity: enhancement Priority: P5 - low Component: Templates Assignee: oleonard@myacpl.org Reporter: oleonard@myacpl.org QA Contact: testopia@bugs.koha-community.org CC: testopia@bugs.koha-community.org Depends on: 20668 Blocks: 20654 This patch will convert still more administration templates to use the Bootstrap grid: - fieldmapping.tt - item_circulation_alerts.tt - itemtypes.tt - koha2marclinks.tt - localization.tt - marctagstructure.tt Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20654 [Bug 20654] Omnibus: Update two-column templates to use Bootstrap grid https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20668 [Bug 20668] Update two-column templates with Bootstrap grid: Acquisitions part 2 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Bug 20741 depends on bug 20668, which changed state. Bug 20668 Summary: Update two-column templates with Bootstrap grid: Acquisitions part 2 https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20668 What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff Patch complexity|--- |Small patch -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 --- Comment #1 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 77980 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=77980&action=edit Bug 20741: Update two-column templates with Bootstrap grid: Administration part 4 This patch modifies several administration templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from <script> tags in the modified templates. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Administration -> Keywords to MARC mapping - Administration -> Item circulation alerts - Administration -> Item types - View and edit item types - Edit and item type and translate a description - Administration -> Koha to MARC mapping - Administration -> MARC frameworks -> MARC structure - View and edit tags -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Claire Gravely <claire_gravely@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |claire_gravely@hotmail.com --- Comment #2 from Claire Gravely <claire_gravely@hotmail.com> --- Patch does not apply Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de --- Comment #3 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Owen, can you please rebase? Part 5 is missing from the sequence! :) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #77980|0 |1 is obsolete| | --- Comment #4 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 78265 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=78265&action=edit Bug 20741: Update two-column templates with Bootstrap grid: Administration part 5 This patch modifies several administration templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from <script> tags in the modified templates. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Administration -> Keywords to MARC mapping - Administration -> Item circulation alerts - Administration -> Item types - View and edit item types - Edit and item type and translate a description - Administration -> Koha to MARC mapping - Administration -> MARC frameworks -> MARC structure - View and edit tags -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Claire Gravely <claire_gravely@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Claire Gravely <claire_gravely@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #78265|0 |1 is obsolete| | --- Comment #5 from Claire Gravely <claire_gravely@hotmail.com> --- Created attachment 78308 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=78308&action=edit Bug 20741: Update two-column templates with Bootstrap grid: Administration part 5 This patch modifies several administration templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from <script> tags in the modified templates. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Administration -> Keywords to MARC mapping - Administration -> Item circulation alerts - Administration -> Item types - View and edit item types - Edit and item type and translate a description - Administration -> Koha to MARC mapping - Administration -> MARC frameworks -> MARC structure - View and edit tags Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #78308|0 |1 is obsolete| | --- Comment #6 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 78316 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=78316&action=edit Bug 20741: Update two-column templates with Bootstrap grid: Administration part 5 This patch modifies several administration templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from <script> tags in the modified templates. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Administration -> Keywords to MARC mapping - Administration -> Item circulation alerts - Administration -> Item types - View and edit item types - Edit and item type and translate a description - Administration -> Koha to MARC mapping - Administration -> MARC frameworks -> MARC structure - View and edit tags Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 --- Comment #7 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Missing the table-wise filters on koha2marclinks, that's entirely unrelated to this patch (I checked ;) ) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nick@bywatersolutions.com Status|Passed QA |Pushed to Master --- Comment #8 from Nick Clemens <nick@bywatersolutions.com> --- Awesome work all! Pushed to master for 18.11 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|Pushed to Master |RESOLVED CC| |martin.renvoize@ptfs-europe | |.com --- Comment #9 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Enhancement, will not be backported to 18.05.x series. -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org