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

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (+1 lines)
Lines 606-611 fieldset.brief span.label { Link Here
606
	display : block;
606
	display : block;
607
	font-weight : bold;
607
	font-weight : bold;
608
	padding : .3em 0;
608
	padding : .3em 0;
609
    text-align: left;
609
}
610
}
610
611
611
fieldset.brief ol, fieldset.brief li {
612
fieldset.brief ol, fieldset.brief li {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-37 / +64 lines)
Lines 16-22 Link Here
16
[% Asset.js("lib/yui/animation/animation-min.js") %]
16
[% Asset.js("lib/yui/animation/animation-min.js") %]
17
[% Asset.js("lib/yui/dragdrop/dragdrop-min.js") %]
17
[% Asset.js("lib/yui/dragdrop/dragdrop-min.js") %]
18
[% Asset.js("lib/yui/element/element-min.js") %]
18
[% Asset.js("lib/yui/element/element-min.js") %]
19
<style type="text/css">
19
<style>
20
/*margin and padding on body element
20
/*margin and padding on body element
21
  can introduce errors in determining
21
  can introduce errors in determining
22
  element position and are not recommended;
22
  element position and are not recommended;
Lines 68-73 ul.draglist_alt li { Link Here
68
    list-style: none;
68
    list-style: none;
69
}
69
}
70
70
71
li.grouped,
72
li.ungrouped {
73
    display: block;
74
    margin: .2em 0;
75
    max-width: 20em;
76
    padding: .2em;
77
}
78
71
li.grouped {
79
li.grouped {
72
    background-color: #D1E6EC;
80
    background-color: #D1E6EC;
73
    border:1px solid #7EA6B2;
81
    border:1px solid #7EA6B2;
Lines 86-94 fieldset.various li { Link Here
86
94
87
</style>
95
</style>
88
 [% END %]
96
 [% END %]
89
<script type="text/javascript">
97
<script>
90
//<![CDATA[
98
    YAHOO.util.Event.onDOMReady(DDApp.init, DDApp, true);
91
	YAHOO.util.Event.onDOMReady(DDApp.init, DDApp, true);
92
99
93
var MSG_CONFIRM_CLOSE_BASKETGROUP = _("Are you sure you want to close this basketgroup?");
100
var MSG_CONFIRM_CLOSE_BASKETGROUP = _("Are you sure you want to close this basketgroup?");
94
var MSG_CLOSE_EMPTY_BASKET = _("Why close an empty basket?");
101
var MSG_CLOSE_EMPTY_BASKET = _("Why close an empty basket?");
Lines 118-126 function submitForm(form) { Link Here
118
    } ));
125
    } ));
119
126
120
 });
127
 });
121
122
123
//]]>
124
</script>
128
</script>
125
</head>
129
</head>
126
<body id="acq_basketgroup" class="acq">
130
<body id="acq_basketgroup" class="acq">
Lines 145-152 function submitForm(form) { Link Here
145
                        <div id="toolbar" class="btn-toolbar">
149
                        <div id="toolbar" class="btn-toolbar">
146
                            <div class="btn-group"><a href="[% script_name %]?op=reopen&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]&amp;mode=singlebg" class="btn btn-default btn-sm" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div>
150
                            <div class="btn-group"><a href="[% script_name %]?op=reopen&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]&amp;mode=singlebg" class="btn btn-default btn-sm" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div>
147
                            <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div>
151
                            <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div>
148
                            <div class="btn-group"><a href="[% script_name %]?op=print&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
152
                            <div class="btn-group"><a href="[% script_name %]?op=print&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
149
                            <div class="btn-group"><a href="[% script_name %]?op=ediprint&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
153
                            <div class="btn-group"><a href="[% script_name %]?op=ediprint&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
150
                        </div>
154
                        </div>
151
                    [% END %]
155
                    [% END %]
152
                    [% IF (name && closedbg) %]
156
                    [% IF (name && closedbg) %]
Lines 187-204 function submitForm(form) { Link Here
187
                                </form>
191
                                </form>
188
                            </div>
192
                            </div>
189
                        [% END %]
193
                        [% END %]
190
                        <div class="col-xs-6 col-xs-pull-6">
194
                        [% IF ( closedbg ) %]
191
                            <form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
195
                            <div class="col-xs-12">
196
                        [% ELSE %]
197
                            <div class="col-xs-6 col-xs-pull-6">
198
                        [% END %]
199
                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post" id="groupingform" onsubmit="return submitForm(this)">
192
                                <fieldset id="various" class="brief">
200
                                <fieldset id="various" class="brief">
193
                                    <ol>
201
                                    <ol>
194
                                        [% UNLESS (closedbg) %]
202
                                        <li>
195
                                            <li>
203
                                            [% UNLESS (closedbg) %]
196
                                                <label for="basketgroupname">Basket group name:</label>
204
                                                <label for="basketgroupname">Basket group name:</label>
197
                                                <input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" class="focus" />
205
                                                <input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" class="focus" />
198
                                            </li>
206
                                            [% ELSE %]
199
                                        [% ELSE %]
207
                                                <span class="label">Basket group name: </span>
200
                                            <input type="hidden" name="basketgroupname" id="basketgroupname" value="[% name %]" />
208
                                                [% name %]
201
                                        [% END %]
209
                                                <input type="hidden" name="basketgroupname" id="basketgroupname" value="[% name %]" />
210
                                            [% END %]
211
                                        </li>
202
                                        <li>
212
                                        <li>
203
                                            [% UNLESS (closedbg) %]
213
                                            [% UNLESS (closedbg) %]
204
                                                <label for="billingplace">Billing place:</label>
214
                                                <label for="billingplace">Billing place:</label>
Lines 236-250 function submitForm(form) { Link Here
236
                                                    [% END %]
246
                                                    [% END %]
237
                                                </li>
247
                                                </li>
238
                                            [% END %]
248
                                            [% END %]
239
                                            <li>
249
                                            [% IF ( deliverycomment ) %]
240
                                                [% UNLESS (closedbg) %]
250
                                                <li>
241
                                                    <label for="deliverycomment">Delivery comment:</label>
251
                                                    [% UNLESS (closedbg) %]
242
                                                    <textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
252
                                                        <label for="deliverycomment">Delivery comment:</label>
243
                                                [% ELSE %]
253
                                                        <textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
244
                                                    <span class="label">Delivery comment:</span>[% deliverycomment %]
254
                                                    [% ELSE %]
245
                                                    <input name="deliverycomment" id="deliverycomment" type="hidden" value = "[% deliverycomment %]" />
255
                                                        <span class="label">Delivery comment:</span>[% deliverycomment %]
246
                                                [% END %]
256
                                                        <input name="deliverycomment" id="deliverycomment" type="hidden" value = "[% deliverycomment %]" />
247
                                            </li>
257
                                                    [% END %]
258
                                                </li>
259
                                            [% END %]
248
                                            <li>
260
                                            <li>
249
                                                <span class="label">Baskets in this group:</span>
261
                                                <span class="label">Baskets in this group:</span>
250
                                                [% UNLESS (closedbg) %]
262
                                                [% UNLESS (closedbg) %]
Lines 267-277 function submitForm(form) { Link Here
267
                                                [% END %]
279
                                                [% END %]
268
                                            </ul>
280
                                            </ul>
269
                                        </li>
281
                                        </li>
270
                                            [% UNLESS (closedbg) %]
282
                                        [% UNLESS (closedbg) %]
271
                                                <li><label><input type="checkbox" id="closedbg" name="closedbg" />Close basket group</label></li>
283
                                            <li><label><input type="checkbox" id="closedbg" name="closedbg" />Close basket group</label></li>
272
                                            [% ELSE %]
284
                                        [% END %]
273
                                                <input type="hidden" id="closedbg" name="closedbg" value ="1"/>
274
                                            [% END %]
275
                                    </ol>
285
                                    </ol>
276
                                </fieldset>
286
                                </fieldset>
277
                                [% UNLESS (closedbg) %]
287
                                [% UNLESS (closedbg) %]
Lines 282-287 function submitForm(form) { Link Here
282
                                        <input type="hidden" name="op" value="attachbasket" />
292
                                        <input type="hidden" name="op" value="attachbasket" />
283
                                        <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]" class="cancel">Cancel</a>
293
                                        <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]" class="cancel">Cancel</a>
284
                                    </fieldset>
294
                                    </fieldset>
295
                                [% ELSE %]
296
                                    <input type="hidden" id="closedbg" name="closedbg" value ="1"/>
285
                                [% END %]
297
                                [% END %]
286
                            </form>
298
                            </form>
287
                        </div>
299
                        </div>
Lines 365-375 function submitForm(form) { Link Here
365
                                                <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>
377
                                                <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>
366
                                                <td>[% basketgroup.basketsqty %]</td>
378
                                                <td>[% basketgroup.basketsqty %]</td>
367
                                                <td>
379
                                                <td>
368
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
380
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get">
369
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
381
                                                        <input type="hidden" name="op" value="add" />
370
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as PDF" /></form>
382
                                                        <input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" />
371
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form>
383
                                                        <input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" />
372
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Generate EDIFACT order" /></form>
384
                                                    </form>
385
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get">
386
                                                        <input type="hidden" name="op" value="reopen" />
387
                                                        <input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" />
388
                                                        <input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" />
389
                                                    </form>
390
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get">
391
                                                        <input type="hidden" name="op" value="print" />
392
                                                        <input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as PDF" />
393
                                                    </form>
394
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get">
395
                                                        <input type="hidden" name="op" value="export" />
396
                                                        <input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" />
397
                                                    </form>
398
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get">
399
                                                        <input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Generate EDIFACT order" />
400
                                                    </form>
373
                                                </td>
401
                                                </td>
374
                                            </tr>
402
                                            </tr>
375
                                        [% END %]
403
                                        [% END %]
376
- 

Return to bug 21163