From fe004917a6c74ff58b1e1557624a9a599f2ed5ea Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Fri, 3 Feb 2017 10:19:57 +1300 Subject: [PATCH] Bug 17855 - Follow up on copyright text, removal of summary info, removal of duplicate js and improved js indentation, removed useless use pragmas Tets plan: Same as outlined in previous comments: Go to and go through the web installer and onboarding tool: https://koha-community.org/manual/installation/html/ Signed-off-by: Mark Tompsett --- installer/onboarding.pl | 10 +- .../intranet-tmpl/prog/en/includes/header.inc | 2 - .../prog/en/modules/onboarding/onboardingstep2.tt | 240 +-------------------- .../prog/en/modules/onboarding/onboardingstep3.tt | 50 ++--- koha-tmpl/intranet-tmpl/prog/en/modules/summary.tt | 41 ---- summary.pl | 43 ---- 6 files changed, 25 insertions(+), 361 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/summary.tt delete mode 100755 summary.pl diff --git a/installer/onboarding.pl b/installer/onboarding.pl index 6773f8f..aea7395 100755 --- a/installer/onboarding.pl +++ b/installer/onboarding.pl @@ -2,7 +2,7 @@ # This file is part of Koha. # -# Copyright (C) YEAR YOURNAME-OR-YOUREMPLOYER +# Copyright (C) 2017 Catalyst IT # # Koha is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,11 +27,6 @@ use Encode qw( encode ); use C4::Koha; use C4::Output; use C4::Members; -use C4::Members::Attributes; -use C4::Members::AttributeTypes; -use C4::Log; -use Koha::AuthorisedValues; -use Koha::Patron::Debarments; use Koha::Patrons; use Koha::Items; use Koha::Libraries; @@ -39,12 +34,9 @@ use Koha::Database; use Koha::DateUtils; use Koha::Patron::Categories; use Koha::Patron::Category; -use Koha::Patron::HouseboundRole; -use Koha::Patron::HouseboundRoles; use Koha::ItemTypes; use Koha::IssuingRule; use Koha::IssuingRules; -use Data::Dumper; #Setting variables my $input = new CGI; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 7c5c2c0..2c88c6c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -42,8 +42,6 @@
  • Administration
  • [% END %]
  • About Koha
  • -
  • Summary
  • - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt index 86b68f2..f0e90aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt @@ -1,4 +1,3 @@ - [% USE Koha %] [% USE KohaDates %] [% USE Price %] @@ -6,181 +5,12 @@ Add a patron category [% INCLUDE 'installer-doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] - - - - +[% INCLUDE 'js_includes.inc' %] +[% INCLUDE 'datatables.inc' %] - - + [% IF (categories && categories.count > 1 ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt index a484835..de2e595 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt @@ -7,39 +7,30 @@ [% INCLUDE 'installer-doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] +[% INCLUDE 'js_includes.inc' %] Create Koha administrator patron - - - - - - @@ -184,7 +174,7 @@ $(document).ready(function(){

      OPAC/Staff Login

    1. - + Required diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/summary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/summary.tt deleted file mode 100644 index f7fe9a4..0000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/summary.tt +++ /dev/null @@ -1,41 +0,0 @@ -[% USE Koha %] -[% INCLUDE 'doc-head-open.inc' %] -Koha Tutorial Summary -[% INCLUDE 'doc-head-close.inc' %] - - -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] - - - -
      -
      -
      -

      Tutorial Summary Page

      -
      -

      Library

      -

      To add another library and for more settings, go to
      - More -> Administration -> Libraries and groups

      OR
      - -

      Patron Category

      -

      To add another patron category and for more settings, go to
      - More -> Administration -> Patron Categories

      OR
      - -

      Patron

      -

      To create another patron, go to Patrons -> New Patron. To set the
      - permissions of the patron, go to the patron's page and More -> Set Permissions

      - -

      Item Type

      -

      To create another item type and for more settings, go to
      - More -> Administration -> Item types

      OR
      - -

      Circulation Rule

      -

      To create another circulation rule, go to
      - More -> Administration -> Circulation and Fine Rules

      -
      - -
      -
      -
      -[% INCLUDE 'intranet-bottom.inc' %] diff --git a/summary.pl b/summary.pl deleted file mode 100755 index f1d41b4..0000000 --- a/summary.pl +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/perl - -# Copyright Pat Eyler 2003 -# Copyright Biblibre 2006 -# Parts Copyright Liblime 2008 -# Parts Copyright Chris Nighswonger 2010 -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Koha is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Koha; if not, see . - -use Modern::Perl; -use CGI qw ( -utf8 ); -use C4::Auth; -use C4::Output; -use C4::Context; -use C4::Koha; - -my $query = new CGI; -my ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { - template_name => "summary.tt", - query => $query, - type => "intranet", - authnotrequired => 0, - flagsrequired => { catalogue => 1 }, - debug => 1, - } -); - - -output_html_with_http_headers $query, $cookie, $template->output; -- 2.1.4