From 3e6234b17cbe5c0e62c28f3caf4800783a2bdc73 Mon Sep 17 00:00:00 2001
From: Christian Fowler <spider@viovio.com>
Date: Mon, 9 Mar 2009 19:10:31 +0000
Subject: show all icons, even if they aren't in tango set, order everything by
 the icon name

---
 icon_browser.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'icon_browser.php')

diff --git a/icon_browser.php b/icon_browser.php
index 6586f97..7847c02 100644
--- a/icon_browser.php
+++ b/icon_browser.php
@@ -38,12 +38,19 @@ $iconUsage = array(
 	"dialog-information"       => "Information",
 );
 $gBitSmarty->assign( 'iconUsage', $iconUsage );
-$gBitSmarty->assign( 'defaultIconList', icon_fetcher( THEMES_PKG_PATH."icon_styles/".DEFAULT_ICON_STYLE."/" ));
+$defaultIconList = icon_fetcher( THEMES_PKG_PATH."icon_styles/".DEFAULT_ICON_STYLE."/" );
+$gBitSmarty->assign( 'defaultIcons', $defaultIconList );
 
+$activeIconList = array();
 if( $gBitSystem->isFeatureActive( 'site_icon_style' ) && $gBitSystem->getConfig( 'site_icon_style' ) != DEFAULT_ICON_STYLE ) {
-	$gBitSmarty->assign( 'activeIconList', icon_fetcher( THEMES_PKG_PATH."icon_styles/".$gBitSystem->getConfig( 'site_icon_style' )."/" ));
+	$activeIconList = icon_fetcher( THEMES_PKG_PATH."icon_styles/".$gBitSystem->getConfig( 'site_icon_style' )."/" );
+	$gBitSmarty->assign( 'activeIcons', $activeIconList );
 }
 
+$iconNames = array_merge( array_keys( $activeIconList ), array_keys( $defaultIconList ) );
+asort( $iconNames );
+$gBitSmarty->assign( 'iconNames', $iconNames );
+
 $gBitSystem->display( 'bitpackage:themes/icon_browser.tpl', tra( 'Icon Listing' ) , array( 'display_mode' => 'display' ));
 
 function icon_fetcher( $pStylePath ) {
@@ -55,7 +62,7 @@ function icon_fetcher( $pStylePath ) {
 			}
 		}
 	}
-	asort( $ret );
+	ksort( $ret );
 	return $ret;
 }
 ?>
-- 
cgit v1.3