@@ -, +, @@
Acquisitions
---
.../prog/en/includes/acquisitions-menu.inc | 7 -
.../prog/en/modules/admin/admin-home.tt | 1 +
.../prog/en/modules/admin/aqbudgetperiods.tt | 286 ++++++------
.../prog/en/modules/admin/aqbudgets.tt | 516 ++++++++++-----------
.../prog/en/modules/admin/aqcontract.tt | 86 ++--
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 114 ++---
koha-tmpl/intranet-tmpl/prog/js/acq.js | 5 +
7 files changed, 510 insertions(+), 505 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -1,10 +1,3 @@
-
@@ -633,4 +491,144 @@
+[% MACRO jsinclude BLOCK %]
+ [% INCLUDE 'calendar.inc' %]
+ [% INCLUDE 'datatables.inc' %]
+ [% IF close_form %]
+
+ [% END %]
+
+
+[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -1,268 +1,14 @@
[% USE AuthorisedValues %]
[% USE Branches %]
[% USE Price %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Administration › Funds[% IF op == 'add_form' %] › [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %]
+
+
[% INCLUDE 'doc-head-close.inc' %]
-
-
-
-[% IF op == 'add_form' %]
-
-[% ELSIF op == 'list' %]
-
- [% INCLUDE 'datatables.inc' %]
-
-
-
-
-[% END %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'budgets-admin-search.inc' %]
@@ -693,4 +439,258 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
[% INCLUDE 'acquisitions-menu.inc' %]
+[% MACRO jsinclude BLOCK %]
+
+
+
+
+ [% IF op == 'add_form' %]
+
+ [% ELSIF op == 'list' %]
+ [% INCLUDE 'datatables.inc' %]
+
+
+
+ [% END %]
+[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -1,4 +1,5 @@
[% USE KohaDates %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › Contracts ›
[% IF ( add_form ) %]
@@ -10,48 +11,8 @@
[% IF ( delete_confirm ) %]Confirm deletion of contract '[% contractnumber %]'[% END %]
[% IF ( delete_confirmed ) %]Contract deleted[% END %]
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'contracts-admin-search.inc' %]
@@ -213,4 +174,47 @@ function Check(ff) {
[% INCLUDE 'vendor-menu.inc' %]
+[% MACRO jsinclude BLOCK %]
+ [% INCLUDE 'calendar.inc' %]
+
+
+[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
@@ -1,64 +1,11 @@
[% USE Price %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Administration › Budgets › Funds › Planning for [% budget_period_description %] by [% authcat %]
[% INCLUDE 'doc-head-close.inc' %]
-
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'budgets-admin-search.inc' %]
@@ -321,4 +268,61 @@
[% INCLUDE 'acquisitions-menu.inc' %]
+[% MACRO jsinclude BLOCK %]
+
+
+
+[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/js/acq.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/acq.js
@@ -374,3 +374,8 @@ function hideAllColumns(){
$("#plan td:nth-child(2),#plan th:nth-child(2)").nextUntil("th:nth-child("+(allCols-1)+"),td:nth-child("+(allCols-1)+")").hide(); // hide all but the last two columns
$("#hideall").prop("checked", true).parent().addClass("selected");
}
+
+$(document).ready(function() {
+ var path = location.pathname.substring(1);
+ $('#navmenulist a[href$="/' + path + '"]').css('font-weight','bold');
+});
--