From 16b4aa6382a1bd1e7a6c4aea7b8610d2ce21a7b1 Mon Sep 17 00:00:00 2001
From: Galen Charlton <galen.charlton@liblime.com>
Date: Sun, 6 Jan 2008 15:44:33 -0600
Subject: [PATCH] bug 1717: (framework editor) don't display subfield $0 as
 "New"

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 admin/auth_subfields_structure.pl                      |  1 +
 admin/marc_subfields_structure.pl                      |  1 +
 .../en/modules/admin/auth_subfields_structure.tmpl     | 10 +++++-----
 .../en/modules/admin/marc_subfields_structure.tmpl     | 10 +++++-----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index ee6cb39dbb..f5002d902c 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -262,6 +262,7 @@ if ($op eq 'add_form') {
 	# add more_subfields empty lines for add if needed
 	for (my $i=1;$i<=$more_subfields;$i++) {
 		my %row_data;  # get a fresh hash for the row data
+        $row_data{'new_subfield'} = 1;
 		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
 					-id => "tab$i",
                                         -values =>
diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index 11aa24cf79..0a414e6637 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -280,6 +280,7 @@ if ( $op eq 'add_form' ) {
     # add more_subfields empty lines for add if needed
     for ( my $j = 1 ; $j <= 1 ; $j++ ) {
         my %row_data;    # get a fresh hash for the row data
+        $row_data{'new_subfield'} = 1;
         $row_data{'subfieldcode'} = '';
 
         $row_data{tab} = CGI::scrolling_list(
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
index 34e0b456ea..8778f34db8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
@@ -47,14 +47,14 @@ function displayMoreConstraint(numlayer){
         <div id="subfieldtabs" class="toptabs numbered">
             <ul>
                 <!-- TMPL_LOOP NAME="loop" -->
-                    <!-- TMPL_IF NAME="tagsubfield" -->
-                        <li><a href="/cgi-bin/koha/admin/auth_subfields_structure.pl#sub<!-- TMPL_VAR NAME="tagsubfield" -->field" title="<!-- TMPL_VAR NAME="liblibrarian" -->">
-                            <!-- TMPL_VAR NAME="tagsubfield" -->
-                    </a></li>
-                    <!-- TMPL_ELSE -->
+                    <!-- TMPL_IF NAME="new_subfield" -->
                         <!-- TMPL_IF EXPR="tagfield >=10" --><!-- display new only for > 10 fields -->
                         <li><a href="/cgi-bin/koha/admin/auth_subfields_structure.pl#sub<!-- TMPL_VAR NAME="tagsubfield" -->field" title="<!-- TMPL_VAR NAME="liblibrarian" -->">New</a></li>
                         <!-- /TMPL_IF -->
+                    <!-- TMPL_ELSE -->
+                        <li><a href="/cgi-bin/koha/admin/auth_subfields_structure.pl#sub<!-- TMPL_VAR NAME="tagsubfield" -->field" title="<!-- TMPL_VAR NAME="liblibrarian" -->">
+                            <!-- TMPL_VAR NAME="tagsubfield" -->
+                    </a></li>
                     <!-- /TMPL_IF --></li>
                 <!-- /TMPL_LOOP -->
             </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index d0d2b746ab..0016a60752 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -53,14 +53,14 @@ function displayMoreConstraint(numlayer){
     <div id="subfieldtabs" class="toptabs numbered">
    <ul>
         <!-- TMPL_LOOP NAME="loop" -->
-            <!-- TMPL_IF NAME="subfieldcode" -->
-                <li><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl#sub<!-- TMPL_VAR NAME="subfieldcode" -->field" title="<!-- TMPL_VAR NAME="liblibrarian" -->">
-                    <!-- TMPL_VAR NAME="subfieldcode" -->
-               </a></li>
-            <!-- TMPL_ELSE -->
+            <!-- TMPL_IF NAME="new_subfield" -->
                 <!-- TMPL_IF EXPR="tagfield >=10" --><!-- display new only for > 10 fields -->
                 <li><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl#sub<!-- TMPL_VAR NAME="subfieldcode" -->field" title="<!-- TMPL_VAR NAME="liblibrarian" -->">New</a></li>
                 <!-- /TMPL_IF -->
+            <!-- TMPL_ELSE -->
+                <li><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl#sub<!-- TMPL_VAR NAME="subfieldcode" -->field" title="<!-- TMPL_VAR NAME="liblibrarian" -->">
+                    <!-- TMPL_VAR NAME="subfieldcode" -->
+               </a></li>
             <!-- /TMPL_IF --></li>
         <!-- /TMPL_LOOP -->
     </ul>
-- 
2.39.5