From 0088c5da53a56f44ec435f88a56b67ae99616a4d Mon Sep 17 00:00:00 2001
From: Christopher Hall <chris.hall@catalyst.net.nz>
Date: Mon, 29 Nov 2010 09:59:30 +1300
Subject: [PATCH] Bug 5462: fixed current preferences tab highlighting bug
 created by dashfix

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
---
 admin/systempreferences.pl                                | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc   | 8 ++++----
 .../{enhanced-content.pref => enhanced_content.pref}      | 0
 .../admin/preferences/{i18n-l10n.pref => i18n_l10n.pref}  | 0
 .../admin/preferences/{local-use.pref => local_use.pref}  | 0
 .../preferences/{staff-client.pref => staff_client.pref}  | 6 +++---
 .../preferences/{web-services.pref => web_services.pref}  | 0
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/{enhanced-content.pref => enhanced_content.pref} (100%)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/{i18n-l10n.pref => i18n_l10n.pref} (100%)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/{local-use.pref => local_use.pref} (100%)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/{staff-client.pref => staff_client.pref} (98%)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/{web-services.pref => web_services.pref} (100%)

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 2ed39139f0..b33c7ece4c 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -787,7 +787,7 @@ if ( $op eq 'add_form' ) {
         $row_data->{delete} = "$script_name?op=delete_confirm&amp;searchfield=" . $results->[$i]{'variable'};
         push( @loop_data, $row_data );
     }
-    $tab = ( $tab ? $tab : "local-use" );
+    $tab = ( $tab ? $tab : "local_use" );
     $template->param( loop => \@loop_data, $tab => 1 );
     if ( $offset > 0 ) {
         my $prevpage = $offset - $pagesize;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
index 6def13246f..4e0d0b080f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
@@ -6,15 +6,15 @@
 <!-- TMPL_IF NAME="cataloguing" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Cataloging" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloguing">Cataloging</a></li>
 <!-- TMPL_IF NAME="circulation" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Circulation" href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">Circulation</a></li>
 <!-- TMPL_IF NAME="creators" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Creators" href="/cgi-bin/koha/admin/preferences.pl?tab=creators">Creators</a></li>
-<!-- TMPL_IF NAME="enhanced_content" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced Content Settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced-content">Enhanced Content</a></li>
-<!-- TMPL_IF NAME="i18n_l10n" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n-l10n">I18N/L10N</a></li>
+<!-- TMPL_IF NAME="enhanced_content" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced Content Settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced_content">Enhanced Content</a></li>
+<!-- TMPL_IF NAME="i18n_l10n" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n">I18N/L10N</a></li>
 <!-- TMPL_IF NAME="local_use" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li>
 <!-- TMPL_IF NAME="logs" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li>
 <!-- TMPL_IF NAME="opac" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li>
 <!-- TMPL_IF NAME="patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">Patrons</a></li>
 <!-- TMPL_IF NAME="searching" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Searching" href="/cgi-bin/koha/admin/preferences.pl?tab=searching">Searching</a></li>
 <!-- TMPL_IF NAME="serials" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Serials" href="/cgi-bin/koha/admin/preferences.pl?tab=serials">Serials</a></li>
-<!-- TMPL_IF NAME="staff_client" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff-client">Staff Client</a></li>
-<!-- TMPL_IF NAME="web_services" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Web Services" href="/cgi-bin/koha/admin/preferences.pl?tab=web-services">Web Services</a></li>
+<!-- TMPL_IF NAME="staff_client" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff_client">Staff Client</a></li>
+<!-- TMPL_IF NAME="web_services" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Web Services" href="/cgi-bin/koha/admin/preferences.pl?tab=web_services">Web Services</a></li>
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref
rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref
rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/local-use.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/local_use.pref
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/local-use.pref
rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/local_use.pref
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
similarity index 98%
rename from koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref
rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
index ab546f1bed..0d7fedcf7f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
@@ -45,18 +45,18 @@ Staff Client:
             - pref: intranetuserjs
               type: textarea
               class: code
-        -   
+        -
             - Show biblio records on result page in the staff client
             - pref: XSLTResultsDisplay
               choices:
                   yes: using XSLT stylesheets.
                   no: normally.
-        -   
+        -
             - Show item details pages in the staff client
             - pref: XSLTDetailsDisplay
               choices:
                   yes: using XSLT stylesheets.
-                  no: normally.              
+                  no: normally.
         -
             - Use the Yahoo UI libraries
             - pref: yuipath
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web-services.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web-services.pref
rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref
-- 
2.20.1