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 13-24 Link Here
13
13
14
<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 | html %]">[% name | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; Search existing records</div>
14
<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 | html %]">[% name | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; Search existing records</div>
15
15
16
<div id="doc3" class="yui-t2">
16
<div class="main container-fluid">
17
   
17
    <div class="row">
18
   <div id="bd">
18
        <div class="col-sm-10 col-sm-push-2">
19
	<div id="yui-main">
19
            <main>
20
	<div class="yui-b">
20
21
	
22
<h1>Search existing records</h1>
21
<h1>Search existing records</h1>
23
22
24
23
Lines 101-117 Link Here
101
100
102
[% INCLUDE 'acquisitions-add-to-basket.inc' %]
101
[% INCLUDE 'acquisitions-add-to-basket.inc' %]
103
102
104
</div>
103
</main>
105
</div>
104
</div> <!-- /.col-sm-10.col-sm-push-2 -->
106
<div class="yui-b">
105
107
[% INCLUDE 'acquisitions-menu.inc' %]
106
<div class="col-sm-2 col-sm-pull-10">
108
</div>
107
    <aside>
109
</div>
108
        [% INCLUDE 'acquisitions-menu.inc' %]
109
    </aside>
110
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
111
</div> <!-- /.row -->
110
112
111
[% MACRO jsinclude BLOCK %]
113
[% MACRO jsinclude BLOCK %]
112
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
114
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
113
    [% INCLUDE 'datatables.inc' %]
115
    [% INCLUDE 'datatables.inc' %]
114
    <script type="text/javascript">
116
    <script>
115
         $(document).ready(function() {
117
         $(document).ready(function() {
116
            var resultst = $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
118
            var resultst = $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
117
                'sDom': 't',
119
                'sDom': 't',
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-12 / +14 lines)
Lines 15-25 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 | html %]">[% name | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber | html %])[% ELSE %]New order[% END %]</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 | html %]">[% name | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber | html %])[% ELSE %]New order[% END %]</div>
17
17
18
<div id="doc3" class="yui-t2">
18
<div class="main container-fluid">
19
19
    <div class="row">
20
<div id="bd">
20
        <div class="col-sm-10 col-sm-push-2">
21
    <div id="yui-main">
21
            <main>
22
    <div class="yui-b">
23
22
24
<h2>
23
<h2>
25
    [% IF ( ordernumber ) %]
24
    [% IF ( ordernumber ) %]
Lines 509-520 Link Here
509
    </div>
508
    </div>
510
</div>
509
</div>
511
510
512
</div>
511
</main>
513
</div>
512
</div> <!-- /.col-sm-10.col-sm-push-2 -->
514
<div class="yui-b">
513
515
[% INCLUDE 'acquisitions-menu.inc' %]
514
<div class="col-sm-2 col-sm-pull-10">
516
</div>
515
    <aside>
517
</div>
516
        [% INCLUDE 'acquisitions-menu.inc' %]
517
    </aside>
518
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
519
</div> <!-- /.row -->
518
520
519
[% MACRO jsinclude BLOCK %]
521
[% MACRO jsinclude BLOCK %]
520
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
522
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
Lines 523-529 Link Here
523
    [% Asset.js("js/additem.js") | $raw %]
525
    [% Asset.js("js/additem.js") | $raw %]
524
    [% Asset.js("js/cataloging.js") | $raw %]
526
    [% Asset.js("js/cataloging.js") | $raw %]
525
    [% Asset.js("js/prevent_submit.js") | $raw %]
527
    [% Asset.js("js/prevent_submit.js") | $raw %]
526
    <script type="text/javascript">
528
    <script>
527
        actTotal = "";
529
        actTotal = "";
528
530
529
        function Check(ff) {
531
        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 | html %]">Basket [% basketno | html %]</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 | html %]">Basket [% basketno | html %]</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 | html %]</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 | html %]</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 16-25 Link Here
16
16
17
<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 | html %]">[% booksellername | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; Add order from a subscription</div>
17
<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 | html %]">[% booksellername | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; Add order from a subscription</div>
18
18
19
<div id="doc3" class="yui-t2">
19
<div class="main container-fluid">
20
    <div id="bd">
20
    <div class="row">
21
    <div id="yui-main">
21
        <div class="col-sm-10 col-sm-push-2">
22
        <div class="yui-b">
22
            <main>
23
23
            <h2>Serials subscriptions</h2>
24
            <h2>Serials subscriptions</h2>
24
            [% IF (done_searched) %]
25
            [% IF (done_searched) %]
25
                <label for="show_only_renewed">
26
                <label for="show_only_renewed">
Lines 88-106 Link Here
88
            [% ELSE %]
89
            [% ELSE %]
89
                <p>Use the search form on the left to find subscriptions.</p>
90
                <p>Use the search form on the left to find subscriptions.</p>
