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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc (-26 / +15 lines)
Lines 1-27 Link Here
1
<div id="hold-group-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="hold-group-modal-label" aria-hidden="true">
1
<div id="hold-group-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="hold-group-modal-label" aria-hidden="true">
2
    <div class="modal-header">
2
    <div class="modal-dialog" role="document">
3
        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
3
        <div class="modal-content">
4
        <h3 id="hold-group-modal-label">Reserve group</h3>
4
            <div class="modal-header">
5
    </div>
5
                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
6
    <div class="modal-body">
6
                <h3 id="hold-group-modal-label">Reserve group</h3>
7
        <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div>
7
            </div>
8
    </div>
8
            <div class="modal-body">
9
    <div class="modal-footer">
9
                <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div>
10
        <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
10
            </div>
11
    </div>
11
            <div class="modal-footer">
12
</div>
12
                <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
13
13
            </div>
14
<script>
14
        </div><!-- /.modal-content -->
15
  $(document).ready(function() {
15
    </div><!-- /.modal-dialog -->
16
    $('body').on('click', 'a.hold-group', function() {
16
</div><!-- /.modal -->
17
      var href = $(this).attr('href');
18
      $('#hold-group-modal .modal-body').load(href + " #main");
19
      $('#hold-group-modal').modal('show');
20
      return false;
21
    })
22
23
    $('#hold-group-modal').on('hidden', function(){
24
        $('#hold-group-modal .modal-body').html('<div id="loading"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> ' + _("Loading") + '</div>');
25
    });
26
  });
27
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +3 lines)
Lines 1001-1006 Link Here
1001
    </div> <!-- /.modal-dialog -->
1001
    </div> <!-- /.modal-dialog -->
1002
</div> <!-- /#barcodeSubmittedModal -->
1002
</div> <!-- /#barcodeSubmittedModal -->
1003
1003
1004
[% INCLUDE 'hold-group-modal.inc' %]
1005
1004
[% MACRO jsinclude BLOCK %]
1006
[% MACRO jsinclude BLOCK %]
1005
    [% INCLUDE 'strings.inc' %]
1007
    [% INCLUDE 'strings.inc' %]
1006
    [% INCLUDE 'calendar.inc' %]
1008
    [% INCLUDE 'calendar.inc' %]
Lines 1014-1019 Link Here
1014
    [% Asset.js("js/checkouts.js") | $raw %]
1016
    [% Asset.js("js/checkouts.js") | $raw %]
1015
    [% Asset.js("js/holds.js") | $raw %]
1017
    [% Asset.js("js/holds.js") | $raw %]
1016
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
1018
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
1019
    [% Asset.js("js/hold-group.js" | $raw %]
1017
    <script type="text/javascript">
1020
    <script type="text/javascript">
1018
        /* Set some variable needed in circulation.js */
1021
        /* Set some variable needed in circulation.js */
1019
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
1022
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
Lines 1131-1135 Link Here
1131
    [% Asset.js("js/members-menu.js") | $raw %]
1134
    [% Asset.js("js/members-menu.js") | $raw %]
1132
[% END %]
1135
[% END %]
1133
1136
1134
[% INCLUDE 'reserve-group-modal.inc' %]
1135
[% INCLUDE 'intranet-bottom.inc' %]
1137
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-2 / +3 lines)
Lines 242-251 Link Here
242
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
242
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
243
     </div> <!-- /.row -->
243
     </div> <!-- /.row -->
244
244
245
[% INCLUDE 'hold-group-modal.inc' %]
246
245
[% MACRO jsinclude BLOCK %]
247
[% MACRO jsinclude BLOCK %]
246
    [% INCLUDE 'calendar.inc' %]
248
    [% INCLUDE 'calendar.inc' %]
247
    [% INCLUDE 'datatables.inc' %]
249
    [% INCLUDE 'datatables.inc' %]
248
    [% INCLUDE 'columns_settings.inc' %]
250
    [% INCLUDE 'columns_settings.inc' %]
