@@ -, +, @@ - Acquisitions -> Vendor -> Contracts - Administration -> Budgets -> Budget details -> Planning - Administration -> Circulation desks - Administration -> OAI sets configuration -> Define mappings - Administration -> System preferences -> Search for 'OverDriveAuthName' -> OverDrive library authnames table - Administration -> SMS cellular providers - Confirm that the "Edit" buttons work correctly to show and hide the right content. --- .../prog/en/modules/admin/aqcontract.tt | 52 ++-- .../prog/en/modules/admin/aqplan.tt | 228 +++++++++--------- .../prog/en/modules/admin/desks.tt | 48 ++-- .../prog/en/modules/admin/oai_set_mappings.tt | 179 +++++++------- .../prog/en/modules/admin/overdrive.tt | 57 ++--- .../prog/en/modules/admin/sms_providers.tt | 54 ++--- .../intranet-tmpl/prog/js/sms_providers.js | 6 +- 7 files changed, 316 insertions(+), 308 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -109,7 +109,8 @@
Contract has not been deleted. Maybe a basket linked to this contract exists.
[% END %] - [% IF ( add_form ) %] + [% IF ( add_form ) %] +
@@ -150,6 +151,7 @@ Cancel
+
[% END %] [% IF ( add_validate ) %]

Data recorded

@@ -191,29 +193,31 @@ [% IF ( else ) %]

Contract(s) of [% booksellername | html %]

[% IF ( loop ) %] - - - - - - - - - [% FOREACH loo IN loop %] - - - - - - - - [% END %] -
NameDescriptionStart dateEnd dateActions
- [% loo.contractname | html %] - [% loo.contractdescription | html %][% loo.contractstartdate | html %][% loo.contractenddate | html %] - Edit - Delete -
+
+ + + + + + + + + [% FOREACH loo IN loop %] + + + + + + + + [% END %] +
NameDescriptionStart dateEnd dateActions
+ [% loo.contractname | html %] + [% loo.contractdescription | html %][% loo.contractstartdate | html %][% loo.contractenddate | html %] + Edit + Delete +
+
[% ELSE %]
There are no contracts with this vendor. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -48,131 +48,129 @@ - [% IF ( budget_lines ) %] +
- [% INCLUDE 'budgets-active-currency.inc' %] - [% IF ( show_actual ) %] -

Each cell contain both actual and estimated values.

- [% ELSE %] -

Cells contain estimated values only.

- [% END %] - -

- Show/hide columns: - [% FOREACH authvals_ro IN authvals_row %] - - [% END %] -

- - - - - + [% IF ( budget_lines ) %] - [% FOREACH authvals_ro IN authvals_row %] - [% IF ( authvals_ro.display ) %] - - [% END %] - - - - - - - - [% FOREACH budget_line IN budget_lines %] - - [% IF ( budget_line.budget_lock ) %] - - - - [% FOREACH line IN budget_line.lines %] - [% IF ( line.display ) %] - - [% END %] - - - - - [% END %] - -
Fund nameFund total - [% ELSE %] - Fund remainingActions
- [% ELSE %] - - [% END %] - [% budget_line.budget_name | html %][% budget_line.budget_amount | $Price %]  - - - - + [% INCLUDE 'budgets-active-currency.inc' %] + [% IF ( show_actual ) %] +

Each cell contain both actual and estimated values.

