Changeset 653 for trunk/ImageGalleryPlugin/lib/TWiki/Plugins/ImageGalleryPlugin/Core.pm

Timestamp:

11/14/08 12:11:05 (4 years ago)

Author:

MichaelDaum

Message:

Item176:

Adding a format, header, footer set of format strings to get full
control on how galleries are rendered. This allows integration into other
slideshow tools like  http://www.twospy.com/galleriffic/ or
 http://www.airtightinteractive.com/simpleviewer/examples/small/

File:

• trunk/ImageGalleryPlugin/lib/TWiki/Plugins/ImageGalleryPlugin/Core.pm (modified) (9 diffs)

trunk/ImageGalleryPlugin/lib/TWiki/Plugins/ImageGalleryPlugin/Core.pm

@@ -1 @@
-#
-# TWiki WikiClone ($wikiversion has version info)
-#
 # Copyright (C) 2002-2003 Will Norris. All Rights Reserved. (wbniv@saneasylumstudios.com)
 # Copyright (C) 2005-2008 Michael Daum http://michaeldaumconsulting.com
@@ -176 +173 @@
   $this->{minwidth} = $params->{minwidth} || 0;
   $this->{minwidth} = $this->{maxwidth} if $this->{minwidth} > $this->{maxwidth};
-  $this->{format} = $params->{format} || 
-      '<a href="$origurl"><img src="$imageurl" title="$comment" width="$width" height="$height"/></a>';
+  $this->{format} = $params->{format};
   $this->{title} = $params->{title} || ' $comment ($imgnr/$nrimgs)&nbsp;$reddot';
   $this->{doTitles} = ($this->{title} eq 'off')?0:1;
@@ -267 +263 @@
       join(', ', $this->{info}{topics}{value}) ne join(', ', @{$this->{topics}});
 
-  my $result = "<div class=\"igp\"><a name=\"igp$this->{id}\"></a>";
+  my $result;
 
   # get filename query string
@@ -273 +269 @@
   my $id = $this->{query}->param("id") || '';
 
-  if ($id eq $this->{id} && $filename) {
-    # picture mode
-    $result .= $this->renderImage($filename);
+  if ($this->{format}) {
+    $result = $this->renderFormatted();
   } else {
-    # thumbnails mode
-    $result .= $this->renderThumbnails();
-  }
-
-  $result .= "</div>\n";
+    $result = "<div class=\"igp\"><a name=\"igp$this->{id}\"></a>";
+    if ($id eq $this->{id} && $filename) {
+      # picture mode
+      $result .= $this->renderImage($filename);
+    } else {
+      # thumbnails mode
+      $result .= $this->renderThumbnails();
+    }
+    $result .= "</div>\n";
+    $result = '<noautolink>'.$result.'</noautolink>';
+  }
+
 
   $this->writeInfo();
-  return '<noautolink>'.$result.'</noautolink>';
+
+  #writeDebug("result=$result");
+  return $result;
 }
 
@@ -368 +372 @@
 
   # img
+  my $imgFormat = '<a href="$origurl"><img src="$imageurl" title="$comment" width="$width" height="$height"/></a>';
   $result .= "<tr><td class=\"igpPicture\">" 
-    . $this->replaceVars($this->{format}, $thisImg);
+    . $this->replaceVars($imgFormat, $thisImg);
 
   # navi
@@ -416 +421 @@
 
 # =========================
-sub renderThumbnails {
-
+sub renderFormatted {
   my $this = shift;
-
-  #writeDebug("renderThumbnails()");
+  
+  writeDebug("renderFormatted()");
 
   if (!@{$this->{images}}) {
@@ -427 +431 @@
 
   my $maxCols = $this->{columns};
-  my $result = "<div class=\"igpThumbNails\"><table class=\"igpThumbNailsTable\"><tr>\n";
+  my $header = $this->{header} || '';
+  my $footer = $this->{footer} || '';
+  my $format = $this->{format} || '   * $imageurl';
+  my $separator = $this->{separator};
+
+  $separator = "\n" unless defined $separator;
+  my @result;
+
+  my $imageNr = 0;
+  my @rowOfImages = ();
+  my $skip = $this->{skip};
+  foreach my $image (@{$this->{images}}) {
+
+    $skip--;
+    next if $skip >= 0;
+    last if $this->{limit} && $imageNr >= $this->{limit};
+    $imageNr++;
+
+    $this->computeImageSize($image);
+    if (!$this->createImg($image)) {
+      return renderError($this->{errorMsg});
+    }
+    if (!$this->createImg($image, 1)) {
+      return renderError($this->{errorMsg});
+    }
+
+
+    my $line = $this->replaceVars($format, $image);
+    $line =~ s/\$index/$imageNr/g;
+    push @result, $line;
+    
+
+  }
+  return $header.join($separator, @result).$footer;
+}
+
+# =========================
+sub renderThumbnails {
+
+  my $this = shift;
+
+  writeDebug("renderThumbnails()");
+
+  if (!@{$this->{images}}) {
+    return renderError($this->{warn}); 
+  }
+
+  my $maxCols = $this->{columns};
+  my $result = "<div class='igpThumbNails'><table class='igpThumbNailsTable'><tr>";
   my $imageNr = 0;
   my @rowOfImages = ();
@@ -758 +810 @@
     $format =~ s/\$wikiusername/$image->{user}/gos;
     $format =~ s/\$username/TWiki::Func::wikiToUserName($image->{user})/geos;
-    $format =~ s,\$thumburl,$this->{imagesPubUrl}/thumb_$imageName,gos;
-    $format =~ s,\$imageurl,$this->{imagesPubUrl}/$imageName,gos;
-    $format =~ s,\$origurl,$image->{IGP_url},gos;
+    $format =~ s/\$thumburl/$this->{imagesPubUrl}\/thumb_$imageName/gos;
+    $format =~ s/\$imageurl/$this->{imagesPubUrl}\/$imageName/gos;
+    $format =~ s/\$origurl/$image->{IGP_url}/gos;
     $format =~ s/\$web/$image->{IGP_web}/gos;
     $format =~ s/\$topic/$image->{IGP_topic}/gos;
@@ -983 +1035 @@
 }
 
-
-
 1;