15617 - Be able to close "Click to edit" text boxes after opening them

To test:

1. Go to admin preferences, Acquisitions, Policy.
2. Find MarcFieldsToOrder and click "Click to Edit"
3. Notice that a "Click to collapse" button appears, click it.
4. Notice that the box has collapsed

This fix should be applicable to all "Click to Edit" textboxes

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Works well, and a nice improvement.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js b/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js
index b6537d9..54286de 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js
@@ -96,13 +96,23 @@ $( document ).ready( function () {
     } );
 
     $( '.prefs-tab .expand-textarea' ).show().click( function () {
-        $( this ).hide().nextAll( 'textarea, input[type=submit]' )
+        $( this ).hide().nextAll( 'textarea, input[type=submit], a' )
             .animate( { height: 'show', queue: false } )
             .animate( { opacity: 1 } );
 
         return false;
     } ).nextAll( 'textarea, input[type=submit]' ).hide().css( { opacity: 0 } );
 
+    $( '.prefs-tab .collapse-textarea' ).hide().click( function () {
+        $( this ).show().prevAll( 'textarea, input[type=submit]' )
+            .animate( { height: 'hide', queue: false } )
+            .animate( { opacity: 0 } );
+
+        $( this ).hide().prevAll( 'a' ).show();
+        return false;
+    });
+
+
     $("h3").attr("class","expanded").attr("title",MSG_CLICK_TO_EXPAND);
     var collapsible = $(".collapsed,.expanded");
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
index 9d4b95f..e42aca2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
@@ -60,7 +60,7 @@
 
    <div id="bd">
     <div id="yui-main">
-    <div class="yui-b">
+           <div class="yui-b">
 
     [% IF ( jump_not_found ) %]
     <h2>System preferences</h2>
@@ -141,6 +141,7 @@
                         [% ELSE %]
                         <a class="expand-textarea" style="display: none" href="#">Click to Edit</a>
                         <textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %]" rows="10" cols="40">[% CHUNK.value %]</textarea>
+                        <a class="collapse-textarea" style="display:none" href="#">Click to collapse</br></a>
                         [% END %]
                     [% ELSIF ( CHUNK.type_languages ) %]
                     <dl>