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 977-982 No patron matched <span class="ex">[% message | html %]</span> Link Here
977
    </div>
977
    </div>
978
</div>
978
</div>
979
979
980
[% INCLUDE 'hold-group-modal.inc' %]
981
980
[% MACRO jsinclude BLOCK %]
982
[% MACRO jsinclude BLOCK %]
981
    [% INCLUDE 'strings.inc' %]
983
    [% INCLUDE 'strings.inc' %]
982
    [% INCLUDE 'calendar.inc' %]
984
    [% INCLUDE 'calendar.inc' %]
Lines 990-995 No patron matched <span class="ex">[% message | html %]</span> Link Here
990
    [% Asset.js("js/checkouts.js") | $raw %]
992
    [% Asset.js("js/checkouts.js") | $raw %]
991
    [% Asset.js("js/holds.js") | $raw %]
993
    [% Asset.js("js/holds.js") | $raw %]
992
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
994
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
995
    [% Asset.js("js/hold-group.js" | $raw %]
993
    <script type="text/javascript">
996
    <script type="text/javascript">
994
        /* Set some variable needed in circulation.js */
997
        /* Set some variable needed in circulation.js */
995
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
998
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
Lines 1106-1110 No patron matched <span class="ex">[% message | html %]</span> 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 206-215 Link Here
206
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
206
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
207
     </div> <!-- /.row -->
207
     </div> <!-- /.row -->
208
208
209
[% INCLUDE 'hold-group-modal.inc' %]
210
209
[% MACRO jsinclude BLOCK %]
211
[% MACRO jsinclude BLOCK %]
210
    [% INCLUDE 'calendar.inc' %]
212
    [% INCLUDE 'calendar.inc' %]
211
    [% INCLUDE 'datatables.inc' %]
213
    [% INCLUDE 'datatables.inc' %]
212
    [% INCLUDE 'columns_settings.inc' %]
214
    [% INCLUDE 'columns_settings.inc' %]
215
    [% Asset.js("js/hold-group.js") | $raw %]
213
    <script>
216
    <script>
214
        $(document).ready(function() {
217
        $(document).ready(function() {
215
          var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
218
          var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
Lines 270-275 Link Here
270
    </script>
273
    </script>
271
[% END %]
274
[% END %]
272
275
273
[%# TODO: this module needs to be separated to html and js part to be included correctly %]
274
[% INCLUDE 'hold-group-modal.inc' %]
275
[% INCLUDE 'intranet-bottom.inc' %]
276
[% 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 956-960 Link Here
956
    </script>
959
    </script>
957
[% END %]
960
[% END %]
958
961
959
[% INCLUDE 'hold-group-modal.inc' %]
960
[% INCLUDE 'intranet-bottom.inc' %]
962
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-3 / +4 lines)
Lines 537-543 Link Here
537
                    [% IF ( biblioloo.reserveloop ) %]
537
                    [% IF ( biblioloo.reserveloop ) %]
538
                        [% IF ( multi_hold ) %]
538
                        [% IF ( multi_hold ) %]
539
                            <h3>
539
                            <h3>
540
                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">
540
                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]">
541
                                    [% biblioloo.title | html %]
541
                                    [% biblioloo.title | html %]
542
                                </a>
542
                                </a>
543
                            </h3>
543
                            </h3>
Lines 660-669 Link Here
660
</div>
660
</div>
661
</div>
661
</div>
662
662
663
[% INCLUDE 'hold-group-modal.inc' %]
664
663
[% MACRO jsinclude BLOCK %]
665
[% MACRO jsinclude BLOCK %]
664
    [% INCLUDE 'datatables.inc' %]
666
    [% INCLUDE 'datatables.inc' %]
665
    [% INCLUDE 'calendar.inc' %]
667
    [% INCLUDE 'calendar.inc' %]
666
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
668
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
669
    [% Asset.js("js/hold-group.js") | $raw %]
667
    <script>
670
    <script>
668
        var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
671
        var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
669
        var patron_homebranch = "[% Branches.GetName( patron.branchcode ) |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') | html %]";
672
        var patron_homebranch = "[% Branches.GetName( patron.branchcode ) |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') | html %]";
Lines 874-879 Link Here
874
    </script>
877
    </script>
875
[% END %]
878
[% END %]
876
879
877
[% INCLUDE 'hold-group-modal.inc' %]
878
879
[% INCLUDE 'intranet-bottom.inc' %]
880
[% 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