[% ELSE %] -
- - - [% IF show_actual %] - [% IF ( budget_line.act_negative ) %] - - [% END %] - - [% IF ( budget_line.est_negative ) %] - - +
- [% ELSIF ( budget_line.act_positive ) %] - - [% ELSE %] - - [% END %] - [% budget_line.budget_act_remain | html %] - - [% ELSIF ( budget_line.est_positive ) %] - - [% ELSE %] - - [% END %] - [% budget_line.budget_est_remain | $Price %]  -
-
- [% UNLESS ( budget_line.budget_lock ) %] - - - [% ELSE %] -
not owned
- [% END %] -
- - - [% IF ( budget_period_locked ) %] - - [% ELSE %] - -
- [% END %] + + [% IF ( budget_period_locked ) %] + + [% ELSE %] + +
+ [% END %] +
[% FOREACH authvals_ro IN authvals_row %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt @@ -182,29 +182,31 @@ [% END %] [% IF desks.count %] - - - - - - - - - - - [% FOREACH desk IN desks %] - - - - - - - [% END %] - -
Desk IDDeskLibraryAction
[% desk.desk_id | html %][% desk.desk_name | html %][% Branches.GetName( desk.branchcode ) | html %] - Edit - Delete -
+
+ + + + + + + + + + + [% FOREACH desk IN desks %] + + + + + + + [% END %] + +
Desk IDDeskLibraryAction
[% desk.desk_id | html %][% desk.desk_name | html %][% Branches.GetName( desk.branchcode ) | html %] + Edit + Delete +
+
[% ELSE %]
There are no desks defined. Create a new desk. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt @@ -45,94 +45,97 @@ [% UNLESS ( mappings ) %]

Warning: No mappings have been defined for this set

[% END %] -
- - - - - - - - - - - - - - [% IF ( mappings ) %] - [% FOREACH mapping IN mappings %] - - - - - - - - - - [% END %] - [% ELSE %] - - - - - - - - - - [% END %] - -
Rule operatorFieldSubfieldOperatorValue  
- - - [% IF ( loop.last ) %] - - [% END %] -
- - - -
- - -
- Cancel -
-
+ +
+
+ + + + + + + + + + + + + + [% IF ( mappings ) %] + [% FOREACH mapping IN mappings %] + + + + + + + + + + [% END %] + [% ELSE %] + + + + + + + + + + [% END %] + +
Rule operatorFieldSubfieldOperatorValue  
+ + + [% IF ( loop.last ) %] + + [% END %] +
+ + + +
+ + +
+ Cancel +
+
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt @@ -37,35 +37,36 @@

OverDrive library authnames

-
- - - - - - - - - - - [% FOREACH b IN branches %] - - - - - [% END %] - -
LibraryAuthname
- [% Branches.GetName( b.branchcode ) | html %] - - - -
-
- -
-
+
+
+ + + + + + + + + + [% FOREACH b IN branches %] + + + + + [% END %] + +
LibraryAuthname
+ [% Branches.GetName( b.branchcode ) | html %] + + + +
+
+ +
+
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt @@ -41,36 +41,36 @@

SMS cellular providers

[% IF providers.count %] - - - - - - - - - - - - - [% FOREACH p IN providers %] +
+
NameDomainPatrons 
+ - - - - + + + + - [% END %] - -
[% p.name | html %][% p.domain | html %][% p.patrons_using | html %] - - Edit - - - Delete - - NameDomainPatrons 
+ + + [% FOREACH p IN providers %] + + [% p.name | html %] + [% p.domain | html %] + [% p.patrons_using | html %] + + + Edit + + + Delete + + + + [% END %] + + +
[% ELSE %]
--- a/koha-tmpl/intranet-tmpl/prog/js/sms_providers.js +++ a/koha-tmpl/intranet-tmpl/prog/js/sms_providers.js @@ -34,7 +34,7 @@ function add_provider(){ clear_form(); $(".dialog").hide(); $("legend").text( __("Add an SMS cellular provider") ); - $("#toolbar,#submit_update,#providerst").hide(); + $("#toolbar,#submit_update,#providers").hide(); $("#sms_add_form,#submit_save").show(); $("#name").focus(); } @@ -48,7 +48,7 @@ function edit_provider( id ) { $("#name").val( $("#name_" + id).text() ); $("#domain").val( $("#domain_" + id).text() ); - $("#toolbar,#submit_save,#providerst").hide(); + $("#toolbar,#submit_save,#providers").hide(); $("#name").focus(); } @@ -58,7 +58,7 @@ function cancel_edit() { clear_form(); $(".dialog").show(); $("#sms_add_form,#submit_update").hide(); - $("#toolbar,#submit_save,#providerst").show(); + $("#toolbar,#submit_save,#providers").show(); } function delete_provider( id, users ) { --