Attachment 93485 Details for Bug 11708 – Bug 11708: Use bootstrap grid instead of yui

[patch] Bug 11708: Use bootstrap grid instead of yui

Bug-11708-Use-bootstrap-grid-instead-of-yui.patch (text/plain), 13.31 KB, created by Biblibre Sandboxes on 2019-10-02 14:10:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Biblibre Sandboxes

Created: 2019-10-02 14:10:34 UTC

Size: 13.31 KB

patch

obsolete

>From 2c515a8c67f46fd07688884eadde78597ca61ed3 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Tue, 20 Aug 2019 10:56:07 +0200
>Subject: [PATCH] Bug 11708: Use bootstrap grid instead of yui
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: SÃ©verine QUEUNE <severine.queune@bulac.fr>
>---
> .../prog/en/modules/acqui/basketgroups.tt          | 156 ++++++++++-----------
> 1 file changed, 78 insertions(+), 78 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt
>index d7bd897..6848abb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt
>@@ -29,90 +29,90 @@
>         Basket groups
>     </div>
> 
>-    <div id="doc3" class="yui-t2">
>-        <div id="bd">
>-            <div id="yui-main">
>-                <div class="yui-b">
>-                    [% IF bookseller %]
>-                        <div id="toolbar" class="btn-toolbar">
>-                            <div class="btn-group">
>-                                <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% bookseller.id | $raw %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a>
>-                            </div>
>+    <div class="main container-fluid">
>+        <div class="row">
>+            <div class="col-sm-10 col-sm-push-2">
>+                [% IF bookseller %]
>+                    <div id="toolbar" class="btn-toolbar">
>+                        <div class="btn-group">
>+                            <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% bookseller.id | $raw %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a>
>                         </div>
>+                    </div>
> 
>-                        <h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | $raw %]">[% bookseller.name | html %]</a></h1>
>-                    [% END %]
>+                    <h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | $raw %]">[% bookseller.name | html %]</a></h1>
>+                [% END %]
> 
>-                    [% IF basketgroups.size > 0 %]
>-                        <table id="basketgroups-table" class="group">
>-                            <thead>
>+                [% IF basketgroups.size > 0 %]
>+                    <table id="basketgroups-table" class="group">
>+                        <thead>
>+                            <tr>
>+                                <th>Name</th>
>+                                <th>Vendor</th>
>+                                <th>Billing place</th>
>+                                <th>Delivery place</th>
>+                                <th>No. of baskets</th>
>+                                <th>No. of ordered titles</th>
>+                                <th>No. of received titles</th>
>+                                <th>Date closed</th>
>+                                <th>Action</th>
>+                            </tr>
>+                        </thead>
>+                        <tbody>
>+                            [% FOREACH basketgroup IN basketgroups %]
>                                 <tr>
>-                                    <th>Name</th>
>-                                    <th>Vendor</th>
>-                                    <th>Billing place</th>
>-                                    <th>Delivery place</th>
>-                                    <th>No. of baskets</th>
>-                                    <th>No. of ordered titles</th>
>-                                    <th>No. of received titles</th>
>-                                    <th>Date closed</th>
>-                                    <th>Action</th>
>-                                </tr>
>-                            </thead>
>-                            <tbody>
>-                                [% FOREACH basketgroup IN basketgroups %]
>-                                    <tr>
>-                                        <td>
>-                                            [% IF ( basketgroup.name ) %]
>-                                                [% basketgroup.name | html %]
>-                                            [% ELSE %]
>-                                                Basket group no. [% basketgroup.id | $raw %]
>-                                            [% END %]
>-                                        </td>
>-                                        <td>[% basketgroup.vendor.name | html %]</td>
>-                                        <td>[% Branches.GetName(basketgroup.billingplace) | html %]</td>
>-                                        <td>
>-                                            [% IF (basketgroup.freedeliveryplace) %]
>-                                                [% basketgroup.freedeliveryplace | html %]
>-                                            [% ELSE %]
>-                                                [% Branches.GetName(basketgroup.deliveryplace) | html %]
>-                                            [% END %]
>-                                        </td>
>-                                        <td>[% basketgroup.baskets_count | $raw %]</td>
>-                                        <td>[% basketgroup.ordered_titles_count | $raw %]</td>
>-                                        <td>[% basketgroup.received_titles_count | $raw %]</td>
>-                                        <td>[% basketgroup.closeddate | $KohaDates %]</td>
>-                                        <td>
>-                                            <div class="dropdown">
>-                                            <a class="btn btn-default btn-xs dropdown-toggle" id="actions-[% basketgroup.id | $raw %]" role="button" data-toggle="dropdown">Actions <b class="caret"></b></a>
>-                                            <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="actions-[% basketgroup.id | $raw %]">
>-                                            [% IF basketgroup.closeddate %]
>-                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-eye"></i> View</a></li>
>-                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-folder-open"></i> Reopen</a></li>
>-                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-print"></i> Export as PDF</a></li>
>-                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=export&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-file-text"></i> Export as CSV</a></li>
>-                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=ediprint&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]">Generate EDIFACT order</a></li>
>-                                            [% ELSE %]
>-                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-pencil"></i> Edit</a></li>
>-                                                <li><a class="closeandprint" href="/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-print"></i> Close and export as PDF</a></li>
>-                                                [% UNLESS basketgroup.baskets_count %]
>-                                                    <li><a class="delete" href="/cgi-bin/koha/acqui/basketgroup.pl?op=delete&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-trash"></i> Delete</a></li>
>-                                                [% END %]
>+                                    <td>
>+                                        [% IF ( basketgroup.name ) %]
>+                                            [% basketgroup.name | html %]
>+                                        [% ELSE %]
>+                                            Basket group no. [% basketgroup.id | $raw %]
>+                                        [% END %]
>+                                    </td>
>+                                    <td>[% basketgroup.vendor.name | html %]</td>
>+                                    <td>[% Branches.GetName(basketgroup.billingplace) | html %]</td>
>+                                    <td>
>+                                        [% IF (basketgroup.freedeliveryplace) %]
>+                                            [% basketgroup.freedeliveryplace | html %]
>+                                        [% ELSE %]
>+                                            [% Branches.GetName(basketgroup.deliveryplace) | html %]
>+                                        [% END %]
>+                                    </td>
>+                                    <td>[% basketgroup.baskets_count | $raw %]</td>
>+                                    <td>[% basketgroup.ordered_titles_count | $raw %]</td>
>+                                    <td>[% basketgroup.received_titles_count | $raw %]</td>
>+                                    <td>[% basketgroup.closeddate | $KohaDates %]</td>
>+                                    <td>
>+                                        <div class="dropdown">
>+                                        <a class="btn btn-default btn-xs dropdown-toggle" id="actions-[% basketgroup.id | $raw %]" role="button" data-toggle="dropdown">Actions <b class="caret"></b></a>
>+                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="actions-[% basketgroup.id | $raw %]">
>+                                        [% IF basketgroup.closeddate %]
>+                                            <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-eye"></i> View</a></li>
>+                                            <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-folder-open"></i> Reopen</a></li>
>+                                            <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-print"></i> Export as PDF</a></li>
>+                                            <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=export&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-file-text"></i> Export as CSV</a></li>
>+                                            <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=ediprint&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]">Generate EDIFACT order</a></li>
>+                                        [% ELSE %]
>+                                            <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-pencil"></i> Edit</a></li>
>+                                            <li><a class="closeandprint" href="/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-print"></i> Close and export as PDF</a></li>
>+                                            [% UNLESS basketgroup.baskets_count %]
>+                                                <li><a class="delete" href="/cgi-bin/koha/acqui/basketgroup.pl?op=delete&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-trash"></i> Delete</a></li>
>                                             [% END %]
>-                                            </ul>
>-                                            </div>
>-                                        </td>
>-                                    </tr>
>-                                [% END %]
>-                            </tbody>
>-                        </table>
>-                    [% END %]
>-                </div>
>-            </div>
>-            <div class="yui-b">
>-                [% IF bookseller %]
>-                    [% INCLUDE 'vendor-menu.inc' booksellerid = bookseller.id %]
>+                                        [% END %]
>+                                        </ul>
>+                                        </div>
>+                                    </td>
>+                                </tr>
>+                            [% END %]
>+                        </tbody>
>+                    </table>
>                 [% END %]
>-                [% INCLUDE 'acquisitions-menu.inc' %]
>+            </div>
>+            <div class="col-sm-2 col-sm-pull-10">
>+                <aside>
>+                    [% IF bookseller %]
>+                        [% INCLUDE 'vendor-menu.inc' booksellerid = bookseller.id %]
>+                    [% END %]
>+                    [% INCLUDE 'acquisitions-menu.inc' %]
>+                </aside>
>             </div>
>         </div>
> 
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 11708: 25115 | 25116 | 25117 | 26003 | 26004 | 26006 | 28868 | 28869 | 28870 | 28871 | 28872 | 31305 | 31306 | 31307 | 31308 | 31309 | 31530 | 31531 | 31532 | 31533 | 31534 | 31535 | 31536 | 31537 | 31538 | 31539 | 31540 | 31541 | 31542 | 31543 | 31544 | 31702 | 31703 | 31704 | 31705 | 31748 | 31749 | 31750 | 31751 | 31752 | 31753 | 32909 | 32910 | 32911 | 32912 | 32913 | 32914 | 33308 | 33309 | 33310 | 33311 | 33312 | 33313 | 34936 | 34937 | 34938 | 34939 | 34940 | 34941 | 34977 | 35748 | 35749 | 35750 | 35751 | 35752 | 35753 | 35754 | 35755 | 35756 | 35971 | 35972 | 35973 | 35974 | 35975 | 35976 | 35977 | 35978 | 35979 | 40260 | 40261 | 40262 | 40263 | 40264 | 40265 | 40266 | 40267 | 40268 | 40272 | 48992 | 48993 | 48994 | 48995 | 48996 | 52417 | 52418 | 52419 | 52420 | 52421 | 55277 | 55278 | 55279 | 58770 | 58771 | 58772 | 58773 | 58774 | 58775 | 58776 | 58777 | 58778 | 59301 | 59302 | 59303 | 59304 | 59305 | 59306 | 59307 | 59308 | 59309 | 61018 | 61019 | 61020 | 61021 | 61022 | 61023 | 61024 | 61025 | 61026 | 71260 | 71261 | 71262 | 71263 | 71264 | 71265 | 71266 | 71267 | 71268 | 72069 | 72070 | 72071 | 72072 | 72073 | 72074 | 72075 | 72076 | 72077 | 72691 | 72692 | 72693 | 72694 | 72695 | 72696 | 72697 | 72698 | 72699 | 74213 | 74214 | 74215 | 74216 | 74217 | 74218 | 74219 | 74220 | 74221 | 74222 | 74302 | 74303 | 74304 | 74305 | 74306 | 74307 | 74308 | 74309 | 74310 | 74311 | 74349 | 74350 | 74351 | 74352 | 74353 | 74354 | 74355 | 74356 | 74357 | 74358 | 75003 | 75004 | 75908 | 75909 | 78662 | 78663 | 78664 | 80697 | 80698 | 80699 | 80700 | 80979 | 80980 | 80981 | 80982 | 85786 | 85787 | 91285 | 91286 | 92378 | 92379 | 92380 | 92381 | 92382 | 93460 | 93461 | 93462 | 93463 | 93464 | 93482 | 93483 | 93484 | 93485 | 93487 | 104928 | 104929 | 104930 | 104931 | 104932 | 104933 | 104934 | 104935