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

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (-13 / +31 lines)
Lines 469-475 div#reserves,div#checkouts { Link Here
469
}
469
}
470
470
471
471
472
div.yui-b h5 {
472
div.yui-b h5,
473
aside h5 {
473
	font-size : 100%;
474
	font-size : 100%;
474
	margin : .5em 0;
475
	margin : .5em 0;
475
}
476
}
Lines 618-664 fieldset.rows div.hint { Link Here
618
    margin-left : 7.5em;
619
    margin-left : 7.5em;
619
}
620
}
620
621
621
div.yui-b fieldset.brief {
622
div.yui-b fieldset.brief,
622
	padding : .4em .7em;
623
aside fieldset.brief {
624
    margin: 0;
625
    padding : .4em .7em;
623
}
626
}
624
627
625
div.yui-b fieldset.brief ol {
628
div.yui-b fieldset.brief ol,
629
aside fieldset.brief ol {
626
	font-size : 85%;
630
	font-size : 85%;
627
	margin : 0;
631
	margin : 0;
628
	padding : 0;
632
	padding : 0;
629
}
633
}
630
634
631
div.yui-b fieldset.brief select,
635
div.yui-b fieldset.brief select,
632
div.yui-b fieldset.brief input[type=text] {
636
div.yui-b fieldset.brief input[type=text],
637
aside fieldset.brief select,
638
aside fieldset.brief input[type=text] {
633
    width: 100%;
639
    width: 100%;
634
}
640
}
635
641
636
div.yui-b fieldset.brief li.radio {
642
div.yui-b fieldset.brief li.radio,
643
aside fieldset.brief li.radio {
637
	padding : .7em 0;
644
	padding : .7em 0;
638
}
645
}
646
639
div.yui-b fieldset.brief li.radio label,
647
div.yui-b fieldset.brief li.radio label,
640
div.yui-b fieldset.brief li.checkbox label,
648
div.yui-b fieldset.brief li.checkbox label,
641
div.yui-b fieldset.brief li.dateinsert label,
649
div.yui-b fieldset.brief li.dateinsert label,
642
div.yui-b fieldset.brief li.dateinsert span.label,
650
div.yui-b fieldset.brief li.dateinsert span.label,
643
div.yui-b fieldset.brief li.radio span.label {
651
div.yui-b fieldset.brief li.radio span.label,
652
aside fieldset.brief li.radio label,
653
aside fieldset.brief li.checkbox label,
654
aside fieldset.brief li.dateinsert label,
655
aside fieldset.brief li.dateinsert span.label,
656
aside fieldset.brief li.radio span.label {
644
	display : inline;
657
	display : inline;
645
}
658
}
646
659
647
div.yui-b fieldset.brief li.radio input {
660
div.yui-b fieldset.brief li.radio input,
661
aside fieldset.brief li.radio input {
648
	padding:0.3em 0;
662
	padding:0.3em 0;
649
}
663
}
650
664
651
div.yui-b fieldset.brief fieldset {
665
div.yui-b fieldset.brief fieldset,
652
	margin : 0 .3em;
666
aside fieldset.brief fieldset {
653
	padding : .5em;
667
    margin : 0;
668
    padding : .5em 0;
654
}
669
}
655
670
656
div.yui-b fieldset.brief fieldset legend {
671
div.yui-b fieldset.brief fieldset legend,
672
aside fieldset.brief fieldset legend {
657
	font-size : 85%;
673
	font-size : 85%;
658
}
674
}
659
675
660
#yui-main div.yui-b fieldset.brief select,
676
#yui-main div.yui-b fieldset.brief select,
661
#yui-main div.yui-b fieldset.brief input[type=text] {
677
#yui-main div.yui-b fieldset.brief input[type=text],
678
main div.yui-b fieldset.brief select,
679
main div.yui-b fieldset.brief input[type=text] {
662
    width: auto;
680
    width: auto;
663
}
681
}
664
682
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt (-10 / +13 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; Basket ([% basketno %])</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; Basket ([% basketno %])</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
    <h2>Select the library account submitting the EDI order</h2>
17
    <h2>Select the library account submitting the EDI order</h2>
19
    <br />
18
    <br />
Lines 30-39 Link Here
30
            <input type="submit" value="Send EDI order" />
29
            <input type="submit" value="Send EDI order" />
31
        </p>
30
        </p>
32
    </form>
31
    </form>
32
</main>
33
</div> <!-- /.col-sm-10.col-sm-push-2 -->
34
35
<div class="col-sm-2 col-sm-pull-10">
36
    <aside>
37
        [% INCLUDE 'acquisitions-menu.inc' %]
38
    </aside>
39
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
33
</div>
40
</div>
34
</div>
41
35
<div class="yui-b">
36
[% INCLUDE 'acquisitions-menu.inc' %]
37
</div>
38
</div>
39
[% INCLUDE 'intranet-bottom.inc' %]
42
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-12 / +14 lines)
Lines 14-25 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; [% IF ( order_loop ) %]<a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> &rsaquo; Search results[% ELSE %]Order search[% 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; [% IF ( order_loop ) %]<a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> &rsaquo; Search results[% ELSE %]Order search[% 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">
21
22
	
23
[% UNLESS ( order_loop ) %]<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
22
[% UNLESS ( order_loop ) %]<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
24
<fieldset class="rows">
23
<fieldset class="rows">
25
    <legend>Search orders</legend>
24
    <legend>Search orders</legend>
Lines 200-210 Link Here
200
      There is no order for this search.
199
      There is no order for this search.
201
    [% END %]
200
    [% END %]
202
201
203
</div>
202
</main>
204
</div>
203
</div> <!-- /.col-sm-10.col-sm-push-2 -->
205
<div class="yui-b">
204
206
[% INCLUDE 'acquisitions-menu.inc' %]
205
<div class="col-sm-2 col-sm-pull-10">
207
</div>
206
    <aside>
207
        [% INCLUDE 'acquisitions-menu.inc' %]
208
    </aside>
209
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
208
</div>
210
</div>
209
211
210
[% MACRO jsinclude BLOCK %]
212
[% MACRO jsinclude BLOCK %]
Lines 213-219 Link Here
213
    [% INCLUDE 'datatables.inc' %]
215
    [% INCLUDE 'datatables.inc' %]
214
    [% INCLUDE 'columns_settings.inc' %]
216
    [% INCLUDE 'columns_settings.inc' %]
215
    [% Asset.js("js/autocomplete/patrons.js") %]
217
    [% Asset.js("js/autocomplete/patrons.js") %]
216
    <script type="text/javascript">
218
    <script>
217
        var MSG_REMOVE_PATRON = _("Remove");
219
        var MSG_REMOVE_PATRON = _("Remove");
218
        $(document).ready(function() {
220
        $(document).ready(function() {
219
            var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'histsearch', 'histsearcht', 'json' ) %];
221
            var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'histsearch', 'histsearcht', 'json' ) %];
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt (-11 / +14 lines)
Lines 13-23 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/invoices.pl">Invoices</a> &rsaquo; <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">[% invoicenumber %]</a> &rsaquo; Files</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/invoices.pl">Invoices</a> &rsaquo; <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">[% invoicenumber %]</a> &rsaquo; Files</div>
15
15
16
<div id="doc3" class="yui-t2">
16
<div class="main container-fluid">
17
    <div class="row">
18
        <div class="col-sm-10 col-sm-push-2">
19
            <main>
17
20
18
<div id="bd">
19
  <div id="yui-main">
20
    <div class="yui-b">
21
      <h2>Files for invoice: [% invoicenumber | html %]</h2>
21
      <h2>Files for invoice: [% invoicenumber | html %]</h2>
22
      <p><b>Vendor: </b><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% suppliername %]</a></p>
22
      <p><b>Vendor: </b><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% suppliername %]</a></p>
