Merge remote branch 'kc/new/enh/bug_3659' into kcmaster

diff --cc catalogue/MARCdetail.pl
Simple merge

diff --cc catalogue/moredetail.pl
Simple merge

diff --cc catalogue/search.pl
Simple merge

diff --cc koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
Simple merge

diff --cc koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
Simple merge

diff --cc koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index 98c6d07,18a7a69..c079cb9
--- 1/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
--- 2/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@@ -109,10 -118,9 +119,10 @@@ function update_child() 
              <!-- /TMPL_IF -->
          <!-- /TMPL_IF -->
        <!-- TMPL_IF name="adultborrower" --><li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">Add child</a></li><!-- /TMPL_IF -->
- <!--  <li><a id="addnote" href="/cgi-bin/koha/members/addnotes.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Add Note</a></li> -->
        <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Change Password</a></li>
 -      <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page">Print Page</a></li>
 +      <li><a id="duplicate" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">Duplicate</a></li>
 +    <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page">Print Page</a></li>
        <li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip">Print Slip</a></li>
+       <li id="searchtoholdc"><a id="searchtohold" href="#">Search to hold</a></li>
        <li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew Account</a></li><!-- TMPL_IF NAME="CAN_user_permissions" --><li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Set Permissions</a></li><!-- /TMPL_IF --><li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>
  </ul></div>

diff --cc koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
Simple merge

diff --cc koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
Simple merge