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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt (-13 / +15 lines)
Lines 12-23 Link Here
12
12
13
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Search existing records</div>
13
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Search existing records</div>
14
14
15
<div id="doc3" class="yui-t2">
15
<div class="main container-fluid">
16
   
16
    <div class="row">
17
   <div id="bd">
17
        <div class="col-sm-10 col-sm-push-2">
18
	<div id="yui-main">
18
            <main>
19
	<div class="yui-b">
19
20
	
21
<h1>Search existing records</h1>
20
<h1>Search existing records</h1>
22
21
23
22
Lines 100-116 Link Here
100
99
101
[% INCLUDE 'acquisitions-add-to-basket.inc' %]
100
[% INCLUDE 'acquisitions-add-to-basket.inc' %]
102
101
103
</div>
102
</main>
104
</div>
103
</div> <!-- /.col-sm-10.col-sm-push-2 -->
105
<div class="yui-b">
104
106
[% INCLUDE 'acquisitions-menu.inc' %]
105
<div class="col-sm-2 col-sm-pull-10">
107
</div>
106
    <aside>
108
</div>
107
        [% INCLUDE 'acquisitions-menu.inc' %]
108
    </aside>
109
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
110
</div> <!-- /.row -->
109
111
110
[% MACRO jsinclude BLOCK %]
112
[% MACRO jsinclude BLOCK %]
111
    [% Asset.js("js/acquisitions-menu.js") %]
113
    [% Asset.js("js/acquisitions-menu.js") %]
112
    [% INCLUDE 'datatables.inc' %]
114
    [% INCLUDE 'datatables.inc' %]
113
    <script type="text/javascript">
115
    <script>
114
         $(document).ready(function() {
116
         $(document).ready(function() {
115
            var resultst = $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
117
            var resultst = $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
116
                'sDom': 't',
118
                'sDom': 't',
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-12 / +14 lines)
Lines 14-24 Link Here
14
14
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]</div>
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]</div>
16
16
17
<div id="doc3" class="yui-t2">
17
<div class="main container-fluid">
18
18
    <div class="row">
19
<div id="bd">
19
        <div class="col-sm-10 col-sm-push-2">
20
    <div id="yui-main">
20
            <main>
21
    <div class="yui-b">
22
21
23
<h2>
22
<h2>
24
    [% IF ( ordernumber ) %]
23
    [% IF ( ordernumber ) %]
Lines 508-519 Link Here
508
    </div>
507
    </div>
509
</div>
508
</div>
510
509
511
</div>
510
</main>
512
</div>
511
</div> <!-- /.col-sm-10.col-sm-push-2 -->
513
<div class="yui-b">
512
514
[% INCLUDE 'acquisitions-menu.inc' %]
513
<div class="col-sm-2 col-sm-pull-10">
515
</div>
514
    <aside>
516
</div>
515
        [% INCLUDE 'acquisitions-menu.inc' %]
516
    </aside>
517
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
518
</div> <!-- /.row -->
517
519
518
[% MACRO jsinclude BLOCK %]
520
[% MACRO jsinclude BLOCK %]
519
    [% Asset.js("js/acquisitions-menu.js") %]
521
    [% Asset.js("js/acquisitions-menu.js") %]
Lines 522-528 Link Here
522
    [% Asset.js("js/additem.js") %]
524
    [% Asset.js("js/additem.js") %]
523
    [% Asset.js("js/cataloging.js") %]
525
    [% Asset.js("js/cataloging.js") %]
524
    [% Asset.js("js/prevent_submit.js") %]
526
    [% Asset.js("js/prevent_submit.js") %]
525
    <script type="text/javascript">
527
    <script>
526
        actTotal = "";
528
        actTotal = "";
527
529
528
        function Check(ff) {
530
        function Check(ff) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt (-15 / +18 lines)
Lines 9-19 Link Here
9
9
10
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Duplicate warning</div>
10
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Duplicate warning</div>
11
11
12
<div id="doc3" class="yui-t2">
12
<div class="main container-fluid">
13
13
    <div class="row">
14
<div id="bd">
14
        <div class="col-sm-10 col-sm-push-2">
15
    <div id="yui-main">
15
            <main>
16
    <div class="yui-b">
17
16
18
<div class="dialog alert">
17
<div class="dialog alert">
19
<h4>Duplicate warning</h4>
18
<h4>Duplicate warning</h4>
Lines 23-30 Link Here
23
[% ELSE %]<a class="popup" target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber |url %]">[% END %][% duplicatetitle %]</a></p>
22
[% ELSE %]<a class="popup" target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber |url %]">[% END %][% duplicatetitle %]</a></p>
24
</div>
23
</div>
25
24
26
<div class="yui-gb">
25
<div class="row">
27
<div class="yui-u first">
26
<div class="col-sm-4">
28
<div style="border: 1px solid #DDD; padding:1em;">
27
<div style="border: 1px solid #DDD; padding:1em;">
29
<form action="/cgi-bin/koha/acqui/neworderempty.pl">
28
<form action="/cgi-bin/koha/acqui/neworderempty.pl">
30
<h4>Use existing record</h4>
29
<h4>Use existing record</h4>
Lines 37-43 Link Here
37
</div>
36
</div>
38
</div>
37
</div>
39
38
40
<div class="yui-u">
39
<div class="col-sm-4">
41
<div style="border: 1px solid #DDD; padding:1em;">
40
<div style="border: 1px solid #DDD; padding:1em;">
42
<form action="/cgi-bin/koha/acqui/basket.pl">
41
<form action="/cgi-bin/koha/acqui/basket.pl">
43
<h4>Cancel and return to order</h4>
42
<h4>Cancel and return to order</h4>
Lines 48-54 Link Here
48
</div>
47
</div>
49
</div>
48
</div>
50
49
51
<div class="yui-u">
50
<div class="col-sm-4">
52
<div style="border: 1px solid #DDD; padding:1em;">
51
<div style="border: 1px solid #DDD; padding:1em;">
53
<form action="/cgi-bin/koha/acqui/neworderempty.pl">
52
<form action="/cgi-bin/koha/acqui/neworderempty.pl">
54
<h4>Create new record</h4>
53
<h4>Create new record</h4>
Lines 64-73 Link Here
64
63
65
</div>
64
</div>
66
65
67
</div>
66
</main>
68
</div>
67
</div> <!-- /.col-sm-10.col-sm-push-2 -->
69
<div class="yui-b">
68
70
[% INCLUDE 'acquisitions-menu.inc' %]
69
<div class="col-sm-2 col-sm-pull-10">
71
</div>
70
    <aside>
