@@ -, +, @@
---
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 20 ++--
.../prog/en/modules/acqui/basketheader.tt | 28 ++---
.../prog/en/modules/acqui/neworderempty.tt | 26 ++---
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 28 ++---
.../prog/en/modules/acqui/supplier.tt | 44 ++++----
.../prog/en/modules/acqui/uncertainprice.tt | 28 ++---
.../prog/en/modules/acqui/z3950_search.tt | 32 +++---
.../prog/en/modules/admin/additional-fields.tt | 56 +++++-----
.../prog/en/modules/admin/aqbudgetperiods.tt | 122 ++++++++++-----------
.../prog/en/modules/admin/aqcontract.tt | 96 ++++++++--------
.../en/modules/admin/auth_subfields_structure.tt | 76 ++++++-------
.../prog/en/modules/admin/auth_tag_structure.tt | 120 ++++++++++----------
.../prog/en/modules/admin/authorised_values.tt | 64 +++++------
.../prog/en/modules/admin/authtypes.tt | 56 +++++-----
.../prog/en/modules/admin/biblio_framework.tt | 50 ++++-----
.../prog/en/modules/catalogue/MARCdetail.tt | 32 +++---
.../prog/en/modules/circ/view_holdsqueue.tt | 26 ++---
17 files changed, 454 insertions(+), 450 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -46,14 +46,18 @@
- [% UNLESS ( basketno ) %]
- [% IF ( delete_confirmed ) %]
- Deleted [% ELSE %]
- New [% END %]
- [% END %]
- Basket [% basketname | html %] [% IF ( basketno ) %]
- ([% basketno | html %])
- [% END %] for [% booksellername | html %]
+ [% UNLESS ( basketno ) %]
+ [% IF ( delete_confirmed ) %]
+ Deleted
+ [% ELSE %]
+ New
+ [% END %]
+ [% END %]
+ Basket [% basketname | html %]
+ [% IF ( basketno ) %]
+ ([% basketno | html %])
+ [% END %]
+ for [% booksellername | html %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
@@ -29,21 +29,21 @@
[% booksellername | html %]
- [% IF ( add_form ) %]
- [% IF ( basketno ) %]
-
-
- Edit basket '[% basketname | html %]'
-
-
- [% ELSE %]
-
-
- Add a basket to [% booksellername | html %]
-
-
+ [% IF ( add_form ) %]
+ [% IF ( basketno ) %]
+
+
+ Edit basket '[% basketname | html %]'
+
+
+ [% ELSE %]
+
+
+ Add a basket to [% booksellername | html %]
+
+
+ [% END %]
[% END %]
- [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -30,19 +30,19 @@
Basket [% basketno | html %]
- [% IF ( ordernumber ) %]
-
-
- Modify order details (line #[% ordernumber | html %])
-
-
- [% ELSE %]
-
-
- New order
-
-
- [% END %]
+ [% IF ( ordernumber ) %]
+
+
+ Modify order details (line #[% ordernumber | html %])
+
+
+ [% ELSE %]
+
+
+ New order
+
+
+ [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -30,21 +30,21 @@
Acquisitions
- [% IF invoiceclosedate %]
-
- Receipt summary for [% name | html %]
- [% IF ( invoice ) %]
- [ [% invoice | html %] ]
+ [% IF invoiceclosedate %]
+
+ Receipt summary for [% name | html %]
+ [% IF ( invoice ) %]
+ [ [% invoice | html %] ]
+ [% END %]
+
+ [% ELSE %]
+
+ [% name | html %]
+
+
+ Receive orders from [% name | html %]
+
[% END %]
-
- [% ELSE %]
-
- [% name | html %]
-
-
- Receive orders from [% name | html %]
-
- [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -105,30 +105,30 @@
Acquisitions
- [% IF ( enter ) %]
- [% IF ( booksellerid ) %]
-
- [% name | html %]
-
-
-
- Update: [% name | html %]
-
-
+ [% IF ( enter ) %]
+ [% IF ( booksellerid ) %]
+
+ [% name | html %]
+
+
+
+ Update: [% name | html %]
+
+
+ [% ELSE %]
+
+
+ Add vendor
+
+
+ [% END %]
[% ELSE %]
-
-
- Add vendor
-
-
+
+
+ [% name | html %]
+
+
[% END %]
- [% ELSE %]
-
-
- [% name | html %]
-
-
- [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -20,21 +20,21 @@
Acquisitions
- [% IF ( booksellername ) %]
-
- [% booksellername | html %]
-
-
-
- Uncertain prices for vendor [% booksellername | html %]
-
-
+ [% IF ( booksellername ) %]
+
+ [% booksellername | html %]
+
+
+
+ Uncertain prices for vendor [% booksellername | html %]
+
+
[% ELSE %]
-
-
- Uncertain prices
-
-
+
+
+ Uncertain prices
+
+
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -30,22 +30,22 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
Basket [% basketno | html %]
- [% IF ( opsearch ) %]
-
-
- Order from external source
-
-
- [% ELSE %]
-
- Order from external source
-
-
-
- Search results
-
-
- [% END %]
+ [% IF ( opsearch ) %]
+
+
+ Order from external source
+
+
+ [% ELSE %]
+
+ Order from external source
+
+
+
+ Search results
+
+
+ [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
@@ -25,43 +25,43 @@
Administration
- [% SWITCH op %]
- [% CASE 'add_form' %]
-
- Manage additional fields
-
- [% IF field %]
+ [% SWITCH op %]
+ [% CASE 'add_form' %]
+
+ Manage additional fields
+
+ [% IF field %]
+
+
+ Modify field '[% field.name | html %]'
+
+
+ [% ELSE %]
+
+
+ Add field
+
+
+ [% END %]
+
+ [% CASE 'list' %]
+
+ Manage additional fields
+
- Modify field '[% field.name | html %]'
+ Modify fields for '[% tablename | html %]'
- [% ELSE %]
+
+ [% CASE %]
- Add field
+ Manage additional fields
- [% END %]
- [% CASE 'list' %]
-
- Manage additional fields
-
-
-
- Modify fields for '[% tablename | html %]'
-
-
-
- [% CASE %]
-
-
- Manage additional fields
-
-
-
- [% END %]
+ [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -86,84 +86,84 @@
Administration
- [% IF ( add_form ) %]
-
- Budgets
-
- [% IF ( budget_period_id ) %]
+ [% IF ( add_form ) %]
-
- Modify budget '[% budget_period_description | html %]'
-
+ Budgets
+
+ [% IF ( budget_period_id ) %]
+
+
+ Modify budget '[% budget_period_description | html %]'
+
+
+ [% ELSE %]
+
+
+ Add budget
+
+
+ [% END %]
+ [% END %]
+
+ [% IF ( delete_confirm ) %]
+
+ Budgets
+
+ [% IF ( total || funds_exist ) %]
+
+
+ Cannot delete budget '[% budget_period_description | html %]'
+
+
+ [% ELSE %]
+
+
+ Delete budget '[% budget_period_description | html %]'?
+
+
+ [% END %]
+ [% END %]
+
+ [% IF ( duplicate_form ) %]
+
+ Budgets
+
+
+
+ Duplicate budget
+
+
+ [% END %]
+
+ [% IF close_form %]
+
+ Budgets
- [% ELSE %]
- Add budget
+ Close budget [% budget_period_description | html %]
[% END %]
- [% END %]
- [% IF ( delete_confirm ) %]
-
- Budgets
-
- [% IF ( total || funds_exist ) %]
+ [% IF closed %]
+
+ Budgets
+
- Cannot delete budget '[% budget_period_description | html %]'
+ Budget [% budget_period_description | html %] closed
- [% ELSE %]
+ [% END %]
+
+ [% IF ( else ) %]
- Delete budget '[% budget_period_description | html %]'?
+ Budgets administration
[% END %]
- [% END %]
-
- [% IF ( duplicate_form ) %]
-
- Budgets
-
-
-
- Duplicate budget
-
-
- [% END %]
-
- [% IF close_form %]
-
- Budgets
-
-
-
- Close budget [% budget_period_description | html %]
-
-
- [% END %]
-
- [% IF closed %]
-
- Budgets
-
-
-
- Budget [% budget_period_description | html %] closed
-
-
- [% END %]
-
- [% IF ( else ) %]
-
-
- Budgets administration
-
-
- [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -31,65 +31,65 @@
[% booksellername | html %]
- [% IF ( add_form ) %]
-
- Contracts
-
- [% IF ( contractnumber ) %]
+ [% IF ( add_form ) %]
+
+ Contracts
+
+ [% IF ( contractnumber ) %]
+
+
+ Modify contract '[% contractname | html %]'
+
+
+ [% ELSE %]
+
+
+ New contract
+
+
+ [% END %]
+ [% END %]
+
+ [% IF ( add_validate ) %]
+
+ Contracts
+
- Modify contract '[% contractname | html %]'
+ Data recorded
- [% ELSE %]
+ [% END %]
+
+ [% IF ( delete_confirm ) %]
+
+ Contracts
+
- New contract
+ Confirm deletion of contract [% contractnumber | html %]
[% END %]
- [% END %]
-
- [% IF ( add_validate ) %]
-
- Contracts
-
-
-
- Data recorded
-
-
- [% END %]
- [% IF ( delete_confirm ) %]
-
- Contracts
-
-
-
- Confirm deletion of contract [% contractnumber | html %]
-
-
- [% END %]
-
- [% IF ( delete_confirmed ) %]
-
- Contracts
-
-
-
- Contract deleted
-
-
- [% END %]
+ [% IF ( delete_confirmed ) %]
+
+ Contracts
+
+
+
+ Contract deleted
+
+
+ [% END %]
- [% IF ( else ) %]
-
-
- Contracts
-
-
- [% END %]
+ [% IF ( else ) %]
+
+
+ Contracts
+
+
+ [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
@@ -22,53 +22,53 @@
Authority types
- [% IF ( authtypecode ) %]
-
- [% authtypecode | html %] framework
-
- [% ELSE %]
-
- Default framework
-
- [% END %]
+ [% IF ( authtypecode ) %]
+
+ [% authtypecode | html %] framework
+
+ [% ELSE %]
+
+ Default framework
+
+ [% END %]
- [% IF ( else ) %]
-
-
- Authority MARC subfield structure for [% tagfield | html %]
-
-
- [% ELSE %]
-
- Authority MARC subfield structure for [% tagfield | html %]
-
- [% END %]
+ [% IF ( else ) %]
+
+
+ Authority MARC subfield structure for [% tagfield | html %]
+
+
+ [% ELSE %]
+
+ Authority MARC subfield structure for [% tagfield | html %]
+
+ [% END %]
- [% IF ( delete_confirm ) %]
-
-
- Confirm deletion of subfield [% tagsubfield | html %]?
-
-
- [% END %]
+ [% IF ( delete_confirm ) %]
+
+
+ Confirm deletion of subfield [% tagsubfield | html %]?
+
+
+ [% END %]
- [% IF ( add_form ) %]
- [% IF ( use_heading_flags_p ) %]
- [% IF ( heading_edit_subfields_p ) %]
+ [% IF ( add_form ) %]
+ [% IF ( use_heading_flags_p ) %]
+ [% IF ( heading_edit_subfields_p ) %]
+
+
+ Edit MARC subfields constraints
+
+
+ [% END %]
+ [% ELSE %]
- Edit MARC subfields constraints
+ [% action | html %]
[% END %]
- [% ELSE %]
-
-
- [% action | html %]
-
-
[% END %]
- [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
@@ -27,30 +27,47 @@
Authority types
- [% IF ( add_form ) %]
- [% IF ( use_heading_flags_p ) %]
+ [% IF ( add_form ) %]
+ [% IF ( use_heading_flags_p ) %]
- [% IF ( heading_modify_tag_p ) %]
- [% IF ( authtypecode ) %]
+ [% IF ( heading_modify_tag_p ) %]
+ [% IF ( authtypecode ) %]
+
+ [% authtypecode | html %] Framework
+
+ [% ELSE %]
+
+ Default framework
+
+ [% END %]
- [% authtypecode | html %] Framework
+
+ Modify tag
+
- [% ELSE %]
+ [% END %]
+
+ [% IF ( heading_add_tag_p ) %]
+ [% IF ( authtypecode ) %]
+
+ [% authtypecode | html %] framework
+
+ [% ELSE %]
+
+ Default framework
+
+ [% END %]
- Default framework
+
+ New tag
+
[% END %]
-
-
- Modify tag
-
-
- [% END %]
- [% IF ( heading_add_tag_p ) %]
+ [% ELSE %]
[% IF ( authtypecode ) %]
- [% authtypecode | html %] framework
+ [% authtypecode | html %] Framework
[% ELSE %]
@@ -59,46 +76,13 @@
[% END %]
- New tag
+ [% action | html %]
[% END %]
[% ELSE %]
- [% IF ( authtypecode ) %]
-
- [% authtypecode | html %] Framework
-
- [% ELSE %]
-
- Default framework
-
- [% END %]
-
-
- [% action | html %]
-
-
- [% END %]
-
- [% ELSE %]
- [% IF ( delete_confirm ) %]
- [% IF ( authtypecode ) %]
-
- [% authtypecode | html %] framework
-
- [% ELSE %]
-
- Default framework
-
- [% END %]
-
-
- Confirm deletion
-
-
- [% ELSE %]
- [% IF ( delete_confirmed ) %]
+ [% IF ( delete_confirm ) %]
[% IF ( authtypecode ) %]
[% authtypecode | html %] framework
@@ -110,27 +94,43 @@
[% END %]
- Data deleted
+ Confirm deletion
[% ELSE %]
- [% IF ( authtypecode ) %]
+ [% IF ( delete_confirmed ) %]
+ [% IF ( authtypecode ) %]
+
+ [% authtypecode | html %] framework
+
+ [% ELSE %]
+
+ Default framework
+
+ [% END %]
- [% authtypecode | html %] Framework
+ Data deleted
[% ELSE %]
-
-
- Default framework
-
-
+ [% IF ( authtypecode ) %]
+
+
+ [% authtypecode | html %] Framework
+
+
+ [% ELSE %]
+
+
+ Default framework
+
+
+ [% END %]
[% END %]
- [% END %]
+ [% END %]
[% END %]
- [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
@@ -32,49 +32,49 @@
Administration
- [% IF op == 'add_form' %]
-
- Authorized values
-
- [% IF ( action_modify ) %]
+ [% IF op == 'add_form' %]
-
- Modify authorized value
-
+ Authorized values
+
+ [% IF ( action_modify ) %]
+
+
+ Modify authorized value
+
+
+ [% END %]
+ [% IF ( action_add_value ) %]
+
+
+ New authorized value
+
+
+ [% END %]
+ [% IF ( action_add_category ) %]
+
+
+ New category
+
+
+ [% END %]
+
+ [% ELSIF ( loop ) %]
+
+ Authorized values
- [% END %]
- [% IF ( action_add_value ) %]
- New authorized value
+ Authorized values for category [% category_name | html %]
- [% END %]
- [% IF ( action_add_category ) %]
+
+ [% ELSE %]
- New category
+ Authorized values
[% END %]
-
- [% ELSIF ( loop ) %]
-
- Authorized values
-
-
-
- Authorized values for category [% category_name | html %]
-
-
-
- [% ELSE %]
-
-
- Authorized values
-
-
- [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
@@ -25,35 +25,35 @@
Administration
- [% IF op == 'add_form' %]
-
- Authority types
-
-
-
- [% IF authority_type.authtypecode.defined %]
- Modify
- [% ELSE %]
- New
- [% END %] Authority type
-
-
-
- [% ELSIF op == 'delete_confirm' %]
-
- Authority types
-
-
-
- Confirm deletion of authority type
-
-
+ [% IF op == 'add_form' %]
+
+ Authority types
+
+
+
+ [% IF authority_type.authtypecode.defined %]
+ Modify
+ [% ELSE %]
+ New
+ [% END %] Authority type
+
+
+
+ [% ELSIF op == 'delete_confirm' %]
+
+ Authority types
+
+
+
+ Confirm deletion of authority type
+
+
- [% ELSE %]
-
- Authority types
-
- [% END %]
+ [% ELSE %]
+
+ Authority types
+
+ [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
@@ -25,41 +25,41 @@
Administration
- [% IF op == 'add_form' %]
-
- MARC frameworks
-
- [% IF framework %]
+ [% IF op == 'add_form' %]
+
+ MARC frameworks
+
+ [% IF framework %]
+
+
+ Modify framework text
+
+
+ [% ELSE %]
+
+
+ Add framework
+
+
+ [% END %]
+
+ [% ELSIF op == 'delete_confirm' %]
+
+ MARC frameworks
+
- Modify framework text
+ Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?
+
[% ELSE %]
- Add framework
+ MARC frameworks
[% END %]
-
- [% ELSIF op == 'delete_confirm' %]
-
- MARC frameworks
-
-
-
- Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?
-
-
-
- [% ELSE %]
-
-
- MARC frameworks
-
-
- [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
@@ -27,22 +27,22 @@
Catalog
- [% IF ( unknownbiblionumber ) %]
-
-
- Unknown record
-
-
- [% ELSE %]
-
- [% INCLUDE 'biblio-title.inc' link = 1 %]
-
-
-
- MARC details
-
-
- [% END %]
+ [% IF ( unknownbiblionumber ) %]
+
+
+ Unknown record
+
+
+ [% ELSE %]
+
+ [% INCLUDE 'biblio-title.inc' link = 1 %]
+
+
+
+ MARC details
+
+
+ [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -28,21 +28,21 @@
[% IF ( run_report ) %]
-
- Holds queue
-
-
-
- Results
-
-
+
+ Holds queue
+
+
+
+ Results
+
+
[% ELSE %]
-
-
- Holds queue
-
-
+
+
+ Holds queue
+
+
[% END %]
--