Attachment 12306 Details for Bug 7483 – proposed patch

[patch] proposed patch

0001-Bug-7483-fixes-on-breadcrumbs-in-Authority-administr.patch (text/plain), 6.38 KB, created by Adrien SAURAT on 2012-09-18 12:53:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrien SAURAT

Created: 2012-09-18 12:53:24 UTC

Size: 6.38 KB

patch

obsolete

>From 2d2d1230c7651e4ade295945e80df4081036f0a0 Mon Sep 17 00:00:00 2001
>From: Adrien Saurat <adrien.saurat@biblibre.com>
>Date: Tue, 18 Sep 2012 14:51:28 +0200
>Subject: [PATCH] Bug 7483: fixes on breadcrumbs in Authority administration
>
>Better breadcrumbs for the following pages:
>- auth_tag_structure.pl
>- auth_subfields_structure.pl
>---
> .../en/modules/admin/auth_subfields_structure.tt   |    8 +++-
> .../prog/en/modules/admin/auth_tag_structure.tt    |   50 ++++++++++++++------
> 2 files changed, 41 insertions(+), 17 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>index a99e203..a902b7e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>@@ -26,8 +26,12 @@ function displayMoreConstraint(numlayer){
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'cat-search.inc' %]
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
>-  [% IF ( else ) %]Authority MARC subfield structure
>-  [% ELSE %]<a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield %]&amp;tagsubfield=[% tagsubfield %]&amp;authtypecode=[% authtypecode %]">Authority MARC subfield structure</a> &rsaquo;
>+  <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a> &rsaquo;
>+  [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a> &rsaquo;
>+  [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a> &rsaquo;
>+  [% END %]
>+  [% IF ( else ) %]Authority MARC subfield structure for [% tagfield %]
>+  [% ELSE %]<a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield %]&amp;tagsubfield=[% tagsubfield %]&amp;authtypecode=[% authtypecode %]">Authority MARC subfield structure for [% tagfield %]</a> &rsaquo;
>   [% END %]
>   [% IF ( delete_confirm ) %]Confirm deletion of subfield [% tagsubfield %]?[% END %]
>   [% IF ( delete_confirmed ) %]Data deleted[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>index c26f5b0..854ffdf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>@@ -69,21 +69,41 @@ return false;
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'cat-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %][% IF ( use_heading_flags_p ) %]
>-    [% IF ( heading_modify_tag_p ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo; [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>[% END %] &rsaquo; Modify tag[% END %]
>-    [% IF ( heading_add_tag_p ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo; [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a>[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>[% END %] &rsaquo; New tag[% END %]
>-    [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo; [% action %]
>-    [% END %]
>-    [% ELSE %]
>-    [% IF ( delete_confirm ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo;
>-    [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a>
>-    [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>[% END %] &rsaquo; Confirm deletion
>-    [% ELSE %]
>-    [% IF ( delete_confirmed ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo; Data deleted
>-    [% ELSE %]Authority MARC framework: [% IF ( authtypecode ) %][% authtypecode %] framework
>-    [% ELSE %]Default framework[% END %]
>-    [% END %]
>-    [% END %]
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
>+	<a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a> &rsaquo;
>+	[% IF ( add_form ) %]
>+		[% IF ( use_heading_flags_p ) %]
>+			[% IF ( heading_modify_tag_p ) %]
>+				[% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>
>+				[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>+				[% END %] &rsaquo; Modify tag
>+			[% END %]
>+			[% IF ( heading_add_tag_p ) %]
>+				[% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a>
>+				[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>+				[% END %] &rsaquo; New tag
>+			[% END %]
>+		[% ELSE %]
>+			[% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>
>+			[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>+			[% END %] &rsaquo; [% action %]
>+		[% END %]
>+	[% ELSE %]
>+		[% IF ( delete_confirm ) %]
>+			[% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a>
>+			[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>+			[% END %] &rsaquo; Confirm deletion
>+		[% ELSE %]
>+			[% IF ( delete_confirmed ) %]
>+				[% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a>
>+				[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>+				[% END %] &rsaquo; Data deleted
>+			[% ELSE %]
>+				[% IF ( authtypecode ) %][% authtypecode %] Framework</a>
>+				[% ELSE %]Default framework
>+				[% END %]
>+			[% END %]
>+		[% END %]
>     [% END %]
> </div>
> 
>-- 
>1.7.9.5
>

Actions: View | Diff | Splinter Review

Attachments on bug 7483: 12306 | 12589