72
</div>
71
        [% INCLUDE 'acquisitions-menu.inc' %]
72
    </aside>
73
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
74
</div> <!-- /.row -->
75
73
[% INCLUDE 'intranet-bottom.inc' %]
76
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-10 / +13 lines)
Lines 15-24 Link Here
15
15
16
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Add order from a subscription</div>
16
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Add order from a subscription</div>
17
17
18
<div id="doc3" class="yui-t2">
18
<div class="main container-fluid">
19
    <div id="bd">
19
    <div class="row">
20
    <div id="yui-main">
20
        <div class="col-sm-10 col-sm-push-2">
21
        <div class="yui-b">
21
            <main>
22
22
            <h2>Serials subscriptions</h2>
23
            <h2>Serials subscriptions</h2>
23
            [% IF (done_searched) %]
24
            [% IF (done_searched) %]
24
                <label for="show_only_renewed">
25
                <label for="show_only_renewed">
Lines 87-105 Link Here
87
            [% ELSE %]
88
            [% ELSE %]
88
                <p>Use the search form on the left to find subscriptions.</p>
89
                <p>Use the search form on the left to find subscriptions.</p>
89
            [% END %]
90
            [% END %]
90
        </div>
91
        </main>
91
    </div>
92
    </div> <!-- /.col-sm-10.col-sm-push-2 -->
92
93
93
    <div class="yui-b">
94
<div class="col-sm-2 col-sm-pull-10">
95
    <aside>
94
        [% INCLUDE 'subscriptions-search.inc' %]
96
        [% INCLUDE 'subscriptions-search.inc' %]
95
        [% INCLUDE 'acquisitions-menu.inc' %]
97
        [% INCLUDE 'acquisitions-menu.inc' %]
96
    </div>
98
    </aside>
97
</div>
99
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
100
</div> <!-- /.row -->
98
101
99
[% MACRO jsinclude BLOCK %]
102
[% MACRO jsinclude BLOCK %]
100
    [% Asset.js("js/acquisitions-menu.js") %]
103
    [% Asset.js("js/acquisitions-menu.js") %]
101
    [% INCLUDE 'datatables.inc' %]
104
    [% INCLUDE 'datatables.inc' %]
102
    <script type="text/javascript">
105
    <script>
