Bug 3839: update admin menus to include links to both new acq admin areas

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
index 3a97886..1f82c07 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -6,8 +6,6 @@
 <h5>Basic parameters</h5>
 <ul>
        <li><a href="/cgi-bin/koha/admin/branches.pl">Libraries, branches, groups</a></li>
-       <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Budgets, periods, planning</a></li>
-       <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li>
        <li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types and circulation codes</a></li>
 </ul>
 
@@ -33,9 +31,11 @@
     <li><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></li>
 </ul>
 
-<h5>Acquisitions</h5>
+<h5>Acquisition parameters</h5>
+
 <ul>
        <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li>
+       <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Budgets, periods, planning</a></li>
        <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Root Budgets</a></li>
 </ul>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
index 25d43b6..2a3d17d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
@@ -76,25 +76,28 @@
     <dd>Manage rules for automatically matching MARC records during record imports.</dd>
 </dl>
 
-<h3>Additional parameters</h3>
-<dl>
-       <!-- TMPL_IF NAME="NoZebra" --><dt><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></dt>
-       <dd>Words ignored during search.</dd><!-- /TMPL_IF -->
-       <!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
-       <dd>Printers (UNIX paths).</dd> -->
-       <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Client Targets</a></dt>
-       <dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
-</dl>
-
 <h3>Acquisition parameters</h3>
 <dl>
         <dt><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></dt>
         <dd>Define currencies and exchange rates used for acquisitions.</dd>
 
+        <dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">Budgets, periods, planning</a></dt>
+        <dd>Define your budgets</dd>
+        
         <dt><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Root Budgets</a></dt>
         <dd>Define your root budgets</dd>
 
 </dl>
+
+<h3>Additional parameters</h3>
+<dl>
+       <!-- TMPL_IF NAME="NoZebra" --><dt><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></dt>
+       <dd>Words ignored during search.</dd><!-- /TMPL_IF -->
+       <!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
+       <dd>Printers (UNIX paths).</dd> -->
+       <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Client Targets</a></dt>
+       <dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
+</dl>
 </div>
 
 </div>