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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-4 lines)
Lines 2759-2768 li { Link Here
2759
    }
2759
    }
2760
}
2760
}
2761
2761
2762
.supplier-contact-details {
2763
    float: left;
2764
}
2765
2766
#ADD-contact {
2762
#ADD-contact {
2767
    margin: 0 0 8px 8px;
2763
    margin: 0 0 8px 8px;
2768
}
2764
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-27 / +31 lines)
Lines 41-56 Link Here
41
    [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname | html %] [% IF ( basketno ) %]([% basketno | html %])[% END %] for [% booksellername | html %]
41
    [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname | html %] [% IF ( basketno ) %]([% basketno | html %])[% END %] for [% booksellername | html %]
42
</div>
42
</div>
43
43
44
<div id="doc3" class="yui-t2">
44
<div class="main container-fluid">
45
    <div class="row">
46
        <div class="col-sm-10 col-sm-push-2">
47
            <main>
45
48
46
<div id="bd">
47
    <div id="yui-main">
48
    [% IF (cannot_manage_basket) %]
49
    [% IF (cannot_manage_basket) %]
49
        <div class="yui-b">
50
        <div class="dialog alert">You are not authorised to manage this basket.</div>
50
            <p class="error">You are not authorised to manage this basket.</p>
51
        </div>
52
    [% ELSE %]
51
    [% ELSE %]
53
    <div class="yui-b">
52
54
        [% IF !confirm_close && !edi_confirm %]
53
        [% IF !confirm_close && !edi_confirm %]
55
        [% UNLESS ( selectbasketg ) %]
54
        [% UNLESS ( selectbasketg ) %]
56
            [% UNLESS ( closedate ) %]
55
            [% UNLESS ( closedate ) %]
Lines 207-215 Link Here
207
        [% END %]
206
        [% END %]
208
        <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
207
        <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
209
        [% IF ( basketno ) %]
208
        [% IF ( basketno ) %]
210
            <div id="acqui_basket_summary" class="yui-g">
209
            <div id="acqui_basket_summary" class="row">
211
                <div class="rows">
210
                <div class="rows">
212
                <div class="yui-u first">
211
                <div class="col-sm-6">
213
                <ol>
212
                <ol>
214
                [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %]
213
                [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %]
215
                [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
214
                [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
Lines 220-226 Link Here
220
                [% IF billingplace %]<li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) | html %]</li>[% END %]
219
                [% IF billingplace %]<li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) | html %]</li>[% END %]
221
                [% IF ( authorisedbyname ) %]<li><span class="label">Created by:</span>  [% authorisedbyname | html %]</li>[% END %]
220
                [% IF ( authorisedbyname ) %]<li><span class="label">Created by:</span>  [% authorisedbyname | html %]</li>[% END %]
222
                <li id="managedby">
221
                <li id="managedby">
223
                    <form action="" method="post">
222
                    <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
224
                        <span class="label">Managed by:</span>
223
                        <span class="label">Managed by:</span>
225
                        <div style="float:left">
224
                        <div style="float:left">
226
                            <ul id="users_names" style="padding-left:0">
225
                            <ul id="users_names" style="padding-left:0">
Lines 258-264 Link Here
258
                    <li id="managing_library_entry" style="display:none;">
257
                    <li id="managing_library_entry" style="display:none;">
259
                        <span class="label">&nbsp;</span>
258
                        <span class="label">&nbsp;</span>
260
                        <div style="float:left">
259
                        <div style="float:left">
261
                            <form action="" method="post">
260
                            <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
262
                                <select id="select_managing_library" name="branch">
261
                                <select id="select_managing_library" name="branch">
263
                                    <option value="">(no library)</option>
262
                                    <option value="">(no library)</option>
264
                                    [% FOREACH branch IN branches_loop %]
263
                                    [% FOREACH branch IN branches_loop %]
Lines 278-286 Link Here
278
                [% END %]
277
                [% END %]
279
278
280
                </ol>
279
                </ol>
281
                </div>
280
                </div> <!-- /.col-sm-6 -->
282
281
283
                <div class="yui-u">
282
                <div class="col-sm-6">
284
                    <ol>
283
                    <ol>
285
                        [% IF ( creationdate ) %]
284
                        [% IF ( creationdate ) %]
286
                            <li><span class="label">Opened on:</span>  [% creationdate | $KohaDates %]</li>
285
                            <li><span class="label">Opened on:</span>  [% creationdate | $KohaDates %]</li>
Lines 377-392 Link Here
377
                            [% END %]
376
                            [% END %]
378
                        </ol>
377
                        </ol>
