new cvs checkin

cthumb ChangeLog cthumb.in

Update of /cvsroot/cthumb/cthumb
In directory sc8-pr-cvs1:/tmp/cvs-serv8001

Modified Files:
	ChangeLog cthumb.in 
Log Message:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cthumb/cthumb/ChangeLog,v
retrieving revision 1.29
diff -u -r1.29 ChangeLog
--- ChangeLog	27 May 2003 18:24:40 -0000	1.29
+++ ChangeLog	20 Oct 2003 19:17:58 -0000
@@ -1,3 +1,8 @@
+Mon Oct 20 12:24:22 PDT 2003  Claudio Piciarelli <piccia _at_ libero.it>
+
+	* cthumb.in: tweak layout
+	* cthumb.in: InsertExif bug fix
+
 Tue May 27 11:15:34 PDT 2003 Carlos Puchol <[email protected]>
 
 	* every single file that contained my email or site: put
Index: cthumb.in
===================================================================
RCS file: /cvsroot/cthumb/cthumb/cthumb.in,v
retrieving revision 1.21
diff -u -r1.21 cthumb.in
--- cthumb.in	27 May 2003 18:24:40 -0000	1.21
+++ cthumb.in	20 Oct 2003 19:18:00 -0000
@@ -1132,11 +1132,6 @@
 
     $str .= "<center>\n";
 
-    # Display timestamps, if desired.
-    if ($originalPictureTimestamp ne "" && $DisplayFileDate != 0) {
-        $str .= "$originalPictureTimestamp<br>\n";
-    }
-
     # Render the navigation controls, "previous", "album index",and 
     # "next" evenly distributed across the top of the picture.
     $str .= "<table cellspacing=\"0\" cellpadding=\"4\" border=\"0\" ";
@@ -1160,14 +1155,15 @@
 	else {
 	    $str .= "<a href=\"" . relative_path($url, $albumURL) . "\">";
 	}
-        $str .= "<img src=\"" . relative_path($url, "$themePrefix/$backarrow") . "\" border=\"0\" alt=\"Index\" align=\"middle\"></a><br><br>\n";
+        $str .= "<img src=\"" . relative_path($url, "$themePrefix/$backarrow") . "\" border=\"0\" alt=\"Index\" align=\"middle\"></a>\n";
+    } else {
+        $str .= "<a href=\"" . relative_path($url, $albumURL) . "\">";
+        $str .= "<font face=\"$TitleFont\" size=\"$TitleFontSize\" ";
+        $str .= "color=\"$TextColor\"><b>";
+        $str .= "$albumTitle";
+        $str .= "</b></font>";
+        $str .= "</a>\n";
     }
-    $str .= "<a href=\"" . relative_path($url, $albumURL) . "\">";
-    $str .= "<font face=\"$TitleFont\" size=\"$TitleFontSize\" ";
-    $str .= "color=\"$TextColor\"><b>";
-    $str .= "$albumTitle";
-    $str .= "</b></font>";
-    $str .= "</a>\n";
 
     $str .= "</td>\n";
     $str .= "<td align=\"right\" width =\"15%\">";
@@ -1224,19 +1220,6 @@
 	$str .= "</font></form>\n";
 	$str .= "<br>\n";
     }
-    # Generate the themed title.
-    $str .= "<p><font face=\"$TitleFont\" size=\"$TitleFontSize\" ";
-    $str .= "color=\"$TextColor\"><b>";
-    $str .= $pictureTitle;
-    $str .= "</b></font></p>\n";
-
-    # Generate the story.
-    if ($StoryOn == 1 && $pictureStory ne "") {
-        $str .= "<p><font face=\"$StoryFont\" size=\"$StoryFontSize\" ";
-        $str .= "color=\"$StoryFontColor\">";
-        $str .= $pictureStory;
-        $str .= "</font></p>\n";
-    }
 
     # Render the image directly under the navigation controls.
     $str .= "<img src=\"";
@@ -1258,11 +1241,30 @@
     $str .= "\"><br>\n\n";
 
     $str .= $geometryLink;
+
+    # Generate the themed title.
+    $str .= "<p><font face=\"$TitleFont\" size=\"$TitleFontSize\" ";
+    $str .= "color=\"$TextColor\"><b>";
+    $str .= $pictureTitle;
+    $str .= "</b></font></p>\n";
+
+    # Display timestamps, if desired.
+    if ($originalPictureTimestamp ne "" && $DisplayFileDate != 0) {
+        $str .= "$originalPictureTimestamp<br>\n";
+    }
+
+    # Generate the story.
+    if ($StoryOn == 1 && $pictureStory ne "") {
+        $str .= "<p><font face=\"$StoryFont\" size=\"$StoryFontSize\" ";
+        $str .= "color=\"$StoryFontColor\">";
+        $str .= $pictureStory;
+        $str .= "</font></p>\n";
+    }
+
     $str .= "</center>\n";
 
     if ($InsertExif == 1){
-       my $relURL = relative_path($url, $pictureURL);
-       my $exiftxt = "<br><br><center><table BORDER=\"0\">\n" . `jhead $relURL` . "</table></center>";
+       my $exiftxt = "<br><br><center><table BORDER=\"0\">\n" . `jhead $pictureURL` . "</table></center>";
        $exiftxt =~ s/^([^:\n]*[^: \t\n]+)\s*:\s*(.*)$/<tr><td>$1<\/td><td>$2<\/td><\/tr>/mg;
        $str .= $exiftxt;
     }



-------------------------------------------------------
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54