[PATCH] Bug 3839: update admin menus to include links to both

[Nicole Engard]

new acq admin areas
Content-Type: text/plain; charset="utf-8"

---
 .../intranet-tmpl/prog/en/includes/admin-menu.inc  |   10 +++++++-
 .../prog/en/modules/admin/admin-home.tmpl          |   23 +++++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

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 c5919e6..1f82c07 100644
--- 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,6 +31,14 @@
     <li><a href="/cgi-bin/koha/admin/matching-rules.pl">Record
matching rules</a></li>
 </ul>

+<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>
+
 <h5>Additional parameters</h5>

 <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
--- 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>
-- 
1.5.6.5

--001636c928dfc86f8f0479d3ee74
Content-Type: application/octet-stream; 
	name="0007-Bug-3839-update-admin-menus-to-include-links-to-bot.patch"
Content-Disposition: attachment; 
	filename="0007-Bug-3839-update-admin-menus-to-include-links-to-bot.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g2rmtcal1

RnJvbSA2Y2FlYjZhMGUyYzljODZjMGE1MzY0Y2Y4MWFjMjk1YWY3YzcxYWMxIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGUgRW5nYXJkIDxuZW5nYXJkQGdtYWlsLmNvbT4KRGF0
ZTogV2VkLCAyIERlYyAyMDA5IDEyOjQxOjIxIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gQnVnIDM4
Mzk6IHVwZGF0ZSBhZG1pbiBtZW51cyB0byBpbmNsdWRlIGxpbmtzIHRvIGJvdGggbmV3IGFjcSBh
ZG1pbiBhcmVhcwpDb250ZW50LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9InV0Zi04IgoKLS0t
CiAuLi4vaW50cmFuZXQtdG1wbC9wcm9nL2VuL2luY2x1ZGVzL2FkbWluLW1lbnUuaW5jICB8ICAg
MTAgKysrKysrKy0KIC4uLi9wcm9nL2VuL21vZHVsZXMvYWRtaW4vYWRtaW4taG9tZS50bXBsICAg
ICAgICAgIHwgICAyMyArKysrKysrKysrKy0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDIxIGlu
c2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2tvaGEtdG1wbC9pbnRy
YW5ldC10bXBsL3Byb2cvZW4vaW5jbHVkZXMvYWRtaW4tbWVudS5pbmMgYi9rb2hhLXRtcGwvaW50
cmFuZXQtdG1wbC9wcm9nL2VuL2luY2x1ZGVzL2FkbWluLW1lbnUuaW5jCmluZGV4IGM1OTE5ZTYu
LjFmODJjMDcgMTAwNjQ0Ci0tLSBhL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vaW5j
bHVkZXMvYWRtaW4tbWVudS5pbmMKKysrIGIva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9l
bi9pbmNsdWRlcy9hZG1pbi1tZW51LmluYwpAQCAtNiw4ICs2LDYgQEAKIDxoNT5CYXNpYyBwYXJh
bWV0ZXJzPC9oNT4KIDx1bD4KIAk8bGk+PGEgaHJlZj0iL2NnaS1iaW4va29oYS9hZG1pbi9icmFu
Y2hlcy5wbCI+TGlicmFyaWVzLCBicmFuY2hlcywgZ3JvdXBzPC9hPjwvbGk+Ci0JPGxpPjxhIGhy
ZWY9Ii9jZ2ktYmluL2tvaGEvYWRtaW4vYXFidWRnZXRzLnBsIj5CdWRnZXRzLCBwZXJpb2RzLCBw
bGFubmluZzwvYT48L2xpPgotCTxsaT48YSBocmVmPSIvY2dpLWJpbi9rb2hhL2FkbWluL2N1cnJl
bmN5LnBsIj5DdXJyZW5jaWVzIGFuZCBleGNoYW5nZSByYXRlczwvYT48L2xpPgogCTxsaT48YSBo
cmVmPSIvY2dpLWJpbi9rb2hhL2FkbWluL2l0ZW10eXBlcy5wbCI+SXRlbSB0eXBlcyBhbmQgY2ly
Y3VsYXRpb24gY29kZXM8L2E+PC9saT4KIDwvdWw+CiAKQEAgLTMzLDYgKzMxLDE0IEBACiAgICAg
PGxpPjxhIGhyZWY9Ii9jZ2ktYmluL2tvaGEvYWRtaW4vbWF0Y2hpbmctcnVsZXMucGwiPlJlY29y
ZCBtYXRjaGluZyBydWxlczwvYT48L2xpPgogPC91bD4KIAorPGg1PkFjcXVpc2l0aW9uIHBhcmFt
ZXRlcnM8L2g1PgorCis8dWw+CisJPGxpPjxhIGhyZWY9Ii9jZ2ktYmluL2tvaGEvYWRtaW4vY3Vy
cmVuY3kucGwiPkN1cnJlbmNpZXMgYW5kIGV4Y2hhbmdlIHJhdGVzPC9hPjwvbGk+CisJPGxpPjxh
IGhyZWY9Ii9jZ2ktYmluL2tvaGEvYWRtaW4vYXFidWRnZXRzLnBsIj5CdWRnZXRzLCBwZXJpb2Rz
LCBwbGFubmluZzwvYT48L2xpPgorCTxsaT48YSBocmVmPSIvY2dpLWJpbi9rb2hhL2FkbWluL2Fx
YnVkZ2V0cGVyaW9kcy5wbCI+Um9vdCBCdWRnZXRzPC9hPjwvbGk+Cis8L3VsPgorCiA8aDU+QWRk
aXRpb25hbCBwYXJhbWV0ZXJzPC9oNT4KIAogPHVsPgpkaWZmIC0tZ2l0IGEva29oYS10bXBsL2lu
dHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL2FkbWluL2FkbWluLWhvbWUudG1wbCBiL2tvaGEt
dG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy9hZG1pbi9hZG1pbi1ob21lLnRtcGwK
aW5kZXggMjVkNDNiNi4uMmEzZDE3ZCAxMDA2NDQKLS0tIGEva29oYS10bXBsL2ludHJhbmV0LXRt
cGwvcHJvZy9lbi9tb2R1bGVzL2FkbWluL2FkbWluLWhvbWUudG1wbAorKysgYi9rb2hhLXRtcGwv
aW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvYWRtaW4vYWRtaW4taG9tZS50bXBsCkBAIC03
NiwyNSArNzYsMjggQEAKICAgICA8ZGQ+TWFuYWdlIHJ1bGVzIGZvciBhdXRvbWF0aWNhbGx5IG1h
dGNoaW5nIE1BUkMgcmVjb3JkcyBkdXJpbmcgcmVjb3JkIGltcG9ydHMuPC9kZD4KIDwvZGw+CiAK
LTxoMz5BZGRpdGlvbmFsIHBhcmFtZXRlcnM8L2gzPgotPGRsPgotCTwhLS0gVE1QTF9JRiBOQU1F
PSJOb1plYnJhIiAtLT48ZHQ+PGEgaHJlZj0iL2NnaS1iaW4va29oYS9hZG1pbi9zdG9wd29yZHMu
cGwiPlN0b3Agd29yZHM8L2E+PC9kdD4KLQk8ZGQ+V29yZHMgaWdub3JlZCBkdXJpbmcgc2VhcmNo
LjwvZGQ+PCEtLSAvVE1QTF9JRiAtLT4KLQk8IS0tIDxkdD48YSBocmVmPSIvY2dpLWJpbi9rb2hh
L2FkbWluL3ByaW50ZXJzLnBsIj5OZXR3b3JrIFByaW50ZXJzPC9hPjwvZHQ+Ci0JPGRkPlByaW50
ZXJzIChVTklYIHBhdGhzKS48L2RkPiAtLT4KLQk8ZHQ+PGEgaHJlZj0iL2NnaS1iaW4va29oYS9h
ZG1pbi96Mzk1MHNlcnZlcnMucGwiPlozOS41MCBDbGllbnQgVGFyZ2V0czwvYT48L2R0PgotCTxk
ZD5EZWZpbmUgd2hpY2ggc2VydmVycyB0byBxdWVyeSBmb3IgTUFSQyBkYXRhIGluIHRoZSBpbnRl
Z3JhdGVkIFozOS41MCBjbGllbnQuPC9kZD4KLTwvZGw+Ci0KIDxoMz5BY3F1aXNpdGlvbiBwYXJh
bWV0ZXJzPC9oMz4KIDxkbD4KICAgICAgICAgPGR0PjxhIGhyZWY9Ii9jZ2ktYmluL2tvaGEvYWRt
aW4vY3VycmVuY3kucGwiPkN1cnJlbmNpZXMgYW5kIGV4Y2hhbmdlIHJhdGVzPC9hPjwvZHQ+CiAg
ICAgICAgIDxkZD5EZWZpbmUgY3VycmVuY2llcyBhbmQgZXhjaGFuZ2UgcmF0ZXMgdXNlZCBmb3Ig
YWNxdWlzaXRpb25zLjwvZGQ+CiAKKyAgICAgICAgPGR0PjxhIGhyZWY9Ii9jZ2ktYmluL2tvaGEv
YWRtaW4vYXFidWRnZXRzLnBsIj5CdWRnZXRzLCBwZXJpb2RzLCBwbGFubmluZzwvYT48L2R0Pgor
ICAgICAgICA8ZGQ+RGVmaW5lIHlvdXIgYnVkZ2V0czwvZGQ+CisgICAgICAgIAogICAgICAgICA8
ZHQ+PGEgaHJlZj0iL2NnaS1iaW4va29oYS9hZG1pbi9hcWJ1ZGdldHBlcmlvZHMucGwiPlJvb3Qg
QnVkZ2V0czwvYT48L2R0PgogICAgICAgICA8ZGQ+RGVmaW5lIHlvdXIgcm9vdCBidWRnZXRzPC9k
ZD4KIAogPC9kbD4KKworPGgzPkFkZGl0aW9uYWwgcGFyYW1ldGVyczwvaDM+Cis8ZGw+CisJPCEt
LSBUTVBMX0lGIE5BTUU9Ik5vWmVicmEiIC0tPjxkdD48YSBocmVmPSIvY2dpLWJpbi9rb2hhL2Fk
bWluL3N0b3B3b3Jkcy5wbCI+U3RvcCB3b3JkczwvYT48L2R0PgorCTxkZD5Xb3JkcyBpZ25vcmVk
IGR1cmluZyBzZWFyY2guPC9kZD48IS0tIC9UTVBMX0lGIC0tPgorCTwhLS0gPGR0PjxhIGhyZWY9
Ii9jZ2ktYmluL2tvaGEvYWRtaW4vcHJpbnRlcnMucGwiPk5ldHdvcmsgUHJpbnRlcnM8L2E+PC9k
dD4KKwk8ZGQ+UHJpbnRlcnMgKFVOSVggcGF0aHMpLjwvZGQ+IC0tPgorCTxkdD48YSBocmVmPSIv
Y2dpLWJpbi9rb2hhL2FkbWluL3ozOTUwc2VydmVycy5wbCI+WjM5LjUwIENsaWVudCBUYXJnZXRz
PC9hPjwvZHQ+CisJPGRkPkRlZmluZSB3aGljaCBzZXJ2ZXJzIHRvIHF1ZXJ5IGZvciBNQVJDIGRh
dGEgaW4gdGhlIGludGVncmF0ZWQgWjM5LjUwIGNsaWVudC48L2RkPgorPC9kbD4KIDwvZGl2Pgog
CiA8L2Rpdj4KLS0gCjEuNS42LjUKCg==
--001636c928dfc86f8f0479d3ee74--