fixed the thumbnail macro

added the new ldap icon to the admin console

docs/changelog/6.x.x.txt

@@ -1,4 +1,9 @@
 6.6.0
+ - Added a shopping cart system and salable products management system. This
+   completes the foundation of WebGUI's commerce system and will allow us to
+   add very rich commerce features in the 7.x series. (Thanks to ProcoliX and
+   Boomer Consulting for each contributing some funding toward the development
+   of these features.)
  - Added a new admin panel for inline content editing.
  - Tweaked the preloader so WebGUI uses a little less memory per process.
  - upgrade.pl and testEnvironment.pl now use the same config file reader as
@@ -61,9 +66,14 @@
    survey's.
  - Attached the karma system to the ratings system in the Collaboration
    system.
- - Added API for connecting to LDAP directories
- - Added Admininstration Module for creating Multiple LDAP Connections on a WebGUI site
- - Modified LDAP Authentication Module to allow users to choose from the Ldap Connections created in the Admin Console
+ - Added API for connecting to LDAP directories (Thanks to MABIS Healthcare
+   for funding this enhancement.)
+ - Added Admininstration Module for creating Multiple LDAP Connections on a 
+   WebGUI site (Thanks to MABIS Healthcare for funding this enhancement.)
+ - Modified LDAP Authentication Module to allow users to choose from the LDAP 
+   Connections created in the Admin Console (Thanks to MABIS Healthcare for
+   funding this enhancement.)
+ - Thumnail macro has been updated to work with the asset tree system.
 
 
 6.5.6

lib/WebGUI/AdminConsole.pm

@@ -197,7 +197,7 @@ sub getAdminFunction {
 				id=>"ldapconnections",
 				namespace=>"WebGUI"
 			},
-			icon=>"databases.gif",
+			icon=>"ldap.gif",
 			op=>"listLDAPLinks",
 			group=>"3"
 		},

lib/WebGUI/Macro/Thumbnail.pm

@@ -11,15 +11,15 @@ package WebGUI::Macro::Thumbnail;
 #-------------------------------------------------------------------
 
 use strict;
-use WebGUI::Collateral;
+use WebGUI::Asset::File::Image;
 use WebGUI::Macro;
 use WebGUI::Session;
 
 #-------------------------------------------------------------------
 sub process {
-        my @param = WebGUI::Macro::getParams($_[0]);
-	if (my $collateral = WebGUI::Collateral->find($param[0])) {
-	        return $collateral->getThumbnail;
+        my ($url) = WebGUI::Macro::getParams(shift);
+	if (my $image = WebGUI::Asset::File::Image->newByUrl($url)) {
+	        return $image->getThumbnailUrl;
         } else {
                 return undef;
         }