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 978-983 No patron matched <span class="ex">[% message | html %]</span> Link Here
978
    </div>
978
    </div>
979
</div>
979
</div>
980
980
981
[% INCLUDE 'hold-group-modal.inc' %]
982
981
[% MACRO jsinclude BLOCK %]
983
[% MACRO jsinclude BLOCK %]
982
    [% INCLUDE 'strings.inc' %]
984
    [% INCLUDE 'strings.inc' %]
983
    [% INCLUDE 'calendar.inc' %]
985
    [% INCLUDE 'calendar.inc' %]
Lines 991-996 No patron matched <span class="ex">[% message | html %]</span> Link Here
991
    [% Asset.js("js/checkouts.js") | $raw %]
993
    [% Asset.js("js/checkouts.js") | $raw %]
992
    [% Asset.js("js/holds.js") | $raw %]
994
    [% Asset.js("js/holds.js") | $raw %]
993
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
995
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
996
    [% Asset.js("js/hold-group.js" | $raw %]
994
    <script type="text/javascript">
997
    <script type="text/javascript">
995
        /* Set some variable needed in circulation.js */
998
        /* Set some variable needed in circulation.js */
996
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
999
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
Lines 1107-1111 No patron matched <span class="ex">[% message | html %]</span> Link Here
1107
    [% Asset.js("js/members-menu.js") | $raw %]
1110
    [% Asset.js("js/members-menu.js") | $raw %]
1108
[% END %]
1111
[% END %]
1109
1112
1110
[% INCLUDE 'reserve-group-modal.inc' %]
1111
[% INCLUDE 'intranet-bottom.inc' %]
1113
[% 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 818-823 Link Here
818
            </div>
818
            </div>
819
        </div> [% # /div#bd %]
819
        </div> [% # /div#bd %]
820
820
821
[% INCLUDE 'hold-group-modal.inc' %]
822
821
[% MACRO jsinclude BLOCK %]
823
[% MACRO jsinclude BLOCK %]
822
    [% INCLUDE 'datatables.inc' %]
824
    [% INCLUDE 'datatables.inc' %]
823
    [% INCLUDE 'columns_settings.inc' %]
825
    [% INCLUDE 'columns_settings.inc' %]
Lines 833-838 Link Here
833
    [% INCLUDE 'str/members-menu.inc' %]
835
    [% INCLUDE 'str/members-menu.inc' %]
834
    [% Asset.js("js/members-menu.js") | $raw %]
836
    [% Asset.js("js/members-menu.js") | $raw %]
835
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
837
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
838
    [% Asset.js("js/hold-group.js") %]
836
    <script>
839
    <script>
837
        /* Set some variable needed in circulation.js */
840
        /* Set some variable needed in circulation.js */
838
        var interface = "[% interface | html %]";
841
        var interface = "[% interface | html %]";
Lines 944-948 Link Here
944
    </script>
947
    </script>
945
[% END %]
948
[% END %]
946
949
947
[% INCLUDE 'hold-group-modal.inc' %]
948
[% INCLUDE 'intranet-bottom.inc' %]
950
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-2 / +3 lines)
Lines 661-671 Link Here
661
</div>
661
</div>
662
</div>
662
</div>
663
663
664
[% INCLUDE 'hold-group-modal.inc' %]
665
664
[% MACRO jsinclude BLOCK %]
666
[% MACRO jsinclude BLOCK %]
665
    [% INCLUDE 'datatables.inc' %]
667
    [% INCLUDE 'datatables.inc' %]
666
    [% INCLUDE 'calendar.inc' %]
668
    [% INCLUDE 'calendar.inc' %]
667
    [% INCLUDE 'columns_settings.inc' %]
669
    [% INCLUDE 'columns_settings.inc' %]
668
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
670
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
671
    [% Asset.js("js/hold-group.js") | $raw %]
669
    <script>
672
    <script>
670
        var biblionumber = "[% biblionumber | $raw %]";
673
        var biblionumber = "[% biblionumber | $raw %]";
671
        var borrowernumber = "[% patron.borrowernumber | $raw %]";
674
        var borrowernumber = "[% patron.borrowernumber | $raw %]";
Lines 889-894 Link Here
889
    </script>
892
    </script>
890
[% END %]
893
[% END %]
891
894
892
[% INCLUDE 'hold-group-modal.inc' %]
893
894
[% INCLUDE 'intranet-bottom.inc' %]
895
[% 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