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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-14 / +20 lines)
Lines 15-25 Link Here
15
15
16
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Acquisitions</div>
16
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Acquisitions</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
[% INCLUDE 'acquisitions-toolbar.inc' %]
23
[% INCLUDE 'acquisitions-toolbar.inc' %]
25
24
Lines 32-39 Link Here
32
        <div class="dialog alert">Your administrator must define a budget in Administration</div>
31
        <div class="dialog alert">Your administrator must define a budget in Administration</div>
33
        [% END %]
32
        [% END %]
34
    [% END %]
33
    [% END %]
35
<div class="yui-g">
34
<div class="row">
36
<div class="yui-u first">
35
    [% IF ( suggestion && suggestions_count ) %]
36
        <div class="col-sm-6">
37
    [% ELSE %]
38
        <div class="col-sm-12">
39
    [% END %]
37
<div id="acqui_acqui_home_order">
40
<div id="acqui_acqui_home_order">
38
    <fieldset>
41
    <fieldset>
39
        <legend>Manage orders</legend>
42
        <legend>Manage orders</legend>
Lines 47-53 Link Here
47
</div>
50
</div>
48
51
49
[% IF ( suggestion && suggestions_count ) %]
52
[% IF ( suggestion && suggestions_count ) %]
50
<div class="yui-u">
53
<div class="col-sm-6">
51
    <div id="acqui_acqui_home_suggestions">
54
    <div id="acqui_acqui_home_suggestions">
52
        <fieldset>
55
        <fieldset>
53
        <legend>Pending suggestions</legend>
56
        <legend>Pending suggestions</legend>
Lines 161-178 Link Here
161
    </div>
164
    </div>
162
    [% END %]
165
    [% END %]
163
166
167
</main>
168
</div> <!-- /.col-sm-10.col-sm-push-2 -->
169
170
<div class="col-sm-2 col-sm-pull-10">
171
    <aside>
172
        [% INCLUDE 'acquisitions-menu.inc' %]
173
    </aside>
164
</div>
174
</div>
165
</div>
175
</div> <!-- /.row -->
166
<div class="yui-b">
167
[% INCLUDE 'acquisitions-menu.inc' %]
168
</div>
169
</div>
170
176
171
[% MACRO jsinclude BLOCK %]
177
[% MACRO jsinclude BLOCK %]
172
    [% INCLUDE 'datatables.inc' %]
178
    [% INCLUDE 'datatables.inc' %]
