Attachment 143833 Details for Bug 32182 – Bug 32182: Replace static tabs markup with Bootstrap

[patch] Bug 32182: Replace static tabs markup with Bootstrap

Bug-32182-Replace-static-tabs-markup-with-Bootstra.patch (text/plain), 26.69 KB, created by Owen Leonard on 2022-11-14 14:52:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2022-11-14 14:52:25 UTC

Size: 26.69 KB

patch

obsolete

>From 7613c17f52e1b7da1dee4d29fd98a160c1b80b7c Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 14 Nov 2022 14:47:19 +0000
>Subject: [PATCH] Bug 32182: Replace static tabs markup with Bootstrap
>
>This patch reimplements certain tabbed interfaces to use Bootstrap
>markup. Previously these tabs required special CSS because they're
>static, i.e. not JS-driven tabs for switching in-page. The tabs are
>links to separate pages.
>
>Note: This patch includes whitespace changes, so use diff accordingly.
>
>To test, apply the patch and rebuild the staff interface CSS.
>
>Test the following pages to confirm that the tabs look correct and still
>link to the correct locations:
>
>- Patron details
>    - Accounting
>      - Pay amount
>    - Transactions
>    - Create manual invoice
>    - Create manual credit
>- Tools -> Comments
>---
> .../prog/css/src/staff-global.scss            |  88 ------------
> .../prog/en/modules/members/boraccount.tt     |  38 +++--
> .../prog/en/modules/members/mancredit.tt      | 132 ++++++++++--------
> .../prog/en/modules/members/maninvoice.tt     |  31 ++--
> .../prog/en/modules/members/pay.tt            |  37 +++--
> .../prog/en/modules/members/paycollect.tt     |  37 ++---
> .../prog/en/modules/reviews/reviewswaiting.tt |  30 ++--
> 7 files changed, 180 insertions(+), 213 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 5792e83c96..ef9036cd97 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -2735,94 +2735,6 @@ td.bundle {
>     }
> }
> 
>-.statictabs {
>-    @include card;
>-
>-    h3{
>-        padding-bottom: .7em;
>-        margin: 0;
>-        color: #696969;
>-    }
>-
>-    td {
>-        border: 0;
>-
>-        ul {
>-            li {
>-                clear: left;
>-                font-size: 90%;
>-                list-style: url("../img/item-bullet.svg");
>-                padding: .2em 0;
>-
>-                &.result_itype_image {
>-                    list-style: none;
>-                    list-style-type: none;
>-                }
>-
>-                img {
>-                    float: left;
>-                    margin: 3px 5px 3px -5px;
>-                    max-width: 25px;
>-                }
>-            }
>-        }
>-    }
>-
>-    span {
>-        &.status {
>-            clear: left;
>-            color: #900;
>-            display: block;
>-        }
>-
>-        &.unavailable {
>-            clear: left;
>-            display: block;
>-        }
>-    }
>-
>-
>-    > ul {
>-        line-height: 1.3;
>-        margin: 0;
>-        outline: 0 none;
>-        padding: .2em .2em 0;
>-        text-decoration: none;
>-        display: flex;
>-
>-        li {
>-            list-style-type: none;
>-            margin-right: .4em;
>-
>-            a {
>-                background-color: $background-color-secondary;
>-                border-radius: 4px 4px 0 0;
>-                color: #111;
>-                display: inline-block;
>-                padding: .5em 1em;
>-                text-decoration: none;
>-                white-space: nowrap;
>-            }
>-
>-            &.active,
>-            &:hover {
>-                a {
>-                    background-color: $background-color-primary;
>-                    color: #fff;
>-                }
>-            }
>-
>-        }
>-    }
>-
>-    .tabs-container {
>-        border: 2px solid $background-color-primary;
>-        border-radius: 4px;
>-        display: block;
>-        padding: 1em 1.4em;
>-    }
>-}
>-
> .toptabs {
>     margin-top: 5px;
> }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>index 29ac8cc576..310e4795d6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>@@ -51,18 +51,27 @@
> <form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" /></form>
> 
> 
>-<div class="statictabs">
>-<ul>
>-    <li class="active transactions"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Transactions</a></li>
>-    <li class="makepayment"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Make a payment</a></li>
>-    [% IF CAN_user_updatecharges_manual_invoice %]
>-    <li class="manualinvoice"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li>
>-    [% END %]
>-    [% IF CAN_user_updatecharges_manual_credit %]
>-    <li class="manualcredit"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li>
>-    [% END %]
>-</ul>
>-<div class="tabs-container">
>+<div class="toptabs">
>+    <ul class="nav nav-tabs" role="tablist">
>+        <li role="presentation" class="transactions active">
>+            <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Transactions</a>
>+        </li>
>+        <li role="presentation" class="makepayment">
>+            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Make a payment</a>
>+        </li>
>+        [% IF CAN_user_updatecharges_manual_invoice %]
>+            <li role="presentation" class="manualinvoice">
>+                <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual invoice</a>
>+            </li>
>+        [% END %]
>+        [% IF CAN_user_updatecharges_manual_credit %]
>+            <li role="presentation" class="manualcredit">
>+                <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual credit</a>
>+            </li>
>+        [% END %]
>+    </ul> 
>+    <div class="tab-content">
>+        <div role="tabpanel" class="tab-pane active">
> [% INCLUDE 'renew_results.inc' renew_results=renew_results %]
> 
> <table id="table_account_fines">
>@@ -165,8 +174,9 @@
>   </tr>
>   </tfoot>
> </table>
>-</div>
>-</div>
>+</div> 
>+</div> 
>+</div> 
> 
>             </main>
>         </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>index f4c7557c65..71479bd2a0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>@@ -46,73 +46,81 @@
>             <h1>Manual credit</h1>
> 
>             
>-            <div class="statictabs">
>-                <ul>
>-                    <li class="transactions"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Transactions</a></li>
>-                    <li class="makepayment"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Make a payment</a></li>
>+            <div class="toptabs">
>+                <ul class="nav nav-tabs" role="tablist">
>+                    <li role="presentation" class="transactions">
>+                        <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Transactions</a>
>+                    </li>
>+                    <li role="presentation" class="makepayment">
>+                        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Make a payment</a>
>+                    </li>
>                     [% IF CAN_user_updatecharges_manual_invoice %]
>-                    <li class="manualinvoice"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li>
>+                        <li role="presentation" class="manualinvoice">
>+                            <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual invoice</a>
>+                        </li>
>                     [% END %]
>-                    <li class="active manualcredit"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li>
>-                </ul>
>-                <div class="tabs-container">
>-
>-                <form action="/cgi-bin/koha/members/mancredit.pl" method="post" id="mancredit">
>-                    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
>-                    <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
>-
>-                    <fieldset class="rows">
>-                        <legend>Manual credit</legend>
>-                        <ol>
>-                            <li>
>-                                <label for="type">Credit type: </label>
>-                                <select name="type" id="type">
>-                                    [% FOREACH credit_type IN credit_types %]
>-                                    <option value="[% credit_type.code | html %]">[%- PROCESS credit_type_description credit_type=credit_type -%]</option>
>+                    <li role="presentation" class="manualcredit active">
>+                        <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual credit</a>
>+                    </li>
>+                </ul> 
>+                <div class="tab-content">
>+                    <div role="tabpanel" class="tab-pane active">
>+                        <form action="/cgi-bin/koha/members/mancredit.pl" method="post" id="mancredit">
>+                            <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
>+                            <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
>+
>+                            <fieldset class="rows">
>+                                <legend>Manual credit</legend>
>+                                <ol>
>+                                    <li>
>+                                        <label for="type">Credit type: </label>
>+                                        <select name="type" id="type">
>+                                            [% FOREACH credit_type IN credit_types %]
>+                                            <option value="[% credit_type.code | html %]">[%- PROCESS credit_type_description credit_type=credit_type -%]</option>
>+                                            [% END %]
>+                                        </select>
>+                                    </li>
>+                                    <li><label for="barcode">Barcode: </label><input type="text" name="barcode" id="barcode" /></li>
>+                                    <li><label for="desc">Description: </label><input type="text" name="desc" size="50" id="desc" /></li>
>+                                    <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
>+                                    <li><label for="amount" class="required">Amount: </label><input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" name="amount" id="amount" required="required" min="0" value=""/> Example: 5.00</li>
>+                                    [% INCLUDE 'transaction_types.inc' type="credit" %]
>+                                    [% IF Koha.Preference('UseCashRegisters') %]
>+                                    <li>
>+                                        [% IF Koha.Preference('RequireCashRegister') %]
>+                                            <label for="cash_register" class="required">
>+                                        [% ELSE %]
>+                                            <label for="cash_register">
>+                                        [% END %]
>+                                            Cash register:
>+                                        </label>
>+
>+                                        [% IF Koha.Preference('RequireCashRegister') %]
>+                                            <select name="cash_register" id="cash_register" required="required">
>+                                        [% ELSE %]
>+                                            <select name="cash_register" id="cash_register">
>+                                        [% END %]
>+                                            <option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
>+                                            [% PROCESS options_for_registers %]
>+                                        </select>
>+
>+                                        [% IF Koha.Preference('RequireCashRegister') %]
>+                                            <span class="required">Required</span>
>+                                        [% END %]
>+                                    </li>
>                                     [% END %]
>-                                </select>
>-                            </li>
>-                            <li><label for="barcode">Barcode: </label><input type="text" name="barcode" id="barcode" /></li>
>-                            <li><label for="desc">Description: </label><input type="text" name="desc" size="50" id="desc" /></li>
>-                            <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
>-                            <li><label for="amount" class="required">Amount: </label><input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" name="amount" id="amount" required="required" min="0" value=""/> Example: 5.00</li>
>-                            [% INCLUDE 'transaction_types.inc' type="credit" %]
>-                            [% IF Koha.Preference('UseCashRegisters') %]
>-                            <li>
>-                                [% IF Koha.Preference('RequireCashRegister') %]
>-                                    <label for="cash_register" class="required">
>-                                [% ELSE %]
>-                                    <label for="cash_register">
>-                                [% END %]
>-                                    Cash register:
>-                                </label>
>-
>-                                [% IF Koha.Preference('RequireCashRegister') %]
>-                                    <select name="cash_register" id="cash_register" required="required">
>-                                [% ELSE %]
>-                                    <select name="cash_register" id="cash_register">
>-                                [% END %]
>-                                    <option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
>-                                    [% PROCESS options_for_registers %]
>-                                </select>
>-
>-                                [% IF Koha.Preference('RequireCashRegister') %]
>-                                    <span class="required">Required</span>
>-                                [% END %]
>-                            </li>
>-                            [% END %]
>-                        </ol>
>-                    </fieldset>
>-
>-                    [% IF available_additional_fields %]
>-                        [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
>-                    [% END %]
>+                                </ol>
>+                            </fieldset>
> 
>-                    <fieldset class="action"><input type="submit" name="add" class="btn btn-primary" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a></fieldset>
>-                </form>
>+                            [% IF available_additional_fields %]
>+                                [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
>+                            [% END %]
> 
>-                </div>
>-            </div>
>+                            <fieldset class="action"><input type="submit" name="add" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a></fieldset>
>+                        </form>
>+                    </div> 
>+                </div> 
>+            </div> 
> 
>             </main>
>         </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>index 3cfba2c895..876ca88c22 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>@@ -46,17 +46,25 @@
>             <h1>Manual invoice</h1>
> 
>             
>-            <div class="statictabs">
>-                <ul>
>-                    <li class="transactions"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Transactions</a></li>
>-                    <li class="makepayment"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Make a payment</a></li>
>-                    <li class="active manualinvoice"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li>
>+            <div class="toptabs">
>+                <ul class="nav nav-tabs" role="tablist">
>+                    <li role="presentation" class="transactions">
>+                        <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Transactions</a>
>+                    </li>
>+                    <li role="presentation" class="makepayment">
>+                        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Make a payment</a>
>+                    </li>
>+                    <li role="presentation" class="manualinvoice active">
>+                        <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual invoice</a>
>+                    </li>
>                     [% IF CAN_user_updatecharges_manual_credit %]
>-                    <li class="manualcredit"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li>
>+                        <li role="presentation" class="manualcredit">
>+                            <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual credit</a>
>+                        </li>
>                     [% END %]
>-                </ul>
>-                <div class="tabs-container">
>-
>+                </ul> 
>+                <div class="tab-content">
>+                    <div role="tabpanel" class="tab-pane active">
>                 [% IF error == 'itemnumber' %]
>                     <div id="error_message" class="dialog alert">
>                         Error: Invalid barcode entered, please try again
>@@ -102,8 +110,9 @@
>                     </fieldset>
>                 </form>
> 
>-                </div>
>-            </div>
>+                    </div> 
>+                </div> 
>+            </div> 
> 
>             </main>
>         </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>index 21d42289fe..0e5771c382 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>@@ -46,18 +46,27 @@
> <h1>Make a payment</h1>
> 
> 
>-<div class="statictabs">
>-<ul>
>-    <li class="transactions"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Transactions</a></li>
>-    <li class="active makepayment"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Make a payment</a></li>
>-    [% IF CAN_user_updatecharges_manual_invoice %]
>-    <li class="manualinvoice"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li>
>-    [% END %]
>-    [% IF CAN_user_updatecharges_manual_credit %]
>-    <li class="manualcredit"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li>
>-    [% END %]
>-</ul>
>-<div class="tabs-container">
>+<div class="toptabs">
>+    <ul class="nav nav-tabs" role="tablist">
>+        <li role="presentation" class="transactions">
>+            <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Transactions</a>
>+        </li>
>+        <li role="presentation" class="makepayment active">
>+            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Make a payment</a>
>+        </li>
>+        [% IF CAN_user_updatecharges_manual_invoice %]
>+            <li role="presentation" class="manualinvoice">
>+                <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual invoice</a>
>+            </li>
>+        [% END %]
>+        [% IF CAN_user_updatecharges_manual_credit %]
>+            <li role="presentation" class="manualcredit">
>+                <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual credit</a>
>+            </li>
>+        [% END %]
>+    </ul> 
>+    <div class="tab-content">
>+        <div role="tabpanel" class="tab-pane active">
> 
> [% INCLUDE 'renew_results.inc' renew_results=renew_results %]
> [% IF ( accounts ) %]
>@@ -180,7 +189,9 @@
> [% ELSE %]
>     <p>[% INCLUDE 'patron-title.inc' %] has no outstanding fines.</p>
> [% END %]
>-</div></div>
>+        </div> 
>+    </div> 
>+</div> 
> 
>             </main>
>         </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>index 726255af15..c5bc2ed26b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -97,22 +97,23 @@
> [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
> 
> 
>-<div class="statictabs">
>-<ul>
>-    <li>
>-    <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Transactions</a>
>-    </li>
>-    <li class="active">
>-    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Make a payment</a>
>-    </li>
>-    <li>
>-    <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a>
>-    </li>
>-    <li>
>-    <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a>
>-    </li>
>-</ul>
>-<div class="tabs-container">
>+<div class="toptabs">
>+    <ul class="nav nav-tabs" role="tablist">
>+        <li role="presentation" class="transactions">
>+            <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Transactions</a>
>+        </li>
>+        <li role="presentation" class="makepayment active">
>+            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Make a payment</a>
>+        </li>
>+        <li role="presentation">
>+            <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual invoice</a>
>+        </li>
>+        <li role="presentation">
>+            <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual credit</a>
>+        </li>
>+    </ul> 
>+    <div class="tab-content">
>+        <div role="tabpanel" class="tab-pane active">
> [% IF ( error_over ) %]
>     <div id="error_message" class="dialog alert">
>     You must pay a value less than or equal to [% total_due | $Price %].
>@@ -370,7 +371,9 @@
>     </form>
>     [% END %]
> [% END %]
>-</div></div>
>+        </div> 
>+    </div> 
>+</div> 
> 
>             </main>
>         </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
>index 22109fe7cf..8b0b54a19b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
>@@ -43,12 +43,25 @@
> <h1>Comments</h1>
> 
> 
>-<div class="statictabs">
>-<ul>
>-    [% IF ( status ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?status=1">Approved comments</a></li>
>-    [% IF ( status ) %]<li>[% ELSE %]<li class="active">[% END %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl" >Comments awaiting moderation</a></li>
>-</ul>
>-<div class="tabs-container">
>+<div class="toptabs">
>+    <ul class="nav nav-tabs" role="tablist">
>+        [% IF ( status ) %]
>+            <li role="presentation" class="active">
>+        [% ELSE %]
>+            <li role="presentation">
>+        [% END %]
>+            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?status=1">Approved comments</a>
>+        </li>
>+        [% IF ( status ) %]
>+            <li role="presentation">
>+        [% ELSE %]
>+            <li role="presentation" class="active">
>+        [% END %]
>+            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl" >Comments awaiting moderation</a>
>+        </li>
>+    </ul> 
>+    <div class="tab-content">
>+        <div role="tabpanel" class="tab-pane active">
> 
> [% IF ( reviews ) %]
> <table id="commentst">
>@@ -88,8 +101,9 @@
> [% ELSE %]
> [% IF ( status ) %]<p><strong>No comments have been approved.</strong></p>[% ELSE %]<p><strong>No comments to moderate.</strong></p>[% END %]
> [% END %]
>-</div>
>-</div>
>+        </div> 
>+    </div> 
>+</div> 
> 
>             </main>
>         </div> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 32182: 143830 | 143832 | 143833 | 143836 | 143865