From c8ea5ca91597cf8b43ffbbaf6edb63c1053adead Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 14 Apr 2015 15:43:44 +0200 Subject: [PATCH] Bug 10285: Remove links from the error pages The error page (400, 401, 402, 403, 404, 405 and 500) displays parts the old staff client main page. The user can easily browses using navigation links. Test plan: Go on the 400.pl, 401.pl, 402.pl, 403.pl, 404.pl, 405.pl and 500.pl pages, and confirm all is fine and you don't get the old style blocks. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer http://bugs.koha-community.org/show_bug.cgi?id=10258 Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/errors/400.tt | 75 ------------------- .../prog/en/modules/errors/401.tt | 74 ------------------ .../prog/en/modules/errors/402.tt | 74 ------------------ .../prog/en/modules/errors/403.tt | 74 ------------------ .../prog/en/modules/errors/404.tt | 74 ------------------ .../prog/en/modules/errors/405.tt | 74 ------------------ .../prog/en/modules/errors/500.tt | 73 ------------------ 7 files changed, 518 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt index be2f09f464..350f629dea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt @@ -23,82 +23,7 @@ -
-
- [% IF ( CAN_user_circulate ) %] -

Circulation

- - [% END %] - [% IF ( CAN_user_borrowers ) %] -

Patrons

-
    -
  • - - - -
    -
  • -
- [% END %] - [% IF ( CAN_user_catalogue ) %] -

Catalog

-
    -
  • -
    - - - -
    -
  • -
  • Lists
  • -
- [% END %] -
- - -
- - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -

Cataloging

- -

Acquisitions

- [% END %][% IF ( CAN_user_reports ) %] -

Reports

- [% END %] - [% IF ( CAN_user_parameters ) %] -

Koha administration

- - [% END %] - [% IF ( CAN_user_tools ) %] -

Tools

- [% END %] -

About Koha

-
- - -
- - [% INCLUDE 'intranet-bottom.inc' %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tt index 6eb14239f4..aa421d731b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tt @@ -23,81 +23,7 @@ -
-
- [% IF ( CAN_user_circulate ) %] -

Circulation

- - [% END %] - [% IF ( CAN_user_borrowers ) %] -

Patrons

-
    -
  • - - - -
    -
  • -
- [% END %] - [% IF ( CAN_user_catalogue ) %] -

Catalog

-
    -
  • -
    - - - -
    -
  • -
  • Lists
  • -
- [% END %] -
- - -
- - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -

Cataloging

- -

Acquisitions

- [% END %][% IF ( CAN_user_reports ) %] -

Reports

- [% END %] - [% IF ( CAN_user_parameters ) %] -

Koha administration

- - [% END %] - [% IF ( CAN_user_tools ) %] -

Tools

- [% END %] -

About Koha

-
- - -
- [% INCLUDE 'intranet-bottom.inc' %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tt index fa035dda16..865649984a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tt @@ -23,81 +23,7 @@ -
-
- [% IF ( CAN_user_circulate ) %] -

Circulation

- - [% END %] - [% IF ( CAN_user_borrowers ) %] -

Patrons

-
    -
  • - - - -
    -
  • -
- [% END %] - [% IF ( CAN_user_catalogue ) %] -

Catalog

-
    -
  • -
    - - - -
    -
  • -
  • Lists
  • -
- [% END %] -
- - -
- - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -

Cataloging

- -

Acquisitions

- [% END %][% IF ( CAN_user_reports ) %] -

Reports

- [% END %] - [% IF ( CAN_user_parameters ) %] -

Koha administration

- - [% END %] - [% IF ( CAN_user_tools ) %] -

Tools

- [% END %] -

About Koha

-
- - -
- [% INCLUDE 'intranet-bottom.inc' %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tt index 82b8f8224c..66dc92dc3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tt @@ -23,81 +23,7 @@ -
-
- [% IF ( CAN_user_circulate ) %] -

Circulation

- - [% END %] - [% IF ( CAN_user_borrowers ) %] -

Patrons

-
    -
  • - - - -
    -
  • -
- [% END %] - [% IF ( CAN_user_catalogue ) %] -

Catalog

-
    -
  • -
    - - - -
    -
  • -
  • Lists
  • -
- [% END %] -
- - -
- - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -

Cataloging

- -

Acquisitions

- [% END %][% IF ( CAN_user_reports ) %] -

Reports

- [% END %] - [% IF ( CAN_user_parameters ) %] -

Koha administration

- - [% END %] - [% IF ( CAN_user_tools ) %] -

Tools

- [% END %] -

About Koha

-
- - -
- [% INCLUDE 'intranet-bottom.inc' %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tt index 7d4485da04..d461462a6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tt @@ -23,81 +23,7 @@ -
-
- [% IF ( CAN_user_circulate ) %] -

Circulation

- - [% END %] - [% IF ( CAN_user_borrowers ) %] -

Patrons

-
    -
  • - - - -
    -
  • -
- [% END %] - [% IF ( CAN_user_catalogue ) %] -

Catalog

-
    -
  • -
    - - - -
    -
  • -
  • Lists
  • -
- [% END %] -
- - -
- - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -

Cataloging

- -

Acquisitions

- [% END %][% IF ( CAN_user_reports ) %] -

Reports

- [% END %] - [% IF ( CAN_user_parameters ) %] -

Koha administration

- - [% END %] - [% IF ( CAN_user_tools ) %] -

Tools

- [% END %] -

About Koha

-
- - -
- [% INCLUDE 'intranet-bottom.inc' %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tt index 4e479c8037..f4948d05d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tt @@ -23,81 +23,7 @@ -
-
- [% IF ( CAN_user_circulate ) %] -

Circulation

- - [% END %] - [% IF ( CAN_user_borrowers ) %] -

Patrons

-
    -
  • - - - -
    -
  • -
- [% END %] - [% IF ( CAN_user_catalogue ) %] -

Catalog

-
    -
  • -
    - - - -
    -
  • -
  • Lists
  • -
- [% END %] -
- - -
- - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -

Cataloging

- -

Acquisitions

- [% END %][% IF ( CAN_user_reports ) %] -

Reports

- [% END %] - [% IF ( CAN_user_parameters ) %] -

Koha administration

- - [% END %] - [% IF ( CAN_user_tools ) %] -

Tools

- [% END %] -

About Koha

-
- - -
- [% INCLUDE 'intranet-bottom.inc' %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tt index 3de3563ddf..bab01b6bb6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tt @@ -23,79 +23,6 @@ -
-
- [% IF ( CAN_user_circulate ) %] -

Circulation

- - [% END %] - [% IF ( CAN_user_borrowers ) %] -

Patrons

-
    -
  • - - - -
    -
  • -
- [% END %] - [% IF ( CAN_user_catalogue ) %] -

Catalog

-
    -
  • -
    - - - -
    -
  • -
  • Lists
  • -
- [% END %] -
- - -
- - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -

Cataloging

- -

Acquisitions

- [% END %][% IF ( CAN_user_reports ) %] -

Reports

- [% END %] - [% IF ( CAN_user_parameters ) %] -

Koha administration

- - [% END %] - [% IF ( CAN_user_tools ) %] -

Tools

- [% END %] -

About Koha

-
- - -
- -- 2.39.5