173
    [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") %]
179
    [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") %]
174
    [% Asset.js("js/acquisitions-menu.js") %]
180
    [% Asset.js("js/acquisitions-menu.js") %]
175
    <script type="text/javascript">
181
    <script>
176
        dt_overwrite_html_sorting_localeCompare();
182
        dt_overwrite_html_sorting_localeCompare();
177
183
178
        $(document).ready(function() {
184
        $(document).ready(function() {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-19 / +22 lines)
Lines 22-30 Link Here
22
  element position and are not recommended;
22
  element position and are not recommended;
23
  we turn them off as a foundation for YUI
23
  we turn them off as a foundation for YUI
24
  CSS treatments. */
24
  CSS treatments. */
25
#basketgroupcolumns {
25
26
    width: 58em;
27
}
28
#ungrouped {
26
#ungrouped {
29
	overflow: auto;
27
	overflow: auto;
30
	height: 400px;
28
	height: 400px;
Lines 136-145 function submitForm(form) { Link Here
136
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; Basket grouping</div>
134
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; Basket grouping</div>
137
[% END %]
135
[% END %]
138
136
139
<div id="doc3" class="yui-t2">
137
140
    <div id="bd">
138
<div class="main container-fluid">
141
        <div id="yui-main">
139
    <div class="row">
142
            <div class="yui-b">
140
        <div class="col-sm-10 col-sm-push-2">
141
            <main>
142
143
                [% IF ( grouping ) %]
143
                [% IF ( grouping ) %]
144
                    [% IF (closedbg) %]
144
                    [% IF (closedbg) %]
145
                        <div id="toolbar" class="btn-toolbar">
145
                        <div id="toolbar" class="btn-toolbar">
Lines 156-164 function submitForm(form) { Link Here
156
                    [% ELSE %]
156
                    [% ELSE %]
157
                        <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
157
                        <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
158
                    [% END %]
158
                    [% END %]
159
                    <div id="basketgroupcolumns" class="yui-g">
159
                    <div id="basketgroupcolumns" class="row">
160
                        [% UNLESS (closedbg) %]
160
                        [% UNLESS (closedbg) %]
161
                            <div class="yui-u">
161
                            <div class="col-xs-6 col-xs-push-6">
162
                                <form action="[% scriptname %]" method="post" name="basketgroups" id="basketgroups">
162
                                <form action="[% scriptname %]" method="post" name="basketgroups" id="basketgroups">
163
                                    <div id="groups">
163
                                    <div id="groups">
164
                                        <fieldset class="brief">
164
                                        <fieldset class="brief">
Lines 187-193 function submitForm(form) { Link Here
187
                                </form>
187
                                </form>
188
                            </div>
188
                            </div>
189
                        [% END %]
189
                        [% END %]
190
                        <div class="yui-u first">
190
                        <div class="col-xs-6 col-xs-pull-6">
191
                            <form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
191
                            <form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
192
                                <fieldset id="various" class="brief">
192
                                <fieldset id="various" class="brief">
193
                                    <ol>
193
                                    <ol>
Lines 217-223 function submitForm(form) { Link Here
217
                                                <select name="deliveryplace" id="deliveryplace" style="width:13em;">
217
                                                <select name="deliveryplace" id="deliveryplace" style="width:13em;">
218
                                                    <option value="">--</option>
218
                                                    <option value="">--</option>
219
                                                    [% PROCESS options_for_libraries libraries => Branches.all( selected => deliveryplace ) %]
219
                                                    [% PROCESS options_for_libraries libraries => Branches.all( selected => deliveryplace ) %]
220
                                                <select>
220
                                                </select>
221
                                            </li>
221
                                            </li>
222
                                            <li><p>or</p></li>
222
                                            <li><p>or</p></li>
223
                                            <li>
223
                                            <li>
Lines 379-391 function submitForm(form) { Link Here
379
                        </div>
379
                        </div>
380
                    </div>
380
                    </div>
381
                [% END %]
381
                [% END %]
382
            </div>
382
            </main>
383
        </div>
383
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
384
        <div class="yui-b">
384
385
            [% IF ( booksellerid ) %]
385
        <div class="col-sm-2 col-sm-pull-10">
386
                [% INCLUDE 'vendor-menu.inc' %]
386
            <aside>
387
            [% END %]
387
                [% IF ( booksellerid ) %]
388
            [% INCLUDE 'acquisitions-menu.inc' %]
388
                    [% INCLUDE 'vendor-menu.inc' %]
389
                [% END %]
390
                [% INCLUDE 'acquisitions-menu.inc' %]
391
            </aside>
389
        </div>
392
        </div>
390
    </div>
393
    </div> <!-- /.row -->
391
    [% INCLUDE 'intranet-bottom.inc' %]
394
    [% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-16 / +17 lines)
Lines 18-29 Link Here
18
18
19
<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; Search for vendor <em>[% supplier |html %]</em> </div>
19
<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; Search for vendor <em>[% supplier |html %]</em> </div>
20
20
21
<div id="doc3" class="yui-t2">
21
<div class="main container-fluid">
22
   
22
    <div class="row">
23
    <div id="bd">
23
        <div class="col-sm-10 col-sm-push-2">
24
    <div id="yui-main">
24
            <main>
25
    <div class="yui-b">
25
26
    
27
[% INCLUDE 'acquisitions-toolbar.inc' %]
26
[% INCLUDE 'acquisitions-toolbar.inc' %]
28
[% UNLESS ( count == 1 ) %]
27
[% UNLESS ( count == 1 ) %]
29
    [% UNLESS count %]
28
    [% UNLESS count %]
Lines 176-195 Link Here
176
        [% END %][%# FOREACH supplier IN loop_suppliers %]
175
        [% END %][%# FOREACH supplier IN loop_suppliers %]
177
    </div>
176
    </div>
178
[% END %][%# IF ( loop_suppliers.size ) %]
177
[% END %][%# IF ( loop_suppliers.size ) %]
179
</div>
178
</main>
180
</div>
179
</div> <!-- /.col-sm-10.col-sm-push-2 -->
181
<div class="yui-b">
180
    <div class="col-sm-2 col-sm-pull-10">
182
[% IF ( booksellerid ) %]
181
        <aside>
183
[% INCLUDE 'vendor-menu.inc' %]
182
            [% IF ( booksellerid ) %]
184
[% END %]
183
                [% INCLUDE 'vendor-menu.inc' %]
185
[% INCLUDE 'acquisitions-menu.inc' %]
184
            [% END %]
186
</div>
185
            [% INCLUDE 'acquisitions-menu.inc' %]
187
</div>
186
        </aside>
187
    </div>
188
</div> <!-- /.row -->
188
189
189
[% MACRO jsinclude BLOCK %]
190
[% MACRO jsinclude BLOCK %]
190
    [% Asset.js("js/acquisitions-menu.js") %]
191
    [% Asset.js("js/acquisitions-menu.js") %]
191
    [% INCLUDE 'datatables.inc' %]
192
    [% INCLUDE 'datatables.inc' %]
192
    <script type="text/javascript">
193
    <script>
193
        $(document).ready(function() {
194
        $(document).ready(function() {
194
            $("table.baskets").dataTable($.extend(true, {}, dataTablesDefaults, {
195
            $("table.baskets").dataTable($.extend(true, {}, dataTablesDefaults, {
195
                'sDom': 't',
196
                'sDom': 't',
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt (-13 / +15 lines)
Lines 19-29 Link Here
19
&rsaquo; <a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a>
19
&rsaquo; <a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a>
20
</div>
20
</div>
21
21
22
<div id="doc3" class="yui-t2">
22
<div class="main container-fluid">
23
23
    <div class="row">
24
<div id="bd">
24
        <div class="col-sm-10 col-sm-push-2">
25
    <div id="yui-main">
25
            <main>
26
    <div class="yui-b">
27
26
28
27
29
<h1>EDIFACT messages</h1>
28
<h1>EDIFACT messages</h1>
Lines 102-119 Link Here
102
    <div class="dialog message">There are no EDIFACT messages.</div>
101
    <div class="dialog message">There are no EDIFACT messages.</div>
103
[% END %]
102
[% END %]
104
103
105
</div>
104
</div> <!-- /#acqui_edifactmsgs -->
106
</div>
105
</main>
107
</div>
106
</div> <!-- /.col-sm-10.col-sm-push-2 -->
108
<div class="yui-b">
107
109
[% INCLUDE 'acquisitions-menu.inc' %]
108
    <div class="col-sm-2 col-sm-pull-10">
110
</div>
109
        <aside>
111
</div>
110
            [% INCLUDE 'acquisitions-menu.inc' %]
111
        </aside>
112
    </div>
113
</div> <!-- /.row -->
112
114
113
[% MACRO jsinclude BLOCK %]
115
[% MACRO jsinclude BLOCK %]
114
    [% Asset.js("js/acquisitions-menu.js") %]
116
    [% Asset.js("js/acquisitions-menu.js") %]
115
    [% INCLUDE 'datatables.inc' %]
117
    [% INCLUDE 'datatables.inc' %]
116
    <script type="text/javascript">
118
    <script>
117
        $(document).ready(function() {
119
        $(document).ready(function() {
118
            $('#edi_msgs').dataTable($.extend(true, {}, dataTablesDefaults, {
120
            $('#edi_msgs').dataTable($.extend(true, {}, dataTablesDefaults, {
119
                'aaSorting': [[1, "desc" ]],
121
                'aaSorting': [[1, "desc" ]],
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt (-10 / +13 lines)
Lines 11-20 Link Here
11
&rsaquo; <a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a>
11
&rsaquo; <a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a>
12
</div>
12
</div>
13
13
14
<div id="doc3" class="yui-t2">
14
<div class="main container-fluid">
15
    <div id="bd">
15
    <div class="row">
16
        <div id="yui-main">
16
        <div class="col-sm-10 col-sm-push-2">
17
            <div class="yui-b">
17
            <main>
18
                <div id="edimsg">
18
                <div id="edimsg">
19
                    [% IF no_message %]
19
                    [% IF no_message %]
20
                        <div class"dialog message">The requested message cannot be displayed</div>
20
                        <div class"dialog message">The requested message cannot be displayed</div>
Lines 26-35 Link Here
26
                        </ul>
26
                        </ul>
27
                    [% END %]
27
                    [% END %]
28
                </div>
28
                </div>
29
            </div>
29
            </main>
30
        </div>
30
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
31
        <div class="yui-b">
31
32
            [% INCLUDE 'acquisitions-menu.inc' %]
32
        <div class="col-sm-2 col-sm-pull-10">
33
            <aside>
34
                [% INCLUDE 'acquisitions-menu.inc' %]
35
            </aside>
33
        </div>
36
        </div>
34
    </div>
37
    </div> <!-- /.row -->
38
35
[% INCLUDE 'intranet-bottom.inc' %]
39
[% INCLUDE 'intranet-bottom.inc' %]
36
- 

Return to bug 20667