From 9de3c465a7dc279b0348648445dc19f9f56afe5f Mon Sep 17 00:00:00 2001
From: Martin Kamerbeek <martin@webgui-svn>
Date: Wed, 6 Sep 2006 13:37:23 +0000
Subject: [PATCH] fix: Matrix and fixed a bug in fileUpload.pl

---
 docs/changelog/7.x.x.txt                      |   3 +
 .../matrix_detailed_listing.tmpl              | 105 ++++++++++++++++++
 sbin/fileImport.pl                            |   2 +-
 3 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 docs/upgrades/templates-7.0.7/matrix_detailed_listing.tmpl

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index f1a60c265..32ee0c13f 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -39,6 +39,9 @@
  - fixed a problem in the search indexer and made the tabform css compatible
    with tinymce. (Martin Kamerbeek / Procolix)
  - fixed WeatherData Wobject, noaa format had changed (ekennedy)
+ - fix: Matrix (updated detailed listing template to include the screenshot)
+   and fixed a bug in sbin/fileUpload.pl wher it didn't handle images with
+   uppercased extensions properly (Martin Kamerbeek / Procolix)
 
 7.0.6
  - fix: Error in DateTime.pm
diff --git a/docs/upgrades/templates-7.0.7/matrix_detailed_listing.tmpl b/docs/upgrades/templates-7.0.7/matrix_detailed_listing.tmpl
new file mode 100644
index 000000000..c7e037722
--- /dev/null
+++ b/docs/upgrades/templates-7.0.7/matrix_detailed_listing.tmpl
@@ -0,0 +1,105 @@
+#matrixtmpl000000000003
+
+<h2><tmpl_var productName></h2>
+
+
+<table class="content" border="0" cellspacing="5">
+<tr><td valign="top">
+		<table class="content">
+		<tr><td><b>Web Site</b></td><td><a onclick="window.open('<tmpl_var productUrl.click>')" href="#"><tmpl_var productUrl></a></td></tr>
+		<tr><td><b>Version Number</b></td><td><tmpl_var versionNumber></td></tr>
+		<tr><td><b>Manufacturer</b></td><td><a onclick="window.open('<tmpl_var manufacturerUrl.click>')" href="#"><tmpl_var manufacturerName></a></td></tr>
+		<tr><td><b>Last Updated</b></td><td><tmpl_var lastUpdated.date></td></tr>
+		<tr><td><b>Clicks</b></td><td><tmpl_var clicks></td></tr>
+		<tr><td><b>Views</b></td><td><tmpl_var views></td></tr>
+		<tr><td><b>Compares</b></td><td><tmpl_var compares></td></tr>
+		<tr><td><b>Screenshot</b></td><td><a href="<tmpl_var screenshot>"><img src="<tmpl_var thumbnail>" alt="Screenshot"`></a></td></tr>
+		</table>
+	</td>
+	<td valign="top" style="background-color:silver;">&nbsp;</td>
+	<td valign="top">
+		<tmpl_if description>
+			<b>Description</b><br />
+			<tmpl_var description><br /><br />
+		</tmpl_if>
+
+		<b>Contact Maintainer</b><br />
+		<tmpl_if email.wasSent>
+			<div style="color: green;">Message sent.<br /></div>
+		</tmpl_if>
+		<tmpl_var email.form>
+	</td>
+	<td valign="top" style="background-color:silver;">&nbsp;</td>
+	<td valign="top">
+		<tmpl_var ratings>
+	</td>
+</tr>
+</table>
+
+<p />
+
+<table width="100%"  class="content">
+<tr>
+	<td valign="top" style="width:50%">
+		<span class="category">Features</span>
+		<table class="content" width="180">
+
+		<tmpl_loop features_loop>
+		<tr<tmpl_if __ODD__> class="odd"<tmpl_else> class="even"</tmpl_if>>
+			<td onmouseover="return escape('<tmpl_var description>')"><tmpl_var label></td>
+			<td><tmpl_var value></td>
+		</tr>
+		</tmpl_loop>
+		<tr>
+			<td>&#160;</td>
+			<td>&#160;</td>
+		</tr>
+		</table>
+		
+		<p />
+	</td>
+	<td valign="top" style="width:50%;">
+		<span class="category">Benefits</span>
+		<table class="content" width="180">
+
+		<tmpl_loop benefits_loop>
+		<tr<tmpl_if __ODD__> class="odd"<tmpl_else> class="even"</tmpl_if>>
+			<td onmouseover="return escape('<tmpl_var description>')"><tmpl_var label></td>
+			<td class="<tmpl_var class>"><tmpl_var value></td>
+		</tr>
+		</tmpl_loop>
+		<tr>
+			<td>&#160;</td>
+			<td>&#160;</td>
+		</tr>
+		</table>
+	</td>
+</tr>
+</table>
+
+<p />
+
+<tmpl_var discussion>
+
+<tmpl_if user.canEdit>
+  <br /> <hr /><a href="<tmpl_var edit.url>">Edit this listing.</a> <br />
+</tmpl_if>
+<tmpl_if user.canApprove>
+ <tmpl_if isPending>
+   <a href="<tmpl_var approve.url>">Approve this listing.</a><br />
+ </tmpl_if>
+   <a href="<tmpl_var delete.url>">Delete this listing.</a><br />
+  
+</tmpl_if>
+
+~~~
+
+<style type="text/css">
+.ratingForm {
+ font-size: 9px;
+}
+.statBox {
+	width:100%;
+}
+</style>
+
diff --git a/sbin/fileImport.pl b/sbin/fileImport.pl
index 08893f95b..b097f6682 100644
--- a/sbin/fileImport.pl
+++ b/sbin/fileImport.pl
@@ -211,7 +211,7 @@ sub addFiles {
     # TB : add the path relative to $pathToFile in the message.
     print "\tAdding ".$file->{relpath}.$slash.$file->{filename}." to the database.\n" unless ($quiet);
     my $templateId = 'PBtmpl0000000000000024';
-    if (isIn($file->{ext},@nailable)) {
+    if (isIn(lc($file->{ext}),@nailable)) {
       $class = 'WebGUI::Asset::File::Image';
       $templateId = 'PBtmpl0000000000000088'
     }