Attachment 77789 Details for Bug 20809 – Bug 20809: Link patron image to patron image add/edit form

[patch] Bug 20809: Link patron image to patron image add/edit form

Bug-20809-Link-patron-image-to-patron-image-addedi.patch (text/plain), 7.93 KB, created by Owen Leonard on 2018-08-14 14:31:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2018-08-14 14:31:37 UTC

Size: 7.93 KB

patch

obsolete

>From 180a631b06680b9dc364c1508db9e175b30e2d48 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 14 Aug 2018 13:04:39 +0000
>Subject: [PATCH] Bug 20809: Link patron image to patron image add/edit form
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This patch modifies an include file so that it is possible with edit a
>patron's image on any patron-related page which uses that include.
>
>To test you must have the patronimages system preference enabled.
>
>Apply the patch and open any patron record for viewing.
>
> - Hover the mouse over the patron image.
>
>   - If the patron has a previously-defined patron image, should you see
>     an "Edit" button appear. Clicking the button should display a modal
>     dialog titled "Edit patron image." Test that the "Upload,"
>     "Delete," and "Cancel" buttons work correctly.
>
>   - If a patron has no patron image defined, you should see an "Add"
>     button appear. Clicking the button should display a modal
>     dialog titled "Edit patron image." Test that the "Upload,"
>     "Delete," and "Cancel" buttons work correctly.
>
>This process should work from any page which shows the patron sidebar:
>Check out, Details, Fines, Routing lists, Circulation history, etc.
>
>Patch works as described.
>
>Signed-off-by: Dilan JohnpullÃ© <dilan@calyx.net.au>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../intranet-tmpl/prog/css/src/staff-global.scss   | 53 ++++++++++++++++++----
> .../intranet-tmpl/prog/en/includes/circ-menu.inc   | 53 ++++++++++++++++------
> koha-tmpl/intranet-tmpl/prog/js/members-menu.js    | 15 ++++++
> 3 files changed, 96 insertions(+), 25 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>index b17c6e4..af33cae 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -1670,26 +1670,59 @@ dd {
>     & + #menu {
>         margin-right: 0;
>     }
>+
>+    > div {
>+        border-right: 1px solid #B9D8D9;
>+        width: 100%;
>+    }
> }
> 
>-#patronbasics {
>-    div {
>-        background: transparent url("../img/patron-blank.min.svg") 10px 5px no-repeat;
>-        border: 1px solid #CCCCCC;
>+/* Patron image */
>+
>+.patronimage-container {
>+    padding: .2em;
>+    position: relative;
>+
>+    &:hover {
>+        .patronimage {
>+            opacity: .8;
>+        }
>+
>+        .patronimage-controls {
>+            opacity: 1;
>+        }
>+    }
>+}
>+
>+.patronimage {
>+    display: block;
>+    max-width: 160px;
>+    opacity: 1;
>+    transition: .2s ease;
>+
>+    .empty {
>+        background: transparent url( "../img/patron-blank.min.svg" ) center 5px no-repeat;
>         height: 125px;
>         margin: .3em 0 .3em .3em;
>         padding: 0;
>-        width: 105px;
>+        width: 80%;
>     }
> }
> 
>-#patronimage {
>-    border: 1px solid #CCCCCC;
>-    margin: .3em 0 .3em .3em;
>-    max-width: 140px;
>-    padding: .2em;
>+.patronimage-controls {
>+    left: 50%;
>+    opacity: 0;
>+    position: absolute;
>+    text-align: center;
>+    top: 80%;
>+    transform: translate( -50%, -50% );
>+    transition: .5s ease;
> }
> 
>+.patronimage-control {
>+    padding: 1em 2em;
>+ }
>+
> .patronviews {
>     border-right:  1px solid #000;
>     border-top: 1px solid #000;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>index 2d36462..42791bc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>@@ -1,22 +1,26 @@
> [% USE Koha %]
> [% IF ( patron.borrowernumber ) %]
> <div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
>-
>+
>+[% IF ( patronimages ) %]
>+    <div>
>+        <div class="patronimage-container">
>+            [% IF ( patron.image ) %]
>+                <img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="patronimage" alt="[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])" />
>+                <div class="patronimage-controls">
>+                    <div class="patronimage-control"><a data-borrowernumber="[% patron.borrowernumber | uri %]" class="btn btn-default btn-sm edit-patronimage" title="Edit patron image" href="#"><i class="fa fa-pencil"></i> Edit</a></div>
>+                </div>
>+            [% ELSE %]
>+                <div class="patronimage empty"></div>
>+                <div class="patronimage-controls">
>+                    <div class="patronimage-control"><a data-borrowernumber="[% patron.borrowernumber | uri %]" class="btn btn-default btn-sm edit-patronimage" title="Add patron image" href="#"><i class="fa fa-plus"></i> Add</a></div>
>+                </div>
>+            [% END %]
>+        </div>
>+    </div>
>+[% END %]
>+
> <ul class="patronbriefinfo">
>-    [% IF ( patronimages ) %]
>-        [% IF ( patron.image ) %]
>-            <li>
>-                <img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% patron.borrowernumber | uri %]" id="patronimage" alt="[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])" />
>-            </li>
>-        [% ELSE %]
>-            <li id="patronbasics">
>-                <div></div>
>-            </li>
>-        [% END %]
>-    [% END %]
>     [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
>         [% IF Koha.Preference( 'AddressFormat' ) %]
>             [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
>@@ -124,4 +128,23 @@
>         <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber %]">Interlibrary loans</a></li>
>     [% END %]
> </ul></div>
>+
>+
>+<div class="modal" id="patronImageEdit" tabindex="-1" role="dialog" aria-labelledby="patronImageEditLabel">
>+    <div class="modal-dialog" role="document">
>+        <div class="modal-content">
>+            <div class="modal-header">
>+                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>+                <h4 class="modal-title" id="patronImageEditLabel">Modal title</h4>
>+            </div>
>+            <div class="modal-body">
>+                <img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" />
>+            </div>
>+            <div class="modal-footer">
>+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
>+            </div>
>+        </div>
>+    </div>
>+</div>
>+
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js b/koha-tmpl/intranet-tmpl/prog/js/members-menu.js
>index 4a3f4f7..2dafcef 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/members-menu.js
>@@ -100,7 +100,22 @@ $(document).ready(function(){
>     $("#select_patron_messages").on("change",function(){
>         $("#borrower_message").val( $(this).val() );
>     });
>+
>+    $(".edit-patronimage").on("click", function(e){
>+        e.preventDefault();
>+        var borrowernumber = $(this).data("borrowernumber");
>+        var url = "/cgi-bin/koha/members/moremember.pl?borrowernumber=" + borrowernumber;
>+        $.get("/cgi-bin/koha/members/moremember.pl", { borrowernumber : borrowernumber }, function( data ){
>+            image_form = $(data).find("#picture-upload");
>+            image_form.show().find(".cancel").remove();
>+            $("#patronImageEdit .modal-body").html( image_form );
>+        });
>+        var modalTitle = $(this).attr("title");
>+        $("#patronImageEdit .modal-title").text(modalTitle);
>+        $("#patronImageEdit").modal("show");
>+    });
> });
>+
> function confirm_local_deletion() {
>     var is_confirmed = window.confirm(_("Are you sure you want to delete this patron from the local database? This cannot be undone."));
>     if (is_confirmed) {
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20809: 75514 | 75515 | 75637 | 75963 | 77462 | 77465 | 77789 | 77790 | 78409 | 78410 | 78595 | 78670 | 78711 | 82333 | 82334 | 82335 | 83711 | 83712 | 83713 | 83844 | 83845 | 83846 | 83847 | 84477 | 84478 | 84479 | 84480 | 84481 | 84482 | 84483 | 84484