@@ -, +, @@
Administration->Budgets
Cataloging
Circulation->Check in
Administration->Cities and towns
Acquisitions->{Vendor}->Contracts
Administration->Currencies
Administration->Circulation desks (requires UseCirculationDesks preference)
Home
Tools->Notices and slips
Patrons
Adminstration
Serials
Acquisitions->Suggestions
Administration->Z39.50/SRU servers
---
.../prog/en/includes/budgets-admin-search.inc | 64 ++++++++++------------
.../intranet-tmpl/prog/en/includes/cat-search.inc | 15 +----
.../prog/en/includes/cataloging-search.inc | 14 +----
.../prog/en/includes/catalogue-search-box.inc | 13 +++++
.../prog/en/includes/checkin-search.inc | 15 +----
.../intranet-tmpl/prog/en/includes/circ-search.inc | 15 +----
.../prog/en/includes/cities-admin-search.inc | 14 +----
.../prog/en/includes/contracts-admin-search.inc | 15 +----
.../prog/en/includes/currencies-admin-search.inc | 14 +----
.../prog/en/includes/desks-admin-search.inc | 14 +----
.../intranet-tmpl/prog/en/includes/home-search.inc | 11 +---
.../prog/en/includes/letters-search.inc | 14 +----
.../prog/en/includes/patron-search.inc | 14 +----
.../prog/en/includes/prefs-admin-search.inc | 15 +----
.../prog/en/includes/serials-search.inc | 15 +----
.../prog/en/includes/suggestions-add-search.inc | 15 +----
.../prog/en/includes/z3950-admin-search.inc | 15 +----
17 files changed, 58 insertions(+), 234 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
@@ -3,43 +3,39 @@
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -23,20 +23,7 @@
[% END %]
-[% IF ( CAN_user_catalogue ) %]
-
-
-
-[% END %]
+[% INCLUDE 'catalogue-search-box.inc' %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]- Check out
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -29,19 +29,7 @@
[% END %]
-
-
-
-
+ [% INCLUDE 'catalogue-search-box.inc' %]
- Cataloging search
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc
@@ -0,0 +1,13 @@
+[% IF ( CAN_user_catalogue ) %]
+
+
+
+[% END %]
+
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -14,20 +14,7 @@
[% END %]
-[% IF ( CAN_user_catalogue ) %]
-
-
-
-[% END %]
+[% INCLUDE 'catalogue-search-box.inc' %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]- Check out
[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]- Renew
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -4,6 +4,7 @@
[% INCLUDE 'patron-search-box.inc' %]
+ [% INCLUDE 'catalogue-search-box.inc' %]
- [% IF ( CAN_user_catalogue ) %]
-
-
-
[% END %]
- Search cities
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]- Check out
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
@@ -12,20 +12,7 @@
[% INCLUDE 'patron-search-box.inc' %]
-
- [% IF ( CAN_user_catalogue ) %]
-
-
-
[% END %]
+ [% INCLUDE 'catalogue-search-box.inc' %]
- Search contracts
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -10,19 +10,7 @@
[% INCLUDE 'patron-search-box.inc' %]
- [% IF ( CAN_user_catalogue ) %]
-
-
-
[% END %]
+ [% INCLUDE 'catalogue-search-box.inc' %]
- Search currencies
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]- Check out
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
@@ -11,20 +11,8 @@
[% INCLUDE 'patron-search-box.inc' %]
+ [% INCLUDE 'catalogue-search-box.inc' %]
- [% IF ( CAN_user_catalogue ) %]
-
-
-
[% END %]
- Search desks
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]- Check out
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
@@ -30,16 +30,7 @@
[% END %]
-[% IF ( CAN_user_catalogue ) %]
-
-
-
-
[% END %]
-
+[% INCLUDE 'catalogue-search-box.inc' %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]- Check out
[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]- Check in
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -10,19 +10,7 @@
[% INCLUDE 'patron-search-box.inc' %]
- [% IF ( CAN_user_catalogue ) %]
-
-
-
[% END %]
+ [% INCLUDE 'catalogue-search-box.inc' %]
- Search notices
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]- Check out
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -97,19 +97,7 @@
[% END %]
- [% IF ( CAN_user_catalogue ) %]
-
-
-
[% END %]
+ [% INCLUDE 'catalogue-search-box.inc' %]
- Search patrons
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
@@ -12,20 +12,7 @@
[% INCLUDE 'patron-search-box.inc' %]
- [% IF ( CAN_user_catalogue ) %]
-
-
-
- [% END %]
+ [% INCLUDE 'catalogue-search-box.inc' %]
- Search system preferences
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]- Check out
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -19,20 +19,7 @@
[% INCLUDE 'patron-search-box.inc' %]
- [% IF ( CAN_user_catalogue ) %]
-
-
-
- [% END %]
+ [% INCLUDE 'catalogue-search-box.inc' %]
- Search subscriptions
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]- Check out
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -14,21 +14,8 @@
[% INCLUDE 'patron-search-box.inc' %]
+ [% INCLUDE 'catalogue-search-box.inc' %]
- [% IF ( CAN_user_catalogue ) %]
-
-
-
- [% END %]
- Search suggestions
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]- Check out
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -11,21 +11,8 @@
[% INCLUDE 'patron-search-box.inc' %]
+ [% INCLUDE 'catalogue-search-box.inc' %]
- [% IF ( CAN_user_catalogue ) %]
-
-
-
- [% END %]