Attachment 69527 Details for Bug 15707 – Bug 15707 - Updates for Bootstrap 3

[patch] Bug 15707 - Updates for Bootstrap 3

Bug-15707---Updates-for-Bootstrap-3.patch (text/plain), 12.67 KB, created by Jonathan Druart on 2017-12-05 17:00:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-12-05 17:00:21 UTC

Size: 12.67 KB

patch

obsolete

>From 1b604d4334cc2eb31e0fd3036fbfead5cea41c5f Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Wed, 22 Feb 2017 19:54:58 +0000
>Subject: [PATCH] Bug 15707 - Updates for Bootstrap 3
>
>---
> .../prog/en/modules/admin/library_groups.tt        | 160 +++++++++++----------
> 1 file changed, 88 insertions(+), 72 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
>index d515e59b18..d3361072ae 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
>@@ -117,7 +117,7 @@
>                 <div class="yui-g">
>                     <div id="toolbar" class="btn-toolbar">
>                         <div class="btn-group">
>-                            <a id="add-group-root" class="btn btn-small add-group" href="#">
>+                            <a id="add-group-root" class="btn btn-default btn-sm add-group" href="#">
>                                 <i class="fa fa-plus"></i> Add group
>                             </a>
>                         </div>
>@@ -141,90 +141,106 @@
>         [% INCLUDE 'admin-menu.inc' %]
>     </div>
> 
>-    <div id="add-group-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="add-group-modal-label" aria-hidden="true">
>+    <div id="add-group-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="add-group-modal-label" aria-hidden="true">
>         <form id="add-group-form" action="/cgi-bin/koha/admin/library_groups.pl" class="form-horizontal">
>-            <div class="modal-header">
>-                <h3 id="add-group-modal-label">Add group</h3>
>-            </div>
>-            <div class="modal-body">
>-                <input type="hidden" id="add-group-modal-parent-id" name="parent_id" value="" />
>-                <input type="hidden" id="add-group-modal-action" name="action" value="add">
>-
>-                <p>
>-                    <label for="title">Title: </label>
>-                    <input type="text" name="title" id="add-group-modal-title" required="required" />
>-                    <i>required</i>
>-                </p>
>-
>-                <p>
>-                    <label for="description">Description: </label>
>-                    <input type="text" name="description" id="add-group-modal-description" />
>-                </p>
>-            </div>
>-            <div class="modal-footer">
>-                <button type="submit" class="btn btn-primary">Save</button>
>-                <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+            <div class="modal-dialog">
>+                <div class="modal-content">
>+                    <div class="modal-header">
>+                        <h3 id="add-group-modal-label">Add group</h3>
>+                    </div>
>+                    <div class="modal-body">
>+                        <input type="hidden" id="add-group-modal-parent-id" name="parent_id" value="" />
>+                        <input type="hidden" id="add-group-modal-action" name="action" value="add">
>+
>+                        <p>
>+                            <label for="title">Title: </label>
>+                            <input type="text" name="title" id="add-group-modal-title" required="required" />
>+                            <i>required</i>
>+                        </p>
>+
>+                        <p>
>+                            <label for="description">Description: </label>
>+                            <input type="text" name="description" id="add-group-modal-description" />
>+                        </p>
>+                    </div>
>+                    <div class="modal-footer">
>+                        <button type="submit" class="btn btn-primary">Save</button>
>+                        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+                    </div>
>+                </div>
>             </div>
>         </form>
>     </div>
> 
>-    <div id="edit-group-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="edit-library-modal-label" aria-hidden="true">
>+    <div id="edit-group-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="edit-library-modal-label" aria-hidden="true">
>         <form id="edit-group-form" action="/cgi-bin/koha/admin/library_groups.pl" class="form-horizontal">
>-            <div class="modal-header">
>-                <h3 id="edit-group-modal-label">Edit group</h3>
>-            </div>
>-            <div class="modal-body">
>-                <input type="hidden" id="edit-group-modal-id" name="id" value="" />
>-                <input type="hidden" id="edit-group-modal-action" name="action" value="edit" />
>-
>-                <p>
>-                    <label for="title">Title: </label>
>-                    <input type="text" id="edit-group-modal-title" name="title" value="" required="required" />
>-                    <i>required</i>
>-                </p>
>-
>-                <p>
>-                    <label for="description">Description: </label>
>-                    <input type="text" id="edit-group-modal-description" name="description" value="" />
>-                </p>
>-            </div>
>-            <div class="modal-footer">
>-                <button type="submit" class="btn btn-primary">Update</button>
>-                <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+            <div class="modal-dialog">
>+                <div class="modal-content">
>+                    <div class="modal-header">
>+                        <h3 id="edit-group-modal-label">Edit group</h3>
>+                    </div>
>+                    <div class="modal-body">
>+                        <input type="hidden" id="edit-group-modal-id" name="id" value="" />
>+                        <input type="hidden" id="edit-group-modal-action" name="action" value="edit" />
>+
>+                        <p>
>+                            <label for="title">Title: </label>
>+                            <input type="text" id="edit-group-modal-title" name="title" value="" required="required" />
>+                            <i>required</i>
>+                        </p>
>+
>+                        <p>
>+                            <label for="description">Description: </label>
>+                            <input type="text" id="edit-group-modal-description" name="description" value="" />
>+                        </p>
>+                    </div>
>+                    <div class="modal-footer">
>+                        <button type="submit" class="btn btn-primary">Update</button>
>+                        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+                    </div>
>+                </div>
>             </div>
>         </form>
>     </div>
> 
>-    <div id="delete-group-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="delete-group-modal-label" aria-hidden="true">
>+    <div id="delete-group-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="delete-group-modal-label" aria-hidden="true">
>         <form action="/cgi-bin/koha/admin/library_groups.pl" />
>-            <input id="delete-group-modal-action" type="hidden" name="action" value="delete" />
>-            <input id="delete-group-modal-id" type="hidden" name="id" value="" />
>-            <div class="modal-header">
>-                <h3 id="delete-group-modal-label">Delete group</h3>
>-            </div>
>-            <div class="modal-body">
>-                Are you sure you want to delete <span id="delete-group-modal-title" class="name"></span>?
>-            </div>
>-            <div class="modal-footer">
>-                <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> Delete</button>
>-                <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+            <div class="modal-dialog">
>+                <div class="modal-content">
>+                    <input id="delete-group-modal-action" type="hidden" name="action" value="delete" />
>+                    <input id="delete-group-modal-id" type="hidden" name="id" value="" />
>+                    <div class="modal-header">
>+                        <h3 id="delete-group-modal-label">Delete group</h3>
>+                    </div>
>+                    <div class="modal-body">
>+                        Are you sure you want to delete <span id="delete-group-modal-title" class="name"></span>?
>+                    </div>
>+                    <div class="modal-footer">
>+                        <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> Delete</button>
>+                        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+                    </div>
>+                </div>
>             </div>
>         </form>
>     </div>
> 
>-    <div id="remove-library-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="remove-library-modal-label" aria-hidden="true">
>+    <div id="remove-library-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="remove-library-modal-label" aria-hidden="true">
>         <form action="/cgi-bin/koha/admin/library_groups.pl" />
>-            <input id="remove-library-modal-action" type="hidden" name="action" value="delete" />
>-            <input id="remove-library-modal-id" type="hidden" name="id" value="" />
>-            <div class="modal-header">
>-                <h3 id="remove-library-modal-label">Remove library from group</h3>
>-            </div>
>-            <div class="modal-body">
>-                Are you sure you want to remove <span id="remove-library-modal-library" class="name"></span> from <span id="remove-library-modal-group" class="name"><span>?
>-            </div>
>-            <div class="modal-footer">
>-                <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> Remove</button>
>-                <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+            <div class="modal-dialog">
>+                <div class="modal-content">
>+                    <input id="remove-library-modal-action" type="hidden" name="action" value="delete" />
>+                    <input id="remove-library-modal-id" type="hidden" name="id" value="" />
>+                    <div class="modal-header">
>+                        <h3 id="remove-library-modal-label">Remove library from group</h3>
>+                    </div>
>+                    <div class="modal-body">
>+                        Are you sure you want to remove <span id="remove-library-modal-library" class="name"></span> from <span id="remove-library-modal-group" class="name"><span>?
>+                    </div>
>+                    <div class="modal-footer">
>+                        <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> Remove</button>
>+                        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+                    </div>
>+                </div>
>             </div>
>         </form>
>     </div>
>@@ -250,10 +266,10 @@
>         </td>
>         <td>
>             [% IF group.branchcode %]
>-                <button class="btn btn-small remove-library" data-group-id="[% group.id %]" data-group-library="[% group.library.branchname %]" data-group-parent-title="[% group.parent.title %]" ><i class="fa fa-trash"></i> Remove from group</button>
>+                <button class="btn btn-sm remove-library" data-group-id="[% group.id %]" data-group-library="[% group.library.branchname %]" data-group-parent-title="[% group.parent.title %]" ><i class="fa fa-trash"></i> Remove from group</button>
>             [% ELSE %]
>                 <div class="btn-group">
>-                    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-wrench"></i> Actions <span class="caret"></span></button>
>+                    <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-wrench"></i> Actions <span class="caret"></span></button>
>                     <ul class="dropdown-menu">
>                         <li>
>                             <a id="add-group-[% group.id %]" href="#" class="add-group" data-group-id="[% group.id %]">
>@@ -276,7 +292,7 @@
>                 </div>
> 
>                 <div class="btn-group">
>-                    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Add library <span class="caret"></span></button>
>+                    <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Add library <span class="caret"></span></button>
>                     <ul class="dropdown-menu">
>                         [% FOREACH library IN group.libraries_not_direct_children %]
>                             <li>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 15707: 47479 | 47480 | 47481 | 47482 | 47483 | 47484 | 47728 | 47729 | 47730 | 47731 | 47732 | 47733 | 47734 | 47849 | 47850 | 47851 | 47852 | 47853 | 47854 | 47855 | 47868 | 47869 | 47870 | 47871 | 47872 | 47873 | 47874 | 48072 | 50400 | 50401 | 50402 | 50403 | 50404 | 50405 | 50406 | 50407 | 50408 | 52267 | 52268 | 52269 | 52270 | 52271 | 52272 | 52273 | 52274 | 52275 | 52367 | 52370 | 52562 | 52563 | 52564 | 52565 | 52566 | 52567 | 52568 | 52569 | 52570 | 52571 | 52572 | 52573 | 52574 | 52575 | 57080 | 57081 | 57082 | 57083 | 57084 | 57085 | 57086 | 57087 | 57088 | 57089 | 57090 | 57091 | 57092 | 57093 | 58086 | 60504 | 60505 | 60506 | 60507 | 60508 | 60509 | 60510 | 60511 | 60512 | 60513 | 60514 | 60515 | 60516 | 60517 | 60518 | 60572 | 60573 | 60574 | 60575 | 60576 | 60577 | 60578 | 60579 | 60580 | 60581 | 60582 | 60583 | 60584 | 60585 | 60586 | 60587 | 60755 | 60756 | 60757 | 60758 | 60759 | 60760 | 60761 | 60762 | 60763 | 60764 | 60765 | 60766 | 60767 | 60768 | 60769 | 60770 | 60771 | 65666 | 65667 | 65668 | 65669 | 65670 | 65671 | 65672 | 65673 | 65674 | 65675 | 65676 | 65677 | 65678 | 65679 | 65680 | 65681 | 69514 | 69515 | 69516 | 69517 | 69518 | 69519 | 69520 | 69521 | 69522 | 69523 | 69524 | 69525 | 69526 | 69527 | 69528 | 69529 | 69573 | 69574 | 69575 | 69576 | 69577 | 69578 | 69579 | 69580 | 69581 | 69582 | 69583 | 69584 | 69585 | 69586 | 69587 | 69588 | 69589