From 22fcbec4931a5a6d71cbd25937002b0786e91afc Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 7 Jun 2017 23:47:47 +0000 Subject: [PATCH] [SIGNED-OFF] Bug 3137: [FOLLOW-UP] Remove checkboxes, add collapsing sections This patch removes the checkboxes from my previous patch and adds collapsing/uncollapsing sections. Follow the above test plan until step 6. The fields selected in HideFieldsAddPatronForm will still be hidden, but can now be shown and collapsed again (as well as all other sections) much more easily and without scrolling. Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard --- .../prog/en/includes/.members-menu.inc.swp | Bin 0 -> 12288 bytes .../en/includes/member-alt-address-style-us.inc | 9 +- .../en/includes/member-alt-contact-style-us.inc | 9 +- .../en/includes/member-main-address-style-us.inc | 9 +- .../prog/en/modules/members/memberentrygen.tt | 218 ++++++++++----------- 5 files changed, 127 insertions(+), 118 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/.members-menu.inc.swp diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/.members-menu.inc.swp b/koha-tmpl/intranet-tmpl/prog/en/includes/.members-menu.inc.swp new file mode 100644 index 0000000000000000000000000000000000000000..1c8e6212696306510bf60500b9bb7289f664faff GIT binary patch literal 12288 zcmeI2zi$&U6vthJfC8lm7LXWBsE#^xd}&$e zQkam~7#I-DAei|R7})p|_y-tS5YKm)q@`)OAq>E?^m?(+_x!$}XZsS>wb?sMWqL6) zPoNwpWa8WWy-(x&$>~#sbXY?%Pn$b?mQ~qg4)4_D`kvj$MT8Z z;`Yui*n$L*01`j~NB{{S0VIF~kib7nK(|N82B_N?D?AflM}E1+RlFbpB!C2v01`j~ zNB{{S0VIF~kN^@u0)HU^<`DAz03lBfLh$ha|L*Vquj7P#0s9O#4YqNNkh@^-#|U{1 zwhs33C?Rjbo`QWiLdYAiABPF4fX#qyj=~uNuoBqILxem7TLF6qW4!`<0rnisjJ*kl z1qmPlB!C2vz<)(xWs(*v1v>eFWGzQ@@`Tc?6}aX~Y5%6FnF1|KCEApM&ucR9oQ~jY z@Nm`@)OMNg=TgkpqQg^p^X&EIVstaCg~MbSZ7N>Rr7XK4W@^F<&*62?*jatgnYMem zCY6$FTzP>xftLf9+greSDu1;XOx9xgtmTSc@DS=XIPaIa2_tgFJ)5Ve``ydZ30yvX z&WMk-#VAb8lt`^3e7nh1gAZG5&v9a{g>EQ=q%K~mR3R^_+J)rPsVNFAy{CSsG~MG{ ztqYg?)UX*^ZbO%erIt(pgJc#xR&)76JT<~@TXaFn)0Fy}Y2j;O`(e(8Dx>c^v6kgt zIDJ8*(d0@~pL^Pq5bLmc$4(PRS&4$^hZrw`fr}zdUD+5OTrH*RTgD%_H4!_qDs*mc zinZF8TH!+VbLC=rp?GUKY%|-8^m64Jg{9K{utnA$a$E1RNx)hcbz#G-ke-Qrhsbc= z^j1)tDc0f|PW^^Ufb2~|apnlGp|~wov?C66!u8!JPUWIdcHl;8o3Ie1dNf#Z_vmvx zM%*`v=(_OuA6Q+mcQM - Alternate address
    + Alternate address + [% IF fields_to_hide.search('alt_address') %] +
    1. Click to show
    +
      + [% ELSE %] +
      1. Click to collapse
      +
        + [% END %] [% UNLESS noB_streetnumber %]
      1. [% IF ( mandatoryB_streetnumber ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc index 25fd731..e9e8d60 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc @@ -1,5 +1,12 @@
        - Alternate contact
          + Alternate contact + [% IF fields_to_hide.search('alt_contact') %] +
          1. Click to show
          +
            + [% ELSE %] +
            1. Click to collapse
            +
              + [% END %] [% UNLESS noaltcontactsurname %]
            1. [% IF ( mandatoryaltcontactsurname ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc index b7115c6..78d7a08 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc @@ -1,5 +1,12 @@
              - Main address
                + Main address + [% IF fields_to_hide.search('primary_address') %] +
                1. Click to show
                +
                  + [% ELSE %] +
                  1. Click to collapse
                  +
                    + [% END %] [% UNLESS nostreetnumber %]
                  1. [% IF ( mandatorystreetnumber ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index be84dc4..3186bd0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -9,16 +9,17 @@