90
            [% END %]
91
            [% END %]
91
        </div>
92
        </main>
92
    </div>
93
    </div> <!-- /.col-sm-10.col-sm-push-2 -->
93
94
94
    <div class="yui-b">
95
<div class="col-sm-2 col-sm-pull-10">
96
    <aside>
95
        [% INCLUDE 'subscriptions-search.inc' %]
97
        [% INCLUDE 'subscriptions-search.inc' %]
96
        [% INCLUDE 'acquisitions-menu.inc' %]
98
        [% INCLUDE 'acquisitions-menu.inc' %]
97
    </div>
99
    </aside>
98
</div>
100
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
101
</div> <!-- /.row -->
99
102
100
[% MACRO jsinclude BLOCK %]
103
[% MACRO jsinclude BLOCK %]
101
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
104
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
102
    [% INCLUDE 'datatables.inc' %]
105
    [% INCLUDE 'datatables.inc' %]
103
    <script type="text/javascript">
106
    <script>
104
        function updateRowsVisibility(show_only_renewed) {
107
        function updateRowsVisibility(show_only_renewed) {
105
            if ( show_only_renewed ) {
108
            if ( show_only_renewed ) {
106
                $("#srlt [data-reneweddate='']").hide();
109
                $("#srlt [data-reneweddate='']").hide();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-13 / +15 lines)
Lines 13-24 Link Here
13
13
14
<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 | html %]">[% name | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; Add order from a suggestion</div>
14
<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 | html %]">[% name | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; Add order from a suggestion</div>
15
15
16
<div id="doc3" class="yui-t2">
16
<div class="main container-fluid">
17
   
17
    <div class="row">
18
   <div id="bd">
18
        <div class="col-sm-10 col-sm-push-2">
19
	<div id="yui-main">
19
            <main>
20
	<div class="yui-b">
20
21
	
22
<h1>Suggestions</h1>
21
<h1>Suggestions</h1>
23
    [% IF ( suggestions_loop ) %]
22
    [% IF ( suggestions_loop ) %]
24
    <a href="#" id="show_only_mine">Show only mine</a> | <a href="#" id="show_all">Show all suggestions</a>
23
    <a href="#" id="show_only_mine">Show only mine</a> | <a href="#" id="show_all">Show all suggestions</a>
Lines 68-84 Link Here
68
    [% ELSE %]
67
    [% ELSE %]
69
        There are no outstanding (accepted) suggestions.
68
        There are no outstanding (accepted) suggestions.
70
    [% END %]
69
    [% END %]
71
</div>
70
</main>
72
</div>
71
</div> <!-- /.col-sm-10.col-sm-push-2 -->
73
<div class="yui-b">
72
74
[% INCLUDE 'acquisitions-menu.inc' %]
73
<div class="col-sm-2 col-sm-pull-10">
75
</div>
74
    <aside>
76
</div>
75
        [% INCLUDE 'acquisitions-menu.inc' %]
76
    </aside>
77
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
78
</div> <!-- /.row -->
77
79
78
[% MACRO jsinclude BLOCK %]
80
[% MACRO jsinclude BLOCK %]
79
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
81
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
80
    [% INCLUDE 'datatables.inc' %]
82
    [% INCLUDE 'datatables.inc' %]
81
    <script type="text/javascript">
83
    <script>
82
    $(document).ready(function() {
84
    $(document).ready(function() {
83
        var suggestionst = $("#suggestionst").dataTable($.extend(true, {}, dataTablesDefaults, {
85
        var suggestionst = $("#suggestionst").dataTable($.extend(true, {}, dataTablesDefaults, {
84
            "aoColumnDefs": [
86
            "aoColumnDefs": [
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-13 / +14 lines)
Lines 15-25 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; Ordered - [% fund_code | html %]</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; Ordered - [% fund_code | html %]</div>
17
17
18
<div id="doc3" class="yui-t2">
18
<div class="main container-fluid">
19
19
    <div class="row">
20
<div id="bd">
20
        <div class="col-sm-10 col-sm-push-2">
21
    <div id="yui-main">
21
            <main>
22
        <div class="yui-b">
23
22
24
<h1>Fund: [% fund_code | html %]</h1>
23
<h1>Fund: [% fund_code | html %]</h1>
25
<h2>Ordered</h2>
24
<h2>Ordered</h2>
Lines 100-116 Link Here
100
99
101
</table>
100
</table>
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") | $raw %]
113
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
112
    [% INCLUDE 'datatables.inc' %]
114
    [% INCLUDE 'datatables.inc' %]
113
    <script type="text/javascript">
115
    <script>
114
        $(document).ready(function() {
116
        $(document).ready(function() {
115
            $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
117
            $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
116
                "aoColumnDefs": [
118
                "aoColumnDefs": [
117
- 

Return to bug 20672