Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1316)
+++ branches/2.8.x/CHANGELOG	(revision 1317)
@@ -11,7 +11,9 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.1 -------------------------------------
-11-Apr-2010 Dietmar Woellbrink (Luisehahne)
+14-Apr-2010 Dietmar Woellbrink (Luisehahne)
+#	Ticket #977 Templates sorted in alphabetical order
+14-Apr-2010 Dietmar Woellbrink (Luisehahne)
 #	Ticket #978 Add additional PHP 5.2 check to installation
 #	Ticket #979 False PHP 4 requirements in install
 #	Ticket #980 Usebility - Bug in the settings-interface
Index: branches/2.8.x/wb/admin/groups/index.php
===================================================================
--- branches/2.8.x/wb/admin/groups/index.php	(revision 1316)
+++ branches/2.8.x/wb/admin/groups/index.php	(revision 1317)
@@ -121,7 +121,7 @@
 
 // Insert values into module list
 $template->set_block('main_block', 'module_list_block', 'module_list');
-$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'page'");
+$result = $database->query('SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "module" AND `function` = "page" ORDER BY `name`');
 if($result->numRows() > 0) {
 	while($addon = $result->fetchRow()) {
 		$template->set_var('VALUE', $addon['directory']);
@@ -132,7 +132,7 @@
 
 // Insert values into template list
 $template->set_block('main_block', 'template_list_block', 'template_list');
-$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'");
+$result = $database->query('SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "template" ORDER BY `name`');
 if($result->numRows() > 0) {
 	while($addon = $result->fetchRow()) {
 		$template->set_var('VALUE', $addon['directory']);
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1316)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1317)
@@ -52,6 +52,6 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.x');
-if(!defined('REVISION')) define('REVISION', '1316');
+if(!defined('REVISION')) define('REVISION', '1317');
 
 ?>
\ No newline at end of file