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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc (-20 / +39 lines)
Lines 14-42 Link Here
14
    [% END %]
14
    [% END %]
15
15
16
    [% IF ( showsql || execute || editsql || save_successful ) %]
16
    [% IF ( showsql || execute || editsql || save_successful ) %]
17
        [% IF ( CAN_user_reports_create_reports ) %]
17
        [% IF ( CAN_user_reports_delete_reports && !CAN_user_reports_create_reports ) %]
18
            [% UNLESS ( editsql ) # Do not show edit button on edit page %]
19
                <div class="btn-group">
20
                    <a id="editreport" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&amp;phase=Edit%20SQL">
21
                        <i class="fa fa-pencil"></i> Edit
22
                    </a>
23
                </div>
24
            [% END %]
25
            <div class="btn-group">
26
                <a class="btn btn-default" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from existing&amp;report_id=[% id | uri %]">
27
                    <i class="fa fa-copy"></i> Duplicate
28
                </a>
29
            </div>
30
        [% END %]
31
32
        [% IF ( CAN_user_reports_delete_reports ) %]
33
            <div class="btn-group">
18
            <div class="btn-group">
34
                <a class="delete btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Delete%20Saved">
19
                <a class="delete btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Delete%20Saved">
35
                    <i class="fa fa-trash"></i> Delete
20
                    <i class="fa fa-trash"></i> Delete
36
                </a>
21
                </a>
37
            </div>
22
            </div>
23
        [% ELSE %]
24
            [% IF ( CAN_user_reports_create_reports || CAN_user_reports_delete_reports ) %]
25
                <div class="btn-group">
26
                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
27
                        aria-expanded="false">
28
                        <i class="fa fa-pencil"></i> Edit <span class="caret"></span>
29
                    </button>
30
                    <ul class="dropdown-menu">
31
                        [% IF ( CAN_user_reports_create_reports ) %]
32
                            [% UNLESS ( editsql ) # Do not show edit button on edit page %]
33
                                <li>
34
                                    <a id="editreport" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&amp;phase=Edit%20SQL">
35
                                        Edit
36
                                    </a>
37
                                </li>
38
                            [% END %]
39
                            <li>
40
                                <a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from existing&amp;report_id=[% id | uri %]">
41
                                    Duplicate
42
                                </a>
43
                            </li>
44
                        [% END %]
45
46
                        [% IF ( CAN_user_reports_delete_reports ) %]
47
                            <li>
48
                                <a class="delete" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Delete%20Saved">
49
                                    Delete
50
                                </a>
51
                            </li>
52
                        [% END %]
53
                    </ul>
54
                </div>
55
            [% END %]
38
        [% END %]
56
        [% END %]
57
    [% END %]
39
58
59
    [% IF ( showsql || execute || editsql || save_successful ) %]
40
        [% UNLESS ( errors ) # Unless there are errors saving a report %]
60
        [% UNLESS ( errors ) # Unless there are errors saving a report %]
41
            <div class="btn-group">
61
            <div class="btn-group">
42
                <a id="runreport" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&amp;phase=Run%20this%20report">
62
                <a id="runreport" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&amp;phase=Run%20this%20report">
Lines 103-112 Link Here
103
                </ul>
123
                </ul>
104
            </div>
124
            </div>
105
            <div class="btn-group">
125
            <div class="btn-group">
106
                <a class="btn btn-default toggle_sql" id="toggle_sql_hid" href="#"><i class="fa fa-eye"></i> Show SQL code</a>
126
                <button type="button" id="toggle_sql" class="btn btn-default toggle_sql" data-complete-text="<i class='fa fa-eye-slash'></i> [% t('Hide SQL code') | html %]" data-toggle="button" aria-pressed="false" autocomplete="off">
107
            </div>
127
                    <i class="fa fa-eye"></i> Show SQL code
108
            <div class="btn-group">
128
                </button>
109
                <a class="btn btn-default toggle_sql" id="toggle_sql_vis" href="#" style="display:none;"><i class="fa fa-eye-slash"></i> Hide SQL code</a>
110
            </div>
129
            </div>
111
            <div class="btn-group">
130
            <div class="btn-group">
112
                [% IF allresults.size %]
131
                [% IF allresults.size %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-5 / +9 lines)
Lines 5-10 Link Here
5
[% USE Koha %]
5
[% USE Koha %]
6
[% USE TablesSettings %]
6
[% USE TablesSettings %]
7
[% USE JSON.Escape %]
7
[% USE JSON.Escape %]
8
[% PROCESS 'i18n.inc' %]
8
[% SET footerjs = 1 %]
9
[% SET footerjs = 1 %]
9
10
10
[%- BLOCK area_name -%]
11
[%- BLOCK area_name -%]
Lines 1885-1894 Link Here
1885
                });
1886
                });
1886
            [% END %]
1887
            [% END %]
1887
1888
1888
            $(".toggle_sql").click(function(){
1889
            $("#toggle_sql").click(function(){
1889
                $("#sql_output").toggle();
1890
                var sql_output = $("#sql_output");
1890
                $("#toggle_sql_hid").toggle();
1891
                sql_output.toggle();
1891
                $("#toggle_sql_vis").toggle();
1892
                if( sql_output.is(":visible") ){
1893
                    $(this).button('complete');
1894
                } else {
1895
                    $(this).button('reset');
1896
                }
1892
                if( !showsql ){
1897
                if( !showsql ){
1893
                    showsql = CodeMirror.fromTextArea(sql, {
1898
                    showsql = CodeMirror.fromTextArea(sql, {
1894
                        lineNumbers: false,
1899
                        lineNumbers: false,
1895
- 

Return to bug 26486