From 17969e74dbb3f0d266370677007e37e98d417e2d Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Tue, 8 Aug 2017 22:50:29 +0200 Subject: [PATCH] Bug 11317 - Follow-up - Fixing merge error and cosmetic 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(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc index d7b40cf..2131f68 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc +++ b/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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt index fb30ab4..8690307 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt +++ b/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 diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt index 6aa69ed..da1884b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ b/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 %] -- 2.7.4