View | Details | Raw Unified | Return to bug 38819
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-2 / +13 lines)
Lines 51-57 Link Here
51
                <a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a>
51
                <a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a>
52
            [% END %]
52
            [% END %]
53
            [% WRAPPER breadcrumb_item bc_active= 1 %]
53
            [% WRAPPER breadcrumb_item bc_active= 1 %]
54
                <span>Confirm request</span>
54
                [% IF(auto_migrate) %]
55
                    <span>Confirm switch provider</span>
56
                [% ELSE %]
57
                    <span>Confirm request</span>
58
                [% END %]
55
            [% END %]
59
            [% END %]
56
        [% ELSE %]
60
        [% ELSE %]
57
            [% WRAPPER breadcrumb_item bc_active= 1 %]
61
            [% WRAPPER breadcrumb_item bc_active= 1 %]
Lines 865-871 Link Here
865
                </div>
869
                </div>
866
            [% ELSIF op == 'confirmautoill' %]
870
            [% ELSIF op == 'confirmautoill' %]
867
                <!-- confirmautoill -->
871
                <!-- confirmautoill -->
872
                <<<<<<< HEAD
868
                <h1>Confirm request</h1>
873
                <h1>Confirm request</h1>
874
                =======
875
                [% IF(auto_migrate) %]
876
                    <h1>Confirm switch provider</h1>
877
                [% ELSE %]
878
                    <h1>Confirm automatic request</h1>
879
                [% END %]
880
                >>>>>>> Bug 38819: Auto switch: Breadcrumbs+header titles
869
                <div id="results" class="page-section">
881
                <div id="results" class="page-section">
870
                    <form method="post" id="confirmautoill-goback-form">
882
                    <form method="post" id="confirmautoill-goback-form">
871
                        [% INCLUDE 'csrf-token.inc' %]
883
                        [% INCLUDE 'csrf-token.inc' %]
872
- 

Return to bug 38819