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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (-12 / +18 lines)
Lines 8-14 Link Here
8
<title>Koha &rsaquo; Tools &rsaquo; Notices[% IF ( add_form or copy_form ) %][% IF ( modify ) %] &rsaquo; Modify notice[% ELSE %] &rsaquo; Add notice[% END %][% END %][% IF ( add_validate or copy_validate) %] &rsaquo; Notice added[% END %][% IF ( delete_confirm ) %] &rsaquo; Confirm deletion[% END %]</title>
8
<title>Koha &rsaquo; Tools &rsaquo; Notices[% IF ( add_form or copy_form ) %][% IF ( modify ) %] &rsaquo; Modify notice[% ELSE %] &rsaquo; Add notice[% END %][% END %][% IF ( add_validate or copy_validate) %] &rsaquo; Notice added[% END %][% IF ( delete_confirm ) %] &rsaquo; Confirm deletion[% END %]</title>
9
[% INCLUDE 'doc-head-close.inc' %]
9
[% INCLUDE 'doc-head-close.inc' %]
10
[% Asset.css("css/datatables.css") | $raw %]
10
[% Asset.css("css/datatables.css") | $raw %]
11
<style type="text/css">#preview_template .modal-dialog { width : 80%; } .spinner { display: none; } @media (max-width: 767px) { #preview_template { margin: 0; width : auto; } }</style>
11
<style>#preview_template .modal-dialog { width : 80%; } .spinner { display: none; } @media (max-width: 767px) { #preview_template { margin: 0; width : auto; } }</style>
12
</head>
12
</head>
13
13
14
<body id="tools_letter" class="tools">
14
<body id="tools_letter" class="tools">
Lines 40-49 Link Here
40
        <div class="row">
40
        <div class="row">
41
            <div class="col-md-8 col-md-offset-2">
41
            <div class="col-md-8 col-md-offset-2">
42
[% ELSE %]
42
[% ELSE %]
43
    <div id="doc3" class="yui-t2">
43
    <div class="main container-fluid">
44
        <div id="bd">
44
        <div class="row">
45
            <div id="yui-main">
45
            <div class="col-sm-10 col-sm-push-2">
46
                <div class="yui-b">
46
                <main>
47
[% END %]
47
[% END %]
48
48
49
[% IF ( no_op_set ) %]
49
[% IF ( no_op_set ) %]
Lines 449-462 Link Here
449
	</form>
449
	</form>
450
[% END %]
450
[% END %]
451
451
452
</div>
452
[% IF add_form or copy_form %]
453
</div>
453
        </div> <!-- /.col-md-8 -->
454
[% UNLESS add_form or copy_form %]
454
    </div> <!-- /.row -->
455
    <div class="yui-b noprint">
455
[% ELSE %]
456
        [% INCLUDE 'tools-menu.inc' %]
456
            </main>
457
    </div>
457
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
458
459
        <div class="col-sm-2 col-sm-pull-10">
460
            <aside>
461
                [% INCLUDE 'tools-menu.inc' %]
462
            </aside>
463
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
464
    </div> <!-- /.row -->
458
[% END %]
465
[% END %]
459
</div>
460
466
461
[% MACRO jsinclude BLOCK %]
467
[% MACRO jsinclude BLOCK %]
462
    [% Asset.js("js/tools-menu.js") | $raw %]
468
    [% Asset.js("js/tools-menu.js") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt (-8 / +8 lines)
Lines 3-9 Link Here
3
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
3
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4
    </head>
4
    </head>
5
    <body id="preview_letter" class="catalog">
5
    <body id="preview_letter" class="catalog">
6
        <div id="main">
6
        <div class="main container-fluid">
7
            [% FOR m IN messages %]
7
            [% FOR m IN messages %]
8
                [%# FIXME The message block does not appear at the top of the modal! %]
8
                [%# FIXME The message block does not appear at the top of the modal! %]
9
                <div class="dialog [% m.type | html %]">
9
                <div class="dialog [% m.type | html %]">
Lines 29-36 Link Here
29
            [% END %]
29
            [% END %]
30
30
31
            [% IF rendered_message %]
31
            [% IF rendered_message %]
32
                <div class="yui-g">
32
                <div class="row">
33
                    <div class="yui-u first">
33
                    <div class="col-xs-6">
34
                        <h3>Original version</h3>
34
                        <h3>Original version</h3>
35
                        <span style="font-family:monospace">
35
                        <span style="font-family:monospace">
36
                            [% FILTER html_line_break %]
36
                            [% FILTER html_line_break %]
Lines 38-44 Link Here
38
                            [% END %]
38
                            [% END %]
39
                        </span>
39
                        </span>
40
                    </div>
40
                    </div>
41
                    <div class="yui-u">
41
                    <div class="col-xs-6">
42
                        <h3>Original message, rendered:</h3>
42
                        <h3>Original message, rendered:</h3>
43
                        <span style="font-family:monospace">
43
                        <span style="font-family:monospace">
44
                            [% FILTER html_line_break %]
44
                            [% FILTER html_line_break %]
Lines 52-59 Link Here
52
52
53
            [% IF rendered_tt_message %]
53
            [% IF rendered_tt_message %]
54
            <hr />
54
            <hr />
55
                <div class="yui-g">
55
                <div class="row">
56
                    <div class="yui-u first">
56
                    <div class="col-xs-6">
57
                        <h3>Converted version</h3>
57
                        <h3>Converted version</h3>
58
                        <span style="font-family:monospace">
58
                        <span style="font-family:monospace">
59
                            [% FILTER html_line_break %]
59
                            [% FILTER html_line_break %]
Lines 61-67 Link Here
61
                            [% END %]
61
                            [% END %]
62
                        </span>
62
                        </span>
63
                    </div>
63
                    </div>
64
                    <div class="yui-u">
64
                    <div class="col-xs-6">
65
                        <h3>Converted message, rendered:</h3>
65
                        <h3>Converted message, rendered:</h3>
66
                        <span style="font-family:monospace">
66
                        <span style="font-family:monospace">
67
                            [% FILTER html_line_break %]
67
                            [% FILTER html_line_break %]
Lines 71-77 Link Here
71
                    </div>
71
                    </div>
72
                </div>
72
                </div>
73
            [% END %]
73
            [% END %]
74
        </div>
74
        </div> <!-- /.main -->
75
75
76
    </body>
76
    </body>
77
</html>
77
</html>
(-)a/koha-tmpl/intranet-tmpl/prog/js/letter.js (-2 / +1 lines)
Lines 162-168 $(document).ready(function() { Link Here
162
        page += '&content='+encodeURIComponent(content);
162
        page += '&content='+encodeURIComponent(content);
163
        page += '&data_preview='+encodeURIComponent(data_preview);
163
        page += '&data_preview='+encodeURIComponent(data_preview);
164
        page += '&is_html='+encodeURIComponent(is_html);
164
        page += '&is_html='+encodeURIComponent(is_html);
165
        $("#preview_template .modal-body").load(page + " #main");
165
        $("#preview_template .modal-body").load(page + " .main");
166
        $('#preview_template').modal('show');
166
        $('#preview_template').modal('show');
167
        $("#preview_template_button").attr("href", "/cgi-bin/koha/svc/letters/convert?module="+module+"&code="+code+"&mtt="+mtt+"&lang="+lang);
167
        $("#preview_template_button").attr("href", "/cgi-bin/koha/svc/letters/convert?module="+module+"&code="+code+"&mtt="+mtt+"&lang="+lang);
168
    });
168
    });
169
- 

Return to bug 21795