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

(-)a/debian/templates/koha-conf-site.xml.in (-1 / +6 lines)
Lines 297-303 __END_SRU_PUBLICSERVER__ Link Here
297
 <api_secret_passphrase>__API_SECRET__</api_secret_passphrase>
297
 <api_secret_passphrase>__API_SECRET__</api_secret_passphrase>
298
298
299
 <!-- Accessible directory from the staff client, uncomment the following line and define a valid path to let the intranet user access it-->
299
 <!-- Accessible directory from the staff client, uncomment the following line and define a valid path to let the intranet user access it-->
300
 <!-- <access_dir></access_dir> -->
300
 <!--
301
 <access_dirs>
302
     <access_dir></access_dir>
303
     <access_dir></access_dir>
304
 </access_dirs>
305
 -->
301
306
302
 <!-- true type font mapping according to type from $font_types in C4/Creators/Lib.pm -->
307
 <!-- true type font mapping according to type from $font_types in C4/Creators/Lib.pm -->
303
 <ttf>
308
 <ttf>
(-)a/etc/koha-conf.xml (-1 / +6 lines)
Lines 128-134 __PAZPAR2_TOGGLE_XML_POST__ Link Here
128
 <api_secret_passphrase>CHANGEME</api_secret_passphrase>
128
 <api_secret_passphrase>CHANGEME</api_secret_passphrase>
129
129
130
 <!-- Accessible directory from the staff client, uncomment the following line and define a valid path to let the intranet user access it-->
130
 <!-- Accessible directory from the staff client, uncomment the following line and define a valid path to let the intranet user access it-->
131
 <!-- <access_dir></access_dir> -->
131
 <!--
132
 <access_dirs>
133
     <access_dir></access_dir>
134
     <access_dir></access_dir>
135
 </access_dirs>
136
 -->
132
137
133
 <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm -->
138
 <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm -->
134
 <ttf>
139
 <ttf>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt (-1 lines)
Lines 63-69 Link Here
63
63
64
    </div>
64
    </div>
65
65
66
<<<<<<< 3dd4c261c3d9d152edb12ead6b10b71b44418eab
67
    <div class="col-xs-6"><h2>Top lists</h2>
66
    <div class="col-xs-6"><h2>Top lists</h2>
68
        <ul>
67
        <ul>
69
            <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li>
68
            <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt (-2 / +3 lines)
Lines 1-8 Link Here
1
[% USE Asset %]
1
[% SET footerjs = 1 %]
2
[% SET footerjs = 1 %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Report/log files</title>
4
<title>Report/log files</title>
4
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
5
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" />
6
[% Asset.css("css/datatables.css") %]
6
</head>
7
</head>
7
<body>
8
<body>
8
[% INCLUDE 'header.inc' %]
9
[% INCLUDE 'header.inc' %]
Lines 52-58 Link Here
52
</div>
53
</div>
53
54
54
[% MACRO jsinclude BLOCK %]
55
[% MACRO jsinclude BLOCK %]
55
    <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script>
56
    [% Asset.js("js/tools-menu.js") %]
56
    [% INCLUDE 'datatables.inc' %]
57
    [% INCLUDE 'datatables.inc' %]
57
    <script type="text/javascript">
58
    <script type="text/javascript">
58
    //<![CDATA[
59
    //<![CDATA[
(-)a/tools/access_files.pl (-3 / +13 lines)
Lines 34-41 use Encode; Link Here
34
34
35
my $input = new CGI;
35
my $input = new CGI;
36
my $file_id = $input->param("id");
36
my $file_id = $input->param("id");
37
my $access_dir = C4::Context->config('access_dir');
37
my $access_dirs = C4::Context->config('access_dirs');
38
my @directories = $access_dir ? (ref $access_dir ? @{$access_dir} : ($access_dir)) : ();
38
39
my @directories;
40
41
if ($access_dirs){
42
    if (ref $access_dirs->{access_dir} ){
43
        @directories = @{$access_dirs->{access_dir}};
44
    } else {
45
        @directories =($access_dirs->{access_dir});
46
    }
47
} else {
48
    @directories = ();
49
}
39
50
40
my ($template, $borrowernumber, $cookie)
51
my ($template, $borrowernumber, $cookie)
41
    = get_template_and_user({template_name => "tools/access_files.tt",
52
    = get_template_and_user({template_name => "tools/access_files.tt",
42
- 

Return to bug 11317