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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc (-23 / +13 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 fade" 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
    <div class="modal-content">
4
      <div class="modal-header">
3
        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
5
        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
4
        <h3 id="hold-group-modal-label">Reserve group</h3>
6
        <h3 id="hold-group-modal-label">Reserve group</h3>
5
    </div>
7
      </div>
6
    <div class="modal-body">
8
      <div class="modal-body">
7
        <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div>
9
        <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div>
8
    </div>
10
      </div>
9
    <div class="modal-footer">
11
      <div class="modal-footer">
10
        <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
12
        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
11
    </div>
13
      </div>
12
</div>
14
    </div><!-- /.modal-content -->
15
  </div><!-- /.modal-dialog -->
16
</div><!-- /.modal -->
13
17
14
<script>
15
  $(document).ready(function() {
16
    $('body').on('click', 'a.hold-group', function() {
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 973-978 No patron matched <span class="ex">[% message | html %]</span> Link Here
973
    </div>
973
    </div>
974
</div>
974
</div>
975
975
976
[% INCLUDE 'hold-group-modal.inc' %]
977
976
[% MACRO jsinclude BLOCK %]
978
[% MACRO jsinclude BLOCK %]
977
    [% INCLUDE 'strings.inc' %]
979
    [% INCLUDE 'strings.inc' %]
978
    [% INCLUDE 'calendar.inc' %]
980
    [% INCLUDE 'calendar.inc' %]
Lines 986-991 No patron matched <span class="ex">[% message | html %]</span> Link Here
986
    [% Asset.js("js/checkouts.js") | $raw %]
988
    [% Asset.js("js/checkouts.js") | $raw %]
987
    [% Asset.js("js/holds.js") | $raw %]
989
    [% Asset.js("js/holds.js") | $raw %]
988
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
990
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
991
    [% Asset.js("js/hold-group.js") | $raw %]
989
    <script type="text/javascript">
992
    <script type="text/javascript">
990
        /* Set some variable needed in circulation.js */
993
        /* Set some variable needed in circulation.js */
991
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
994
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
Lines 1101-1105 No patron matched <span class="ex">[% message | html %]</span> Link Here
1101
    [% Asset.js("js/members-menu.js") | $raw %]
1104
    [% Asset.js("js/members-menu.js") | $raw %]
1102
[% END %]
1105
[% END %]
1103
1106
1104
[% INCLUDE 'reserve-group-modal.inc' %]
1105
[% INCLUDE 'intranet-bottom.inc' %]
1107
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-2 / +3 lines)
Lines 201-210 Link Here
201
</div>
201
</div>
202
</div>
202
</div>
203
203
204
[% INCLUDE 'hold-group-modal.inc' %]
205
204
[% MACRO jsinclude BLOCK %]
206
[% MACRO jsinclude BLOCK %]
205
    [% INCLUDE 'calendar.inc' %]
207
    [% INCLUDE 'calendar.inc' %]
206
    [% INCLUDE 'datatables.inc' %]
208
    [% INCLUDE 'datatables.inc' %]
207
    [% INCLUDE 'columns_settings.inc' %]
209
    [% INCLUDE 'columns_settings.inc' %]
210
    [% Asset.js("js/hold-group.js") | $raw %]
208
    <script type="text/javascript">
211
    <script type="text/javascript">
209
        $(document).ready(function() {
212
        $(document).ready(function() {
210
          var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
213
          var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
Lines 265-270 Link Here
265
    </script>
268
    </script>
266
[% END %]
269
[% END %]
267
270
268
[%# TODO: this module needs to be separated to html and js part to be included correctly %]
269
[% INCLUDE 'hold-group-modal.inc' %]
270
[% INCLUDE 'intranet-bottom.inc' %]
271
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +3 lines)
Lines 791-796 Link Here
791
            </div>
791
            </div>
792
        </div> [% # /div#bd %]
792
        </div> [% # /div#bd %]
793
793
794
[% INCLUDE 'hold-group-modal.inc' %]
795
794
[% MACRO jsinclude BLOCK %]
796
[% MACRO jsinclude BLOCK %]
795
    [% INCLUDE 'datatables.inc' %]
797
    [% INCLUDE 'datatables.inc' %]
796
    [% INCLUDE 'columns_settings.inc' %]
798
    [% INCLUDE 'columns_settings.inc' %]
Lines 806-811 Link Here
806
    [% INCLUDE 'str/members-menu.inc' %]
808
    [% INCLUDE 'str/members-menu.inc' %]
807
    [% Asset.js("js/members-menu.js") | $raw %]
809
    [% Asset.js("js/members-menu.js") | $raw %]
808
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
810
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
811
    [% Asset.js("js/hold-group.js") | $raw %]
809
    <script>
812
    <script>
810
        /* Set some variable needed in circulation.js */
813
        /* Set some variable needed in circulation.js */
811
        var interface = "[% interface | html %]";
814
        var interface = "[% interface | html %]";
Lines 929-933 Link Here
929
    </script>
932
    </script>
930
[% END %]
933
[% END %]
931
934
932
[% INCLUDE 'hold-group-modal.inc' %]
933
[% INCLUDE 'intranet-bottom.inc' %]
935
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-3 / +4 lines)
Lines 525-531 Link Here
525
                    [% IF ( biblioloo.reserveloop ) %]
525
                    [% IF ( biblioloo.reserveloop ) %]
526
                        [% IF ( multi_hold ) %]
526
                        [% IF ( multi_hold ) %]
527
                            <h3>
527
                            <h3>
528
                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | html %]">
528
                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | html %]">
529
                                    [% biblioloo.title | html %]
529
                                    [% biblioloo.title | html %]
530
                                </a>
530
                                </a>
531
                            </h3>
531
                            </h3>
Lines 648-657 Link Here
648
</div>
648
</div>
649
</div>
649
</div>
650
650
651
[% INCLUDE 'hold-group-modal.inc' %]
652
651
[% MACRO jsinclude BLOCK %]
653
[% MACRO jsinclude BLOCK %]
652
    [% INCLUDE 'datatables.inc' %]
654
    [% INCLUDE 'datatables.inc' %]
653
    [% INCLUDE 'calendar.inc' %]
655
    [% INCLUDE 'calendar.inc' %]
654
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
656
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
657
    [% Asset.js("js/hold-group.js") | $raw %]
655
    <script>
658
    <script>
656
        var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
659
        var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
657
        var patron_homebranch = "[% Branches.GetName( patron.branchcode ) |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') | html %]";
660
        var patron_homebranch = "[% Branches.GetName( patron.branchcode ) |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') | html %]";
Lines 865-870 Link Here
865
    </script>
868
    </script>
866
[% END %]
869
[% END %]
867
870
868
[% INCLUDE 'hold-group-modal.inc' %]
869
870
[% INCLUDE 'intranet-bottom.inc' %]
871
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/hold-group.js (-1 / +13 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
});
13

Return to bug 15516