Bugzilla – Attachment 110850 Details for
Bug 26551
When importing a framework, the modal heading is too long and runs outside of the dialog
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26551: Correct modal markup to prevent long heading from overflowing
Bug-26551-Correct-modal-markup-to-prevent-long-hea.patch (text/plain), 18.95 KB, created by
Owen Leonard
on 2020-09-28 11:58:45 UTC
(
hide
)
Description:
Bug 26551: Correct modal markup to prevent long heading from overflowing
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2020-09-28 11:58:45 UTC
Size:
18.95 KB
patch
obsolete
>From d603540cfcd710e29c61b0e5a683f150045593b1 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 28 Sep 2020 11:46:17 +0000 >Subject: [PATCH] Bug 26551: Correct modal markup to prevent long heading from > overflowing > >This patch modifies the markup of the MARC framework import and export >modals so that CSS intended only for Bootstrap buttons isn't applied to >content in the modal. > >The modal dialog markup was nested inside a ".btn-group" <div>, which >carries with it CSS that prevents text wrapping. Moving the modal markup >out of the button group while keeping it inside the <td> corrects the >problem. Lines have only been shifted and reindented. > >To test, apply the patch and go to Administration -> MARC bibliographic >framework. > >- In the table of frameworks, from the "Actions" menu, test both > the "Import" and "Export" links. Both should work as expected. >- Confirm that the text of the heading on the "Import" modal wraps > correctly. >- Test the same operations for a framework other than the default one. >--- > .../prog/en/modules/admin/biblio_framework.tt | 192 ++++++++++----------- > 1 file changed, 96 insertions(+), 96 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index bfb8b36e35..11d6af7816 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -145,55 +145,55 @@ > <!-- Trigger modal --> > <li><a href="#" data-toggle="modal" data-target="#importModal_[% framework.frameworkcode | html %][% frameworks.count | html %]" title="Import framework structure (fields, subfields) from a spreadsheet file (.csv or .ods)"><i class="fa fa-download"></i> Import</a></li> > </ul> >- <!-- Modal to export default framework --> >- <div class="modal" id="exportModal_default" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_default" aria-hidden="true"> >- <div class="modal-dialog"> >- <div class="modal-content"> >- <div class="modal-header"> >- <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >- <h3 id="exportLabelexportModal_default">Export default framework</h3> >- </div> >- <form action="import_export_framework.pl" name="form_defaul" method="get" target="_blank" class="form_export"> >- <div class="modal-body"> >- <fieldset> >- <input type="hidden" name="frameworkcode" value="" /> >- <p><label for="csv_type_export_default"><input type="radio" name="type_export_default" value="csv" id="csv_type_export_default" checked="checked" /> Export to CSV spreadsheet</label></p> >- <p><label for="ods_type_export_default"><input type="radio" name="type_export_default" value="ods" id="ods_type_export_default" /> Export to OpenDocument spreadsheet format</label></p> >- </fieldset> >- </div> >- <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Export</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >- </div> >- </form> >- </div> >- </div> >- </div> >- >- <!-- Modal to import default framework --> >- <div class="modal" id="importModal_[% framework.frameworkcode | html %][% frameworks.count | html %]" tabindex="-1" role="dialog" aria-labelledby="importLabelexportModal_default[% frameworks.count | html %]" aria-hidden="true"> >- <div class="modal-dialog"> >- <div class="modal-content"> >- <div class="modal-header"> >- <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >- <h3 id="importLabelexportModal_[% framework.frameworkcode | html %][% frameworks.count | html %]">Import default framework structure (fields and subfields) from a spreadsheet file (.csv or .ods)</h> >- </div> >- <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_default" id="form_i_default" method="post" enctype="multipart/form-data" class="form_import"> >- <div class="modal-body"> >- <input type="hidden" name="frameworkcode" value="default" /> >- <input type="hidden" name="action" value="import" /> >- <p><label for="file_import_default">Upload file:</label> <input type="file" name="file_import_default" id="file_import_default" class="input_import" /></p> >- <div id="importing_default" style="display:none" class="importing"><img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div> >- </div> >- <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Import</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button> >- </div> >- </form> >- </div> >- </div> >- </div> > </div> >+ <!-- Modal to export default framework --> >+ <div class="modal" id="exportModal_default" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_default" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> >+ <div class="modal-header"> >+ <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >+ <h3 id="exportLabelexportModal_default">Export default framework</h3> >+ </div> <!-- /.modal-header --> >+ <form action="import_export_framework.pl" name="form_defaul" method="get" target="_blank" class="form_export"> >+ <div class="modal-body"> >+ <fieldset> >+ <input type="hidden" name="frameworkcode" value="" /> >+ <p><label for="csv_type_export_default"><input type="radio" name="type_export_default" value="csv" id="csv_type_export_default" checked="checked" /> Export to CSV spreadsheet</label></p> >+ <p><label for="ods_type_export_default"><input type="radio" name="type_export_default" value="ods" id="ods_type_export_default" /> Export to OpenDocument spreadsheet format</label></p> >+ </fieldset> >+ </div> <!-- /.modal-body --> >+ <div class="modal-footer"> >+ <button type="submit" class="btn btn-default">Export</button> >+ <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >+ </div> <!-- /.modal-footer --> >+ </form> <!-- /.form_export --> >+ </div> <!-- /.modal-content --> >+ </div> <!-- /.modal-dialog --> >+ </div> <!-- /#exportModal_default.modal --> >+ >+ <!-- Modal to import default framework --> >+ <div class="modal" id="importModal_[% framework.frameworkcode | html %][% frameworks.count | html %]" tabindex="-1" role="dialog" aria-labelledby="importLabelexportModal_default[% frameworks.count | html %]" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> >+ <div class="modal-header"> >+ <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >+ <h3 id="importLabelexportModal_[% framework.frameworkcode | html %][% frameworks.count | html %]">Import default framework structure (fields and subfields) from a spreadsheet file (.csv or .ods)</h> >+ </div> <!-- /.modal-header --> >+ <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_default" id="form_i_default" method="post" enctype="multipart/form-data" class="form_import"> >+ <div class="modal-body"> >+ <input type="hidden" name="frameworkcode" value="default" /> >+ <input type="hidden" name="action" value="import" /> >+ <p><label for="file_import_default">Upload file:</label> <input type="file" name="file_import_default" id="file_import_default" class="input_import" /></p> >+ <div id="importing_default" style="display:none" class="importing"><img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div> >+ </div> <!-- /.modal-body --> >+ <div class="modal-footer"> >+ <button type="submit" class="btn btn-default">Import</button> >+ <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> <!-- /.modal-footer --> >+ </form> <!-- /.form_export --> >+ </div> <!-- /.modal-content --> >+ </div> <!-- /.modal-dialog --> >+ </div> <!-- /#import_modal_... --> > </td> > </tr> > >@@ -215,55 +215,55 @@ > <!-- Trigger modal --> > <li><a href="#" data-toggle="modal" data-target="#importModal_[% loo.frameworkcode | html %][% loop.count | html %]" title="Import framework structure (fields, subfields) from a spreadsheet file (.csv or .ods)"><i class="fa fa-download"></i> Import</a></li> > </ul> >- <!-- Modal to export other framework --> >- <div class="modal" id="exportModal_[% loo.frameworkcode | html %][% loop.count | html %]" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_[% loo.frameworkcode | html %][% loop.count | html %]" aria-hidden="true"> >- <div class="modal-dialog"> >- <div class="modal-content"> >- <div class="modal-header"> >- <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >- <h3 id="exportLabelexportModal_[% loo.frameworkcode | html %][% loop.count | html %]">Export [% loo.frameworktext | html %] framework</h3> >- </div> >- <form action="import_export_framework.pl" name="form_[% loo.frameworkcode | html %]" method="get" target="_blank" class="form_export"> >- <div class="modal-body"> >- <fieldset> >- <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode | html %]" /> >- <p><label for="csv_type_export_[% loo.frameworkcode | html %][% loop.count | html %]"><input type="radio" name="type_export_[% loo.frameworkcode | html %]" value="csv" id="csv_type_export_[% loo.frameworkcode | html %][% loop.count | html %]" checked="checked" /> Export to CSV spreadsheet</label></p> >- <p><label for="ods_type_export_[% loo.frameworkcode | html %][% loop.count | html %]"><input type="radio" name="type_export_[% loo.frameworkcode | html %]" value="ods" id="ods_type_export_[% loo.frameworkcode | html %][% loop.count | html %]" /> Export to OpenDocument spreadsheet format</label></p> >- </fieldset> >- </div> >- <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Export</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >- </div> >- </form> >- </div> >- </div> >- </div> >+ </div> >+ <!-- Modal to export other framework --> >+ <div class="modal" id="exportModal_[% loo.frameworkcode | html %][% loop.count | html %]" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_[% loo.frameworkcode | html %][% loop.count | html %]" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> >+ <div class="modal-header"> >+ <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >+ <h3 id="exportLabelexportModal_[% loo.frameworkcode | html %][% loop.count | html %]">Export [% loo.frameworktext | html %] framework</h3> >+ </div> <!-- /.modal-header --> >+ <form action="import_export_framework.pl" name="form_[% loo.frameworkcode | html %]" method="get" target="_blank" class="form_export"> >+ <div class="modal-body"> >+ <fieldset> >+ <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode | html %]" /> >+ <p><label for="csv_type_export_[% loo.frameworkcode | html %][% loop.count | html %]"><input type="radio" name="type_export_[% loo.frameworkcode | html %]" value="csv" id="csv_type_export_[% loo.frameworkcode | html %][% loop.count | html %]" checked="checked" /> Export to CSV spreadsheet</label></p> >+ <p><label for="ods_type_export_[% loo.frameworkcode | html %][% loop.count | html %]"><input type="radio" name="type_export_[% loo.frameworkcode | html %]" value="ods" id="ods_type_export_[% loo.frameworkcode | html %][% loop.count | html %]" /> Export to OpenDocument spreadsheet format</label></p> >+ </fieldset> >+ </div> <!-- /.modal-body --> >+ <div class="modal-footer"> >+ <button type="submit" class="btn btn-default">Export</button> >+ <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >+ </div> <!-- /.modal-footer --> >+ </form> <!-- /.form_export --> >+ </div> <!-- /.modal-content --> >+ </div> <!-- /.modal-dialog --> >+ </div> <!-- /#exportModal_... --> > >- <!-- Modal to import other framework --> >- <div class="modal" id="importModal_[% loo.frameworkcode | html %][% loop.count | html %]" tabindex="-1" role="dialog" aria-labelledby="importLabelexportModal_[% loo.frameworkcode | html %][% loop.count | html %]" aria-hidden="true"> >- <div class="modal-dialog"> >- <div class="modal-content"> >- <div class="modal-header"> >- <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >- <h3 id="importLabelexportModal_[% loo.frameworkcode | html %][% loop.count | html %]">Import [% loo.frameworkcode | html %] framework structure (fields and subfields) from a spreadsheet file (.csv or .ods)</h3> >- </div> >- <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_[% loo.frameworkcode | html %]" id="form_i_[% loo.frameworkcode | html %]" method="post" enctype="multipart/form-data" class="form_import"> >- <div class="modal-body"> >- <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode | html %]" /> >- <input type="hidden" name="action" value="import" /> >- <p><label for="file_import_[% loo.frameworkcode | html %]">Upload file:</label> <input type="file" name="file_import_[% loo.frameworkcode | html %]" id="file_import_[% loo.frameworkcode | html %]" class="input_import" /></p> >- <div id="importing_[% loo.frameworkcode | html %]" style="display:none" class="importing"><img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div> >- </div> >- <div class="modal-footer"> >- <button type="submit" class="btn btn-default" title="[% loo.frameworkcode | html %]">Import</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button> >- </div> >- </form> >- </div> >- </div> >- </div> >- </div> >+ <!-- Modal to import other framework --> >+ <div class="modal" id="importModal_[% loo.frameworkcode | html %][% loop.count | html %]" tabindex="-1" role="dialog" aria-labelledby="importLabelexportModal_[% loo.frameworkcode | html %][% loop.count | html %]" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> >+ <div class="modal-header"> >+ <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >+ <h3 id="importLabelexportModal_[% loo.frameworkcode | html %][% loop.count | html %]">Import [% loo.frameworkcode | html %] framework structure (fields and subfields) from a spreadsheet file (.csv or .ods)</h3> >+ </div> <!-- /.modal-header --> >+ <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_[% loo.frameworkcode | html %]" id="form_i_[% loo.frameworkcode | html %]" method="post" enctype="multipart/form-data" class="form_import"> >+ <div class="modal-body"> >+ <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode | html %]" /> >+ <input type="hidden" name="action" value="import" /> >+ <p><label for="file_import_[% loo.frameworkcode | html %]">Upload file:</label> <input type="file" name="file_import_[% loo.frameworkcode | html %]" id="file_import_[% loo.frameworkcode | html %]" class="input_import" /></p> >+ <div id="importing_[% loo.frameworkcode | html %]" style="display:none" class="importing"><img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div> >+ </div> <!-- /.modal-body --> >+ <div class="modal-footer"> >+ <button type="submit" class="btn btn-default" title="[% loo.frameworkcode | html %]">Import</button> >+ <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> <!-- /.modal-footer --> >+ </form> <!-- /.form_export --> >+ </div> <!-- /.modal-content --> >+ </div> <!-- /.modal-dialog --> >+ </div> <!-- /#importModal... --> > </td> > </tr> > >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 26551
:
110847
|
110850
|
110885
|
111244