bug 5019 remove link to funds

This patch renames the link to budgets to say 'budgets & funds'
and removes the links to funds (which went no where).

This patch also adds the acq menu to the budget pages.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
index a385139..07e24de 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -5,8 +5,7 @@
     </li>
        <li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Manage suggestions</a></li>
     <!-- TMPL_IF name="CAN_user_acquisition_budget_manage" -->
-       <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
-       <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
+       <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets & Funds</a></li>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF name="CAN_user_parameters" -->
      <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
index 204574b..78c51b8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
@@ -297,5 +297,9 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
+</div>
 </div>
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
index ce4d7da..9e8cf85 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
@@ -428,6 +428,9 @@
     </fieldset>
 </form><!-- /TMPL_IF -->
 
+</div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
index 627b3f7..170c7a0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
@@ -295,5 +295,8 @@ No funds to display for this search criteria
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
+</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->