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 976-981 Link Here
976
    </div> <!-- /.modal-dialog -->
976
    </div> <!-- /.modal-dialog -->
977
</div> <!-- /#barcodeSubmittedModal -->
977
</div> <!-- /#barcodeSubmittedModal -->
978
978
979
[% INCLUDE 'hold-group-modal.inc' %]
980
979
[% MACRO jsinclude BLOCK %]
981
[% MACRO jsinclude BLOCK %]
980
    [% INCLUDE 'strings.inc' %]
982
    [% INCLUDE 'strings.inc' %]
981
    [% INCLUDE 'calendar.inc' %]
983
    [% INCLUDE 'calendar.inc' %]
Lines 989-994 Link Here
989
    [% Asset.js("js/checkouts.js") | $raw %]
991
    [% Asset.js("js/checkouts.js") | $raw %]
990
    [% Asset.js("js/holds.js") | $raw %]
992
    [% Asset.js("js/holds.js") | $raw %]
991
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
993
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
994
    [% Asset.js("js/hold-group.js" | $raw %]
992
    <script type="text/javascript">
995
    <script type="text/javascript">
993
        /* Set some variable needed in circulation.js */
996
        /* Set some variable needed in circulation.js */
994
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
997
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
Lines 1106-1110 Link Here
1106
    [% Asset.js("js/members-menu.js") | $raw %]
1109
    [% Asset.js("js/members-menu.js") | $raw %]
1107
[% END %]
1110
[% END %]
1108
1111
1109
[% INCLUDE 'reserve-group-modal.inc' %]
1110
[% INCLUDE 'intranet-bottom.inc' %]
1112
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-2 / +3 lines)
Lines 243-252 Link Here
243
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
243
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
244
     </div> <!-- /.row -->
244
     </div> <!-- /.row -->
245
245
246
[% INCLUDE 'hold-group-modal.inc' %]
247
246
[% MACRO jsinclude BLOCK %]
248
[% MACRO jsinclude BLOCK %]
247
    [% INCLUDE 'calendar.inc' %]
249
    [% INCLUDE 'calendar.inc' %]
248
    [% INCLUDE 'datatables.inc' %]
250
    [% INCLUDE 'datatables.inc' %]
249
    [% INCLUDE 'columns_settings.inc' %]
251
    [% INCLUDE 'columns_settings.inc' %]
252
    [% Asset.js("js/hold-group.js") | $raw %]
250
    <script>
253
    <script>
251
        $(document).ready(function() {
254
        $(document).ready(function() {
252
          var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
255
          var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
Lines 307-312 Link Here
307
    </script>
310
    </script>
308
[% END %]
311
[% END %]
309
312
310
[%# TODO: this module needs to be separated to html and js part to be included correctly %]
311
[% INCLUDE 'hold-group-modal.inc' %]
312
[% INCLUDE 'intranet-bottom.inc' %]
313
[% 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 735-745 Link Here
735
    </div> <!-- /.row -->
735
    </div> <!-- /.row -->
736
736
737
737
738
[% INCLUDE 'hold-group-modal.inc' %]
739
738
[% MACRO jsinclude BLOCK %]
740
[% MACRO jsinclude BLOCK %]
739
    [% INCLUDE 'datatables.inc' %]
741
    [% INCLUDE 'datatables.inc' %]
740
    [% INCLUDE 'calendar.inc' %]
742
    [% INCLUDE 'calendar.inc' %]
741
    [% INCLUDE 'columns_settings.inc' %]
743
    [% INCLUDE 'columns_settings.inc' %]
742
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
744
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
745
    [% Asset.js("js/hold-group.js") | $raw %]
743
    <script>
746
    <script>
744
        var biblionumber = "[% biblionumber | $raw %]";
747
        var biblionumber = "[% biblionumber | $raw %]";
745
        var borrowernumber = "[% patron.borrowernumber | $raw %]";
748
        var borrowernumber = "[% patron.borrowernumber | $raw %]";
Lines 975-980 Link Here
975
    </script>
978
    </script>
976
[% END %]
979
[% END %]
977
980
978
[% INCLUDE 'hold-group-modal.inc' %]
979
980
[% INCLUDE 'intranet-bottom.inc' %]
981
[% 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