@@ -, +, @@ --- .../prog/en/modules/virtualshelves/shelves.tt | 17 ++++++++--------- .../bootstrap/en/modules/opac-shelves.tt | 10 ++++++---- 2 files changed, 14 insertions(+), 13 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -37,28 +37,27 @@ [% END %] - [% IF shelf.allow_change_from_others %] - + [% IF shelf.allow_change_from_permitted_staff %] + [% ELSE %] - + [% END %] - [% IF shelf.allow_change_from_staff %] [% ELSE %] [% END %] - [% IF shelf.allow_change_from_permitted_staff %] - + [% IF shelf.allow_change_from_others %] + [% ELSE %] - + [% END %] -   -   +   +   [% END %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -48,15 +48,17 @@ [% END %] - [% IF shelf.allow_change_from_others %][% ELSE %][% END %] + [% IF permitteduser == 1 %][% IF shelf.allow_change_from_permitted_staff %][% ELSE %][% END %][% END %] [% IF staffuser == 1 %][% IF shelf.allow_change_from_staff %][% ELSE %][% END %][% END %] - [% IF permitteduser == 1 %][% IF shelf.allow_change_from_permitted_staff %][% ELSE %][% END %][% END %] + + [% IF shelf.allow_change_from_others %][% ELSE %][% END %] + -   +   -   +   [% END %] --