103
        function updateRowsVisibility(show_only_renewed) {
106
        function updateRowsVisibility(show_only_renewed) {
104
            if ( show_only_renewed ) {
107
            if ( show_only_renewed ) {
105
                $("#srlt [data-reneweddate='']").hide();
108
                $("#srlt [data-reneweddate='']").hide();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-13 / +15 lines)
Lines 12-23 Link Here
12
12
13
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Add order from a suggestion</div>
13
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Add order from a suggestion</div>
14
14
15
<div id="doc3" class="yui-t2">
15
<div class="main container-fluid">
16
   
16
    <div class="row">
17
   <div id="bd">
17
        <div class="col-sm-10 col-sm-push-2">
18
	<div id="yui-main">
18
            <main>
19
	<div class="yui-b">
19
20
	
21
<h1>Suggestions</h1>
20
<h1>Suggestions</h1>
22
    [% IF ( suggestions_loop ) %]
21
    [% IF ( suggestions_loop ) %]
23
    <a href="#" id="show_only_mine">Show only mine</a> | <a href="#" id="show_all">Show all suggestions</a>
22
    <a href="#" id="show_only_mine">Show only mine</a> | <a href="#" id="show_all">Show all suggestions</a>
Lines 67-83 Link Here
67
    [% ELSE %]
66
    [% ELSE %]
68
        There are no outstanding (accepted) suggestions.
67
        There are no outstanding (accepted) suggestions.
69
    [% END %]
68
    [% END %]
70
</div>
69
</main>
71
</div>
70
</div> <!-- /.col-sm-10.col-sm-push-2 -->
72
<div class="yui-b">
71
73
[% INCLUDE 'acquisitions-menu.inc' %]
72
<div class="col-sm-2 col-sm-pull-10">
74
</div>
73
    <aside>
75
</div>
74
        [% INCLUDE 'acquisitions-menu.inc' %]
75
    </aside>
76
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
77
</div> <!-- /.row -->
76
78
77
[% MACRO jsinclude BLOCK %]
79
[% MACRO jsinclude BLOCK %]
78
    [% Asset.js("js/acquisitions-menu.js") %]
80
    [% Asset.js("js/acquisitions-menu.js") %]
79
    [% INCLUDE 'datatables.inc' %]
81
    [% INCLUDE 'datatables.inc' %]
80
    <script type="text/javascript">
82
    <script>
81
    $(document).ready(function() {
83
    $(document).ready(function() {
82
        var suggestionst = $("#suggestionst").dataTable($.extend(true, {}, dataTablesDefaults, {
84
        var suggestionst = $("#suggestionst").dataTable($.extend(true, {}, dataTablesDefaults, {
83
            "aoColumnDefs": [
85
            "aoColumnDefs": [
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-13 / +14 lines)
Lines 14-24 Link Here
14
14
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Ordered - [% fund_code %]</div>
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Ordered - [% fund_code %]</div>
16
16
17
<div id="doc3" class="yui-t2">
17
<div class="main container-fluid">
18
18
    <div class="row">
19
<div id="bd">
19
        <div class="col-sm-10 col-sm-push-2">
20
    <div id="yui-main">
20
            <main>
21
        <div class="yui-b">
22
21
23
<h1>Fund: [% fund_code %]</h1>
22
<h1>Fund: [% fund_code %]</h1>
24
<h2>Ordered</h2>
23
<h2>Ordered</h2>
Lines 99-115 Link Here
99
98
100
</table>
99
</table>
101
100
102
</div>
101
</main>
103
</div>
102
</div> <!-- /.col-sm-10.col-sm-push-2 -->
104
<div class="yui-b">
103
105
[% INCLUDE 'acquisitions-menu.inc' %]
104
<div class="col-sm-2 col-sm-pull-10">
106
</div>
105
    <aside>
107
</div>
106
        [% INCLUDE 'acquisitions-menu.inc' %]
107
    </aside>
108
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
109
</div> <!-- /.row -->
108
110
109
[% MACRO jsinclude BLOCK %]
111
[% MACRO jsinclude BLOCK %]
110
    [% Asset.js("js/acquisitions-menu.js") %]
112
    [% Asset.js("js/acquisitions-menu.js") %]
111
    [% INCLUDE 'datatables.inc' %]
113
    [% INCLUDE 'datatables.inc' %]
112
    <script type="text/javascript">
114
    <script>
113
        $(document).ready(function() {
115
        $(document).ready(function() {
114
            $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
116
            $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
115
                "aoColumnDefs": [
117
                "aoColumnDefs": [
116
- 

Return to bug 20672