23
      <br />
23
      <br />
Lines 78-94 Link Here
78
              </fieldset>
78
              </fieldset>
79
          </form>
79
          </form>
80
      [% END %]
80
      [% END %]
81
    </div>
81
    </main>
82
  </div>
82
  </div> <!-- /.col-sm-10.col-sm-push-2 -->
83
  <div class="yui-b">
83
84
    [% INCLUDE 'acquisitions-menu.inc' %]
84
<div class="col-sm-2 col-sm-pull-10">
85
  </div>
85
    <aside>
86
</div>
86
        [% INCLUDE 'acquisitions-menu.inc' %]
87
    </aside>
88
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
89
</div> <!-- /.row -->
87
90
88
[% MACRO jsinclude BLOCK %]
91
[% MACRO jsinclude BLOCK %]
89
    [% Asset.js("js/acquisitions-menu.js") %]
92
    [% Asset.js("js/acquisitions-menu.js") %]
90
    [% INCLUDE 'datatables.inc' %]
93
    [% INCLUDE 'datatables.inc' %]
91
    <script type="text/javascript">
94
    <script>
92
        $(document).ready(function() {
95
        $(document).ready(function() {
93
            $("#invoice_files_details_table").dataTable($.extend(true, {}, dataTablesDefaults, {
96
            $("#invoice_files_details_table").dataTable($.extend(true, {}, dataTablesDefaults, {
94
                "aoColumnDefs": [
97
                "aoColumnDefs": [
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-14 / +19 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/invoices.pl">Invoices</a> &rsaquo; <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">[% invoicenumber %]</a></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/invoices.pl">Invoices</a> &rsaquo; <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">[% invoicenumber %]</a></div>
17
17
18
<div id="doc3" class="yui-t2">
18
<div class="main container-fluid">
19
    <div class="row">
20
        <div class="col-sm-10 col-sm-push-2">
21
            <main>
19
22
20
<div id="bd">
21
  <div id="yui-main">
22
    <div class="yui-b">
23
      [% IF ( modified ) %]
23
      [% IF ( modified ) %]
24
        <div class="dialog message">
24
        <div class="dialog message">
25
          <p>Invoice has been modified</p>
25
          <p>Invoice has been modified</p>
Lines 142-148 Link Here
142
              [% FOR tf IN foot_loop %]
142
              [% FOR tf IN foot_loop %]
143
                <tr>
143
                <tr>
144
                    <th colspan="2">Total (GST [% tf.tax_rate * 100 %] %)</th>
144
                    <th colspan="2">Total (GST [% tf.tax_rate * 100 %] %)</th>
145
                    <th class="tax_excluded"/><th class="tax_included"/>
145
                    <th class="tax_excluded"></th>
146
                    <th class="tax_included"></th>
146
                    <th>[% tf.quantity %]</th>
147
                    <th>[% tf.quantity %]</th>
147
                    <th class="tax_excluded">[% tf.total_tax_excluded | $Price %]</th>
148
                    <th class="tax_excluded">[% tf.total_tax_excluded | $Price %]</th>
148
                    <th class="tax_included">[% tf.total_tax_included | $Price %]</th>
149
                    <th class="tax_included">[% tf.total_tax_included | $Price %]</th>
Lines 152-159 Link Here
152
                </tr>
153
                </tr>
153
              [% END %]
154
              [% END %]
154
              <tr>
155
              <tr>
155
                <th colspan='2'>Total ([% currency.symbol %])</th>
156
                <th colspan="2">Total ([% currency.symbol %])</th>
156
                <th class="tax_excluded"/><th class="tax_included"/>
157
                <th class="tax_excluded"></th>
158
                <th class="tax_included"></th>
157
                <th>[% total_quantity %]</th>
159
                <th>[% total_quantity %]</th>
158
                <th class="tax_excluded">[% total_tax_excluded | $Price %]</th>
160
                <th class="tax_excluded">[% total_tax_excluded | $Price %]</th>
159
                <th class="tax_included">[% total_tax_included | $Price %]</th>
161
                <th class="tax_included">[% total_tax_included | $Price %]</th>
Lines 203-220 Link Here
203
                </tbody>
205
                </tbody>
204
            </table>
206
            </table>
205
        [% END %]
207
        [% END %]
206
    </div>
208
    </main>
207
  </div>
209
  </div> <!-- /.col-sm-10.col-sm-push-2 -->
208
  <div class="yui-b">
210
209
    [% INCLUDE 'acquisitions-menu.inc' %]
211
    <aside>
210
  </div>
212
        <div class="col-sm-2 col-sm-pull-10">
211
</div>
213
            [% INCLUDE 'acquisitions-menu.inc' %]
214
        </div>
215
    </aside>
216
</div> <!-- /.row -->
212
217
213
[% MACRO jsinclude BLOCK %]
218
[% MACRO jsinclude BLOCK %]
214
    [% Asset.js("js/acquisitions-menu.js") %]
219
    [% Asset.js("js/acquisitions-menu.js") %]
215
    [% INCLUDE 'calendar.inc' %]
220
    [% INCLUDE 'calendar.inc' %]
216
    [% INCLUDE 'datatables.inc' %]
221
    [% INCLUDE 'datatables.inc' %]
217
    <script type="text/javascript">
222
    <script>
218
        function updateColumnsVisibility(visible) {
223
        function updateColumnsVisibility(visible) {
219
            if ( visible ) {
224
            if ( visible ) {
220
                $("table .tax_excluded, .tax_included").show();
225
                $("table .tax_excluded, .tax_included").show();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-11 / +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; Invoices</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; Invoices</div>
17
17
18
<div id="doc3" class="yui-t2">
18
<div class="main container-fluid">
19
    <div class="row">
20
        <div class="col-sm-10 col-sm-push-2">
21
            <main>
19
22
20
<div id="bd">
21
  <div id="yui-main">
22
    <div class="yui-b">
23
      <h1>Invoices</h1>
23
      <h1>Invoices</h1>
24
      [% IF ( do_search ) %]
24
      [% IF ( do_search ) %]
25
        [% IF invoices %]
25
        [% IF invoices %]
Lines 201-211 Link Here
201
      [% ELSE %]
201
      [% ELSE %]
202
        <p>Use the search form on the left to find invoices.</p>
202
        <p>Use the search form on the left to find invoices.</p>
203
      [% END %]<!-- do_search -->
203
      [% END %]<!-- do_search -->
204
    </div>
204
    </main>
205
  </div>
205
</div> <!-- /.col-sm-10.col-sm-push-2 -->
206
  <div class="yui-b">
206
207
<div class="col-sm-2 col-sm-pull-10">
208
<aside>
207
    <form action="" method="get">
209
    <form action="" method="get">
208
      <fieldset class="brief">
210
      <fieldset class="sidebar brief">
209
        <h3>Search filters</h3>
211
        <h3>Search filters</h3>
210
        <ol>
212
        <ol>
211
          <li>
213
          <li>
Lines 291-304 Link Here
291
      <input type="hidden" name="op" id="op" value="do_search" />
293
      <input type="hidden" name="op" id="op" value="do_search" />
292
    </form>
294
    </form>
293
    [% INCLUDE 'acquisitions-menu.inc' %]
295
    [% INCLUDE 'acquisitions-menu.inc' %]
294
  </div>
296
  </aside>
295
</div>
297
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
298
</div> <!-- /.row -->
296
299
297
[% MACRO jsinclude BLOCK %]
300
[% MACRO jsinclude BLOCK %]
298
    [% Asset.js("js/acquisitions-menu.js") %]
301
    [% Asset.js("js/acquisitions-menu.js") %]
299
    [% INCLUDE 'datatables.inc' %]
302
    [% INCLUDE 'datatables.inc' %]
300
    [% INCLUDE 'calendar.inc' %]
303
    [% INCLUDE 'calendar.inc' %]
301
    <script type="text/javascript">
304
    <script>
302
        $(document).ready(function() {
305
        $(document).ready(function() {
303
            $(".delete_invoice").click(function(){
306
            $(".delete_invoice").click(function(){
304
                return confirmDelete(_("Are you sure you want to delete this invoice?"));
307
                return confirmDelete(_("Are you sure you want to delete this invoice?"));
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-13 / +14 lines)
Lines 15-26 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="lateorders.pl">Late orders</a></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="lateorders.pl">Late orders</a></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">
22
23
	
24
<h1>[% IF ( Supplier ) %][% Supplier %] : [% END %]Late orders</h1>
23
<h1>[% IF ( Supplier ) %][% Supplier %] : [% END %]Late orders</h1>
25
<div id="acqui_lateorders">
24
<div id="acqui_lateorders">
26
25
Lines 154-163 Link Here
154
</form>
153
</form>
155
[% ELSE %]<p>There are no late orders.</p>
154
[% ELSE %]<p>There are no late orders.</p>
156
[% END %]
155
[% END %]
157
</div>
156
</div> <!-- /#acqui_lateorders -->
158
</div>
157
</main>
159
</div>
158
</div> <!-- /.col-sm-10.col-sm-push-2 -->
160
<div class="yui-b">
159
160
<div class="col-sm-2 col-sm-pull-10">
161
    <aside>
161
<form action="lateorders.pl" method="get">
162
<form action="lateorders.pl" method="get">
162
<fieldset class="brief">
163
<fieldset class="brief">
163
<h4>Filter results:</h4>
164
<h4>Filter results:</h4>
Lines 188-194 Link Here
188
</fieldset>
189
</fieldset>
189
    </form>
190
    </form>
190
[% INCLUDE 'acquisitions-menu.inc' %]
191
[% INCLUDE 'acquisitions-menu.inc' %]
191
</div>
192
</aside>
193
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
192
</div>
194
</div>
193
195
194
[% MACRO jsinclude BLOCK %]
196
[% MACRO jsinclude BLOCK %]
Lines 197-203 Link Here
197
    [% INCLUDE 'columns_settings.inc' %]
199
    [% INCLUDE 'columns_settings.inc' %]
198
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
200
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
199
    [% INCLUDE 'calendar.inc' %]
201
    [% INCLUDE 'calendar.inc' %]
200
    <script type="text/javascript">
202
    <script>
201
        var late_orderst;
203
        var late_orderst;
202
        function check_uncheck() {
204
        function check_uncheck() {
203
            var all_nodes = $(late_orderst.fnGetNodes());
205
            var all_nodes = $(late_orderst.fnGetNodes());
204
- 

Return to bug 20668