Attachment 136964 Details for Bug 30952 – Bug 30952: Virtualshelves Module

[patch] Bug 30952: Virtualshelves Module

Bug-30952-Virtualshelves-Module.patch (text/plain), 13.98 KB, created by Solene D on 2022-07-01 14:22:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Solene D

Created: 2022-07-01 14:22:52 UTC

Size: 13.98 KB

patch

obsolete

>From 333518bf02818e31d610a1d4c7ad6e31eda59e5c Mon Sep 17 00:00:00 2001
>From: Solene Desvaux <sdesvaux@biblibre.com>
>Date: Thu, 31 Mar 2022 11:33:22 +0200
>Subject: [PATCH] Bug 30952: Virtualshelves Module
>
>---
> .../modules/virtualshelves/sendshelfform.tt   |  25 +--
> .../prog/en/modules/virtualshelves/shelves.tt | 143 ++++++++++--------
> .../virtualshelves/tables/shelves_results.tt  |   4 +-
> 3 files changed, 94 insertions(+), 78 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt
>index 919ff4275b..5422e28982 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt
>@@ -7,7 +7,7 @@
> <div class="container">[% IF ( email ) %]
> 
>     [% IF ( SENT ) %]
>-        <h3>Message sent</h3>
>+        <h2>Message sent</h2>
>         <p>The list was sent to: [% email | html %]</p>
>         <p><a class="close focus" href="#">Close window</a></p>
>     [% END %]
>@@ -19,20 +19,21 @@
> 
> <form action="/cgi-bin/koha/virtualshelves/sendshelf.pl" method="post">
> 
>-<fieldset class="rows"> 
>-    <legend><h1>Sending your list</h1></legend>
>-<ol>   <li>
>+<fieldset id="select-libs">
>+<h3>Sending your list</h3>
>+<ol>   <p>
>         <label for="email">Email address:</label>
>-        <input type="text" id="email" name="email" size="43" class="focus" />
>-    </li>
>-    <li>
>+        <input type="text" id="email" name="email" size="max" class="focus" />
>+    </p>
>+    <p>
>             <label for="comment">Comment:</label>
>-            <textarea id="comment" name="comment" rows="4" cols="40"></textarea>
>-    </li>
>-    <li>
>+            <textarea id="comment" name="comment" rows="4"></textarea>
>+    </p>
>+    <p>
>         <input type="hidden" name="shelfid" value="[% shelfid | html %]" />
>-    </li></ol></fieldset>
>-       <fieldset class="action"> <input type="submit" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset>
>+    </p></ol>
>+
>+    <input type="submit" value="Send" size="max" class="principal" /> <a class="cancel close" href="#">Cancel</a> </fieldset>
> </form>
> 
> [% END %]</div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>index 3fa48ea555..e276200d1f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>@@ -3,6 +3,9 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>     [% IF op == 'view' %]
>@@ -43,8 +46,7 @@
> </head>
> 
> <body id="lists_shelves" class="lists">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'cat-search.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -115,6 +117,14 @@
>             </li>
>         [% END %]
>     </ol>
>+
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
>     <div class="main container-fluid">
>@@ -122,7 +132,9 @@
>             <div class="col-sm-10 col-sm-push-1">
>                 <main>
> 
>-                [% INCLUDE 'virtualshelves-toolbar.inc' %]
>+
>+<h2>Lists</h2>
>+[% INCLUDE 'virtualshelves-toolbar.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog [% m.type | html %]">
>@@ -316,80 +328,82 @@
> [% IF op == 'add_form' OR op == 'edit_form' %]
> 
>     <form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl" class="validated">
>-        <fieldset class="rows">
>+        <fieldset class="brief">
> 
>-        [% IF op == 'add_form' %]
>-        <legend><h1>Create a new list</h1></legend>
>-            <input type="hidden" name="op" value="add" />
>-        [% ELSE %]
>-        <legend><h1>Edit list <em>[% shelf.shelfname | html %]</em></h1></legend>
>-            <input type="hidden" name="op" value="edit" />
>-        [% END %]
>-        <input type="hidden" name="referer" value="[% referer | html %]" />
>-        <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
>-        <ol>
>-            <li>
>-                <label for="shelfname" class="required">Name: </label><input type="text" id="shelfname" name="shelfname" size="25" value="[% shelf.shelfname | html %]" required="required" class="focus required" />
>-            <span class="required">Required</span>
>-            </li>
>-            <li>
>-                <span class="label">Owner: </span>
>-                [% IF op == 'add_form' %]
>-                    <input type="hidden" name="owner" id="owner" value="[% loggedinusernumber | html %]" />[% logged_in_user.userid | html %]
>-                [% ELSE %]
>-                    [% IF owner %]
>-                        <input type="hidden" id="owner" name="owner" value="[% owner.borrowernumber | html %]" />[% owner.firstname _ ' ' _ owner.surname | html %]
>+            [% IF op == 'add_form' %]
>+                <h3>Create a new list</h3>
>+                <input type="hidden" name="op" value="add" />
>+            [% ELSE %]
>+                <h3>Edit list <em>[% shelf.shelfname | html %]</em></h3>
>+                <input type="hidden" name="op" value="edit" />
>+            [% END %]
>+            <input type="hidden" name="referer" value="[% referer | html %]" />
>+            <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
>+            <ol>
>+                <li>
>+                    <label for="shelfname" class="required">Name: </label><input type="text" id="shelfname" name="shelfname" size="25" value="[% shelf.shelfname | html %]" required="required" class="focus required" />
>+                <span class="required">Required</span>
>+                </li>
>+                <li>
>+                    <label>Owner: </label>
>+                    [% IF op == 'add_form' %]
>+                        <input type="hidden" name="owner" id="owner" value="[% loggedinusernumber | html %]" /><span class="label">[% logged_in_user.userid | html %]</span>
>                     [% ELSE %]
>-                        <input type="hidden" id="owner" name="owner" value="[% loggedinusernumber | html %]" />[% logged_in_user.userid | html %]
>+                        [% IF owner %]
>+                            <input type="hidden" id="owner" name="owner" value="[% owner.borrowernumber | html %]" /><span class="label">[% owner.firstname _ ' ' _ owner.surname | html %]</span>
>+                        [% ELSE %]
>+                            <input type="hidden" id="owner" name="owner" value="[% loggedinusernumber | html %]" />[<span class="label">% logged_in_user.userid | html %]</span>
>+                        [% END %]
>                     [% END %]
>-                [% END %]
>-            </li>
>-            <li><label for="sortfield" >Sort this list by: </label>
>-            <select name="sortfield">
>-            [% IF shelf.sortfield == "title" %]<option value="title" selected="selected">Title</option>[% ELSE %]<option value="title">Title</option>[% END %]
>-            [% IF shelf.sortfield == "author" %]<option value="author" selected="selected">Author</option>[% ELSE %]<option value="author">Author</option>[% END %]
>-            [% IF shelf.sortfield == "copyrightdate" %]<option value="copyrightdate" selected="selected">Copyrightdate</option>[% ELSE %]<option value="copyrightdate">Copyrightdate</option>[% END %]
>-            [% IF shelf.sortfield == "itemcallnumber" %]<option value="itemcallnumber" selected="selected">Call number</option>[% ELSE %]<option value="itemcallnumber">Call number</option>[% END %]
>-            [% IF shelf.sortfield == "dateadded" %]<option value="dateadded" selected="selected">Date added</option>[% ELSE %]<option value="dateadded">Date added</option>[% END %]
>-            </select></li>
>-            <li><label for="public">Public: </label>
>-                <select id="public" name="public" onchange="AdjustRemark()">
>-                [% IF shelf.is_private %]
>-                    <option value="0" selected="selected">Private</option>
>-                [% ELSE %]
>-                    <option value="0">Private</option>
>-                [% END %]
>-                [% IF shelf.is_public %]
>-                    <option value="1" selected="selected">Public</option>
>-                [% ELSE %]
>-                    <option value="1">Public</option>
>-                [% END %]
>-                           </select></li>
>+                </li>
>+                <li><label for="sortfield" >Sort this list by: </label>
>+                <select name="sortfield">
>+                [% IF shelf.sortfield == "title" %]<option value="title" selected="selected">Title</option>[% ELSE %]<option value="title">Title</option>[% END %]
>+                [% IF shelf.sortfield == "author" %]<option value="author" selected="selected">Author</option>[% ELSE %]<option value="author">Author</option>[% END %]
>+                [% IF shelf.sortfield == "copyrightdate" %]<option value="copyrightdate" selected="selected">Copyrightdate</option>[% ELSE %]<option value="copyrightdate">Copyrightdate</option>[% END %]
>+                [% IF shelf.sortfield == "itemcallnumber" %]<option value="itemcallnumber" selected="selected">Call number</option>[% ELSE %]<option value="itemcallnumber">Call number</option>[% END %]
>+                [% IF shelf.sortfield == "dateadded" %]<option value="dateadded" selected="selected">Date added</option>[% ELSE %]<option value="dateadded">Date added</option>[% END %]
>+                </select></li>
>+                <li><label for="public">Public: </label>
>+                    <select id="public" name="public" onchange="AdjustRemark()">
>+                    [% IF shelf.is_private %]
>+                        <option value="0" selected="selected">Private</option>
>+                    [% ELSE %]
>+                        <option value="0">Private</option>
>+                    [% END %]
>+                    [% IF shelf.is_public %]
>+                        <option value="1" selected="selected">Public</option>
>+                    [% ELSE %]
>+                        <option value="1">Public</option>
>+                    [% END %]
>+                            </select></li>
> 
>-            [% INCLUDE list_permissions %]
>+                [% INCLUDE list_permissions %]
> 
>-        </ol>
>-    </fieldset>
>+            </ol>
> 
>-    <fieldset class="action">
>-        <input type="submit" value="Save" class="submit" />
>-        [% IF referer == 'view' %]
>-           <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a>
>-       [% ELSE %]
>-            [% IF public %]
>-                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;public=1" class="cancel">Cancel</a>
>-            [% ELSE %]
>-                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;public=0" class="cancel">Cancel</a>
>+            <input type="submit" value="Save" class="principal" />
>+            [% IF referer == 'view' %]
>+            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a>
>+        [% ELSE %]
>+                [% IF public %]
>+                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;public=1" class="cancel">Cancel</a>
>+                [% ELSE %]
>+                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;public=0" class="cancel">Cancel</a>
>+                [% END %]
>             [% END %]
>-        [% END %]
>-    </fieldset>
>+        </fieldset>
>     </form>
> 
> [% END %]
> 
> [% IF op == 'list' %]
>-    <h1>Lists</h1>
>+<<<<<<< HEAD
>+    <h2>Lists</h2>
>+=======
>+>>>>>>> Bug 30952: Virtualshelves Module
>     <div id="tabs" class="toptabs">
>+    <fieldset class="briefgr">
>         <ul>
>             <li id="privateshelves_tab" class="active"><a href="#tab_content">Your lists</a></li>
>             <li id="publicshelves_tab" class="active"><a href="#tab_content">Public lists</a></li>
>@@ -433,6 +447,7 @@
>                 <tbody></tbody>
>             </table>
>         </div>
>+    </fieldset>
>     </div>
> [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt
>index fa89225653..4de1c59164 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt
>@@ -43,7 +43,7 @@
>         [%~ action_block = action_block _ '<input type="hidden" name="op" value="edit_form" />' ~%]
>         [%~ action_block = action_block _ '<input type="hidden" name="public" value="' _ public _ '" />' ~%]
>         [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%]
>-        [%~ action_block = action_block _ '<button class="editshelf btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</button>' ~%]
>+        [%~ action_block = action_block _ '<button id="lientype">Edit</button>' ~%]
>         [%~ action_block = action_block _ '</form> ' ~%]
>     [%~ END ~%]
>     [%~ IF can_manage_shelf OR can_delete_shelf ~%]
>@@ -53,7 +53,7 @@
>         [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber  _ '" />' ~%]
>         [%~ action_block = action_block _ '<input type="hidden" name="public" value="' _ public _ '" />' ~%]
>         [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%]
>-        [%~ action_block = action_block _ '<button type="submit" class="deleteshelf btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button>' ~%]
>+        [%~ action_block = action_block _ '<button type="submit" id="lientype">Delete</button>' ~%]
>         [%~ action_block = action_block _ '</form>' ~%]
>     [%~ END ~%]
> [%~ ELSE ~%]
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 30952: 136810 | 136812 | 136813 | 136815 | 136816 | 136818 | 136819 | 136820 | 136822 | 136823 | 136825 | 136827 | 136828 | 136830 | 136831 | 136833 | 136834 | 136836 | 136837 | 136839 | 136840 | 136842 | 136844 | 136845 | 136847 | 136848 | 136878 | 136879 | 136880 | 136881 | 136882 | 136883 | 136884 | 136885 | 136886 | 136887 | 136888 | 136889 | 136890 | 136891 | 136892 | 136893 | 136894 | 136895 | 136896 | 136897 | 136898 | 136899 | 136900 | 136901 | 136902 | 136950 | 136951 | 136952 | 136953 | 136954 | 136955 | 136956 | 136957 | 136958 | 136959 | 136960 | 136961 | 136962 | 136963 | 136964 | 136965 | 136966 | 136967 | 136968 | 136969 | 136970 | 136971 | 136972 | 136973 | 136974 | 137408 | 137409 | 137410 | 137411 | 137414 | 137415 | 137416 | 137417 | 137418 | 137419 | 137420 | 137744 | 137767 | 137768 | 137775 | 137776 | 137994 | 138091 | 138092 | 138093 | 138094 | 138095 | 138096 | 138097 | 138098 | 138099 | 138100 | 138101 | 138102 | 138103 | 138245 | 138246 | 138247 | 138293 | 138299 | 138300 | 138302 | 140117 | 140118 | 140119 | 140120 | 140121 | 140122 | 140123 | 140124 | 140125 | 140126 | 140127 | 140128 | 140129 | 140130 | 140131 | 140132 | 140133 | 140134 | 140135 | 140136 | 140137 | 140138 | 140139 | 140140 | 140141 | 140142 | 140143 | 140371 | 140372 | 140373 | 140374 | 140433 | 140435 | 140459 | 140460 | 140512 | 140513 | 140514 | 140515 | 140516 | 140517 | 140519 | 140520 | 140521 | 140522 | 140523 | 140524 | 140525 | 140526 | 140527 | 140528 | 140529 | 140530 | 140531 | 140532 | 140533 | 140534 | 140535 | 140536 | 140537 | 140538 | 140539 | 140540 | 140541 | 140542 | 140543 | 140544 | 140545 | 140546 | 140547 | 140548 | 140549 | 140550 | 140551 | 140552 | 140553 | 140554 | 140555 | 140556 | 140557 | 140558 | 140559 | 140560 | 140566 | 140567 | 140570 | 140571 | 140575 | 140576 | 140577 | 140588 | 140613 | 140617 | 140618 | 140619 | 140620 | 140628 | 140629 | 140635 | 140649 | 140650 | 140651 | 140652 | 140653 | 140654 | 140658 | 140687 | 140976 | 140977 | 141020 | 141024 | 141026 | 141027 | 141041 | 141043 | 141044 | 141047 | 141052 | 141053 | 141054 | 141055 | 141056 | 141057 | 141064 | 141074 | 141075 | 141631 | 141632 | 141633 | 141634 | 141635 | 141636 | 141637 | 141638 | 141639 | 141640 | 141641 | 141642 | 141643 | 141644 | 141645 | 141646 | 141647 | 141648 | 141649 | 141650 | 141651 | 141652 | 141653 | 141654 | 141655 | 141656 | 141657 | 141658 | 141659 | 141660 | 141661 | 141662 | 141663 | 141664 | 141665 | 141666 | 141667 | 141668 | 141669 | 141670 | 141671 | 141672 | 141673 | 141674 | 141675 | 141676 | 141677 | 141678 | 141679 | 141680 | 141681 | 141682 | 141683 | 141684 | 141685 | 141686 | 141687 | 141688 | 141689 | 141690 | 141691 | 141692 | 141693 | 141694 | 141695 | 141696 | 141697 | 141698 | 141699 | 141700 | 141701 | 141702 | 141703 | 141704 | 141705 | 141706 | 141707 | 141708 | 141709 | 141710 | 141711 | 141712 | 141713 | 142604 | 142605