@@ -, +, @@ changes - Fixed conflicts on reports-home.tt from adding/removing the link before moving it to tools - Slightly reworded second line on the tools page to be a bit more verbose. - Added entry to the tools-menu.inc. --- koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc | 3 +++ .../intranet-tmpl/prog/en/modules/reports/reports-home.tt | 15 --------------- .../intranet-tmpl/prog/en/modules/tools/tools-home.tt | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc @@ -125,4 +125,7 @@ [% IF ( CAN_user_tools_upload_general_files ) %]
  • Upload any file
  • [% END %] + [% IF ( CAN_user_tools_access_files ) %] +
  • Report/log files
  • + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt @@ -60,7 +60,6 @@
  • Items with no checkouts
  • -<<<<<<< HEAD

    Other

    -======= -

    Other

    - ->>>>>>> Bug 11317 - Update the link under reports --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt @@ -116,7 +116,7 @@ [% IF CAN_user_tools_access_files %]
    Report/log files
    -
    Report/log files
    +
    Access report or log files
    [% END %] --