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
Created attachment 77980 [details] [review] 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
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.
Owen, can you please rebase? Part 5 is missing from the sequence! :)
Created attachment 78265 [details] [review] 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
Created attachment 78308 [details] [review] 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>
Created attachment 78316 [details] [review] 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>
Missing the table-wise filters on koha2marclinks, that's entirely unrelated to this patch (I checked ;) )
Awesome work all! Pushed to master for 18.11
Enhancement, will not be backported to 18.05.x series.