summaryrefslogtreecommitdiff
path: root/icon_browser.php
diff options
context:
space:
mode:
authorChristian Fowler <spider@viovio.com>2009-03-09 19:10:31 +0000
committerChristian Fowler <spider@viovio.com>2009-03-09 19:10:31 +0000
commit3e6234b17cbe5c0e62c28f3caf4800783a2bdc73 (patch)
treef18ce65f33106f8435e5db2e19eebbb9a6ec1b09 /icon_browser.php
parentd0f391862ff68473761263f64fe1c754b7d53ccd (diff)
downloadthemes-3e6234b17cbe5c0e62c28f3caf4800783a2bdc73.tar.gz
themes-3e6234b17cbe5c0e62c28f3caf4800783a2bdc73.tar.bz2
themes-3e6234b17cbe5c0e62c28f3caf4800783a2bdc73.zip
show all icons, even if they aren't in tango set, order everything by the icon name
Diffstat (limited to 'icon_browser.php')
-rw-r--r--icon_browser.php13
1 files changed, 10 insertions, 3 deletions
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;
}
?>