From 98d1f473841cc22b9d8589d21f86526495857596 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 17 Aug 2012 13:59:47 -0400
Subject: [PATCH] Bug 8655 - Re-order items on administration page to better
 match configuration priority

Circulation and Fine Rules should have a higher priority than
cities and road types.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Tested on main admin page and the menu on the left of all of the
other admin pages. Looks a-ok to me.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---
 .../prog/en/includes/admin-menu.inc            |  6 +++---
 .../prog/en/modules/admin/admin-home.tt        | 18 +++++++++---------
 2 files changed, 12 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 5611a043c4..72162d382d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -27,12 +27,12 @@
 <h5>Patrons and circulation</h5>
 <ul>
 	<li><a href="/cgi-bin/koha/admin/categorie.pl">Patron types and categories</a></li>
-	<li><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></li>
-	<li><a href="/cgi-bin/koha/admin/roadtype.pl">Road types</a></li>
+    <li><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></li>
 	<li><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></li>
-	<li><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></li>
 	<li><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></li>
 	<li><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></li>
+    <li><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></li>
+    <li><a href="/cgi-bin/koha/admin/roadtype.pl">Road types</a></li>
 </ul>
 
 <h5>Catalog</h5>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index a85d490c35..3906c46657 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -42,21 +42,21 @@
 <dl>
 	<dt><a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a></dt>
 	<dd>Define patron categories.</dd>
-	<dt><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></dt>
-	<dd>Define cities and towns that your patrons live in.</dd>
-	<dt><a href="/cgi-bin/koha/admin/roadtype.pl" >Road types</a>
-	</dt>
-	<dd>Define road types (street, avenue, way, etc.). Road types display as authorized values when adding/editing patrons and can be used in geographic statistics.</dd>
-	<dt><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></dt>
-	<dd>Define extended attributes (identifiers and statistical categories) for patron records</dd>
 [% IF CAN_user_parameters_manage_circ_rules %]
-	<dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
-	<dd>Define circulation and fines rules for combinations of libraries, patron categories, and item types</dd>
+    <dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
+    <dd>Define circulation and fines rules for combinations of libraries, patron categories, and item types</dd>
 [% END %]
+    <dt><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></dt>
+    <dd>Define extended attributes (identifiers and statistical categories) for patron records</dd>
     <dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></dt>
 	<dd>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.</dd>
     <dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></dt>
 	<dd>Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types</dd>
+    <dt><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></dt>
+    <dd>Define cities and towns that your patrons live in.</dd>
+    <dt><a href="/cgi-bin/koha/admin/roadtype.pl" >Road types</a>
+    </dt>
+    <dd>Define road types (street, avenue, way, etc.). Road types display as authorized values when adding/editing patrons and can be used in geographic statistics.</dd>
 </dl>
 </div>
 <div class="yui-u">
-- 
2.39.5