From c7ce6a2a1901c65df94985f4ef9ab0f8c14f0474 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 8 Apr 2011 12:16:08 +0200
Subject: [PATCH] Fix for Bug 5950 - changing frameworks doesn't change anymore

Selecting a framework from the dropdown menu has never (AFAICT)
auto-submitted the form to change the framework. This patch
reformats the form in order to make it clearer that this menu
 is part of the search function.

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b29e6e860957393e05888fb01c3dd53cc67b3e6f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
---
 .../en/modules/admin/marctagstructure.tmpl    | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
index 34153ef4b3..26529c1404 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
@@ -41,7 +41,7 @@ $(document).ready(function() {
 &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)</a>
 &rsaquo; <!-- TMPL_VAR name="action" --> <!-- TMPL_VAR NAME="searchfield" -->
 <!-- TMPL_ELSIF name="else" -->
-&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)</a>
+&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->Default MARC framework<!-- /TMPL_IF --></a>
 <!-- TMPL_ELSIF name="delete_confirm" -->
 &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)</a>
 &rsaquo; Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'
@@ -124,33 +124,30 @@ $(document).ready(function() {
 
 
 <!-- TMPL_IF NAME="else" -->
-
 <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-    <p><label for="frameworkcode">Framework</label>
+<fieldset style="padding:.5em;">
+        <label for="searchfield"><strong>Search for tag:</strong> </label>
+        <input type="text" name="searchfield" id="searchfield" size="4" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+
+<label for="frameworkcode"><strong>In framework:</strong> </label>
         <select id="frameworkcode" name="frameworkcode">
             <option value="">Default</option>
             <!-- TMPL_LOOP NAME="frameworkloop" -->
-			<!-- TMPL_IF NAME="selected" -->
+            <!-- TMPL_IF NAME="selected" -->
                 <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="frameworktext" --></option>
-				<!-- TMPL_ELSE -->
+                <!-- TMPL_ELSE -->
                 <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
-				<!-- /TMPL_IF -->
+                <!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
         </select>
-    </p>
-    <p>
-        <label for="searchfield">Search for Tag</label>
-        <input type="text" name="searchfield" id="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-        <input type="submit" value="Search" />
-    </p>
-    <p>
-        <label for="select_display">Display only used Tags/Subfields</label>
+    <input type="submit" value="Search" />
+<p>        <label for="select_display">Display only used Tags/Subfields</label>
         <!-- TMPL_IF Name="select_display"-->
             <input type="checkbox" name="select_display" id="select_display" value="True" checked="checked"  onchange="this.form.submit();" />
         <!-- TMPL_ELSE -->
             <input type="checkbox" name="select_display" id="select_display" value="True" onchange="this.form.submit();" />
-        <!--/TMPL_IF -->
-    </p>
+        <!--/TMPL_IF --></p>
+</fieldset>
 </form>
 <p>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/batchRebuildBiblioTables.pl script.</p>
 
-- 
2.39.5