[Koha-patches] [PATCH] Bug 8655 - Re-order items on administration page to better match configuration priority

[Owen Leonard]

Circulation and Fine Rules should have a higher priority than
cities and road types.
---
 .../intranet-tmpl/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 5611a04..72162d3 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 a85d490..3906c46 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">
-- 
1.7.9.5