251
    [% Asset.js("js/hold-group.js") | $raw %]
249
    <script>
252
    <script>
250
        $(document).ready(function() {
253
        $(document).ready(function() {
251
          var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
254
          var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
Lines 306-311 Link Here
306
    </script>
309
    </script>
307
[% END %]
310
[% END %]
308
311
309
[%# TODO: this module needs to be separated to html and js part to be included correctly %]
310
[% INCLUDE 'hold-group-modal.inc' %]
311
[% INCLUDE 'intranet-bottom.inc' %]
312
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +3 lines)
Lines 830-835 Link Here
830
            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
830
            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
831
        </div> <!-- /.row -->
831
        </div> <!-- /.row -->
832
832
833
[% INCLUDE 'hold-group-modal.inc' %]
834
833
[% MACRO jsinclude BLOCK %]
835
[% MACRO jsinclude BLOCK %]
834
    [% INCLUDE 'datatables.inc' %]
836
    [% INCLUDE 'datatables.inc' %]
835
    [% INCLUDE 'columns_settings.inc' %]
837
    [% INCLUDE 'columns_settings.inc' %]
Lines 845-850 Link Here
845
    [% INCLUDE 'str/members-menu.inc' %]
847
    [% INCLUDE 'str/members-menu.inc' %]
846
    [% Asset.js("js/members-menu.js") | $raw %]
848
    [% Asset.js("js/members-menu.js") | $raw %]
847
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
849
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
850
    [% Asset.js("js/hold-group.js") %]
848
    <script>
851
    <script>
849
        /* Set some variable needed in circulation.js */
852
        /* Set some variable needed in circulation.js */
850
        var interface = "[% interface | html %]";
853
        var interface = "[% interface | html %]";
Lines 957-961 Link Here
957
    </script>
960
    </script>
958
[% END %]
961
[% END %]
959
962
960
[% INCLUDE 'hold-group-modal.inc' %]
961
[% INCLUDE 'intranet-bottom.inc' %]
963
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-2 / +3 lines)
Lines 688-698 Link Here
688
    </div> <!-- /.row -->
688
    </div> <!-- /.row -->
689
689
690
690
691
[% INCLUDE 'hold-group-modal.inc' %]
692
691
[% MACRO jsinclude BLOCK %]
693
[% MACRO jsinclude BLOCK %]
692
    [% INCLUDE 'datatables.inc' %]
694
    [% INCLUDE 'datatables.inc' %]
693
    [% INCLUDE 'calendar.inc' %]
695
    [% INCLUDE 'calendar.inc' %]
694
    [% INCLUDE 'columns_settings.inc' %]
696
    [% INCLUDE 'columns_settings.inc' %]
695
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
697
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
698
    [% Asset.js("js/hold-group.js") | $raw %]
696
    <script>
699
    <script>
697
        var biblionumber = "[% biblionumber | $raw %]";
700
        var biblionumber = "[% biblionumber | $raw %]";
698
        var borrowernumber = "[% patron.borrowernumber | $raw %]";
701
        var borrowernumber = "[% patron.borrowernumber | $raw %]";
Lines 918-923 Link Here
918
    </script>
921
    </script>
919
[% END %]
922
[% END %]
920
923
921
[% INCLUDE 'hold-group-modal.inc' %]
922
923
[% INCLUDE 'intranet-bottom.inc' %]
924
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/hold-group.js (-1 / +12 lines)
Line 0 Link Here
0
- 
1
$(document).ready(function() {
2
    $('body').on('click', 'a.hold-group', function() {
3
        var href = $(this).attr('href');
4
        $('#hold-group-modal .modal-body').load(href + " #main");
5
        $('#hold-group-modal').modal('show');
6
        return false;
7
    });
8
9
    $('#hold-group-modal').on('hidden', function(){
10
        $('#hold-group-modal .modal-body').html('<div id="loading"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> ' + _("Loading") + '</div>');
11
    });
12
});

Return to bug 15516