379
                    [% END # /IF closeddate %]
378
                    [% END # /IF closeddate %]
380
                </div>
379
                    </div> <!-- /.rows -->
381
            </div>
380
                </div> <!-- /.col-sm-6 -->
382
            </div>
381
            </div> <!-- /#acqui_basket_summary.row -->
383
        [% END %]
382
        [% END %]
384
        [% IF ( duplinbatch ) %]<div class="dialog alert">
383
        [% IF ( duplinbatch ) %]<div class="dialog alert">
385
        <h4>Duplicate warning</h4>
384
        <h4>Duplicate warning</h4>
386
        <p>Some records have not been automatically added because they match an existing record in your catalog:<a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" title="Open in new window" target="_blank" class="popup" style="margin-left:10px">Display them</a></p>
385
        <p>Some records have not been automatically added because they match an existing record in your catalog:<a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" title="Open in new window" target="_blank" class="popup" style="margin-left:10px">Display them</a></p>
387
        </div>[% END %]
386
        </div>[% END %]
388
387
389
        <div id="acqui_basket_content" class="yui-g">
388
        <div id="acqui_basket_content">
390
        [% IF ( books_loop ) %]
389
        [% IF ( books_loop ) %]
391
            <h2>Orders</h2>
390
            <h2>Orders</h2>
392
            <table id="orders">
391
            <table id="orders">
Lines 572-578 Link Here
572
        [% END %]
571
        [% END %]
573
        [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>
572
        [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>
574
        [% END %]
573
        [% END %]
575
        </div>
574
        </div> <!-- /#acqui_basket_content -->
576
        [% IF (cancelledorders_loop) %]
575
        [% IF (cancelledorders_loop) %]
577
          <div id="cancelledorders">
576
          <div id="cancelledorders">
578
            <h2>Cancelled orders</h2>
577
            <h2>Cancelled orders</h2>
Lines 649-655 Link Here
649
                [% END %]
648
                [% END %]
650
              </tbody>
649
              </tbody>
651
            </table>
650
            </table>
652
          </div>
651
          </div> <!-- /#cancelledorders -->
653
        [% END %]
652
        [% END %]
654
        <br />
653
        <br />
655
        [% UNLESS ( closedate ) %]
654
        [% UNLESS ( closedate ) %]
Lines 724-737 Link Here
724
        </form>
723
        </form>
725
        </div>
724
        </div>
726
    [% END %]
725
    [% END %]
727
</div>
728
[% END %][%# IF (cannot_manage_basket) %]
726
[% END %][%# IF (cannot_manage_basket) %]
729
</div>
727
730
<div class="yui-b">
728
            </main>
731
    [% INCLUDE 'vendor-menu.inc' %]
729
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
732
    [% INCLUDE 'acquisitions-menu.inc' %]
730
733
</div>
731
        <div class="col-sm-2 col-sm-pull-10">
734
</div>
732
            <aside>
733
                [% INCLUDE 'vendor-menu.inc' %]
734
                [% INCLUDE 'acquisitions-menu.inc' %]
735
            </aside>
736
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
737
    </div> <!-- /.row -->
738
735
739
736
<!-- Modal for editing vendor and internal notes -->
740
<!-- Modal for editing vendor and internal notes -->
737
<div class="modal" id="noteEditor" tabindex="-1" role="dialog" aria-labelledby="noteEditorLabel">
741
<div class="modal" id="noteEditor" tabindex="-1" role="dialog" aria-labelledby="noteEditorLabel">
Lines 752-761 Link Here
752
                <button type="submit" class="btn btn-default">Save</button>
756
                <button type="submit" class="btn btn-default">Save</button>
753
                <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
757
                <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
754
            </div>
758
            </div>
759
            </div>
755
        </form>
760
        </form>
756
    </div>
761
    </div>
757
</div>
762
</div>
758
</div>
759
763
760
[% MACRO jsinclude BLOCK %]
764
[% MACRO jsinclude BLOCK %]
761
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
765
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 / +1 lines)
Lines 33-39 Link Here
33
<div class="dialog alert order_error" style="display:none"></div>
33
<div class="dialog alert order_error" style="display:none"></div>
34
34
35
[% IF ( basketno ) %]
35
[% IF ( basketno ) %]
36
    <div id="acqui_basket_summary"  class="yui-g">
36
    <div id="acqui_basket_summary">
37
    <fieldset class="rows">
37
    <fieldset class="rows">
38
        <legend>Basket details</legend>
38
        <legend>Basket details</legend>
39
        <ol>
39
        <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-13 / +11 lines)
Lines 123-129 Link Here
123
                <a class="btn btn-default btn-sm cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
123
                <a class="btn btn-default btn-sm cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
124
            [% END %] <i class="fa fa-remove"></i> Cancel</a>
124
            [% END %] <i class="fa fa-remove"></i> Cancel</a>
125
        </div>
125
        </div>
126
    <div class="yui-g">
126
127
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
127
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
128
        <fieldset class="rows">
128
        <fieldset class="rows">
129
            <legend>Company details</legend>
129
            <legend>Company details</legend>
Lines 251-257 Link Here
251
        <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]
251
        <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]
252
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
252
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
253
        [% END %]Cancel</a></fieldset>
253
        [% END %]Cancel</a></fieldset>
254
        </div>
254
255
    </form>
255
    </form>
256
[% ELSE %]
256
[% ELSE %]
257
    <h1>[% name | html %]</h1>
257
    <h1>[% name | html %]</h1>
Lines 296-312 Link Here
296
                [% END %]
296
                [% END %]
297
                [% IF ( notes ) %]<p><strong>Notes: </strong>
297
                [% IF ( notes ) %]<p><strong>Notes: </strong>
298
                    [% notes | html %]</p>[% END %]
298
                    [% notes | html %]</p>[% END %]
299
            </div>
299
            </div> <!-- .supplier-ordering-information -->
300
            </div>
300
            </div> <!-- /.col-sm-6 -->
301
301
302
            <div class="supplier-contact-details col-sm-6">
302
            <div class="col-sm-6">
303
                <h2>Contact</h2>
303
                <div class="supplier-contact-details">
304
                [% FOREACH contact IN contacts %]
304
                    <h2>Contact</h2>
305
                    [% INCLUDE show_contact %]
305
                    [% FOREACH contact IN contacts %]
306
                [% END %]
306
                        [% INCLUDE show_contact %]
307
            </div>
307
                    [% END %]
308
308
                </div>
309
            <div>
310
309
311
                <div class="subscription-details">
310
                <div class="subscription-details">
312
                    <h2>Subscription details</h2>
311
                    <h2>Subscription details</h2>
313
- 

Return to bug 21797