new cvs checkin
Claudio Piciarelli <[email protected]> Fri, 07 Nov 2003 14:05:07 -0800
| Newsgroups | gmane.comp.web.cthumb.devel |
|---|---|
| Message-ID | <[email protected]> |
cthumb/doc keywords.html
Update of /cvsroot/cthumb/cthumb/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv29133/doc
Modified Files:
keywords.html
Log Message:
See ChangeLog. I've also put an alt="" on some decorative pictures.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cthumb/cthumb/ChangeLog,v
retrieving revision 1.30
diff -u -r1.30 ChangeLog
--- ChangeLog 20 Oct 2003 19:19:32 -0000 1.30
+++ ChangeLog 7 Nov 2003 21:49:59 -0000
@@ -1,3 +1,11 @@
+Thu Nov 6 21:29:21 CET 2003 Claudio Piciarelli <piccia _at_ libero.it>
+
+ * cthumb.in:
+ - trailing spaces in config entries bug fix
+ - get rid of that annoying cp warning when ImageDir = ThemeDir
+ - put SlidePictureGeometry and DefaultSlidePictureGeometry
+ in the automatically created album files
+
Mon Oct 20 12:24:22 PDT 2003 Claudio Piciarelli <piccia _at_ libero.it>
* cthumb.in: tweak layout
Index: cthumb.in
===================================================================
RCS file: /cvsroot/cthumb/cthumb/cthumb.in,v
retrieving revision 1.22
diff -u -r1.22 cthumb.in
--- cthumb.in 20 Oct 2003 19:19:32 -0000 1.22
+++ cthumb.in 7 Nov 2003 21:50:19 -0000
@@ -68,7 +68,7 @@
["CthumbDir" , "string", "" , "" , " ", " ", "x", "directory where thumbnails and html are created"],
["Decorations" , "array" , "" , "0 0 0 0" , "x", "t", " ", "theme measurement"],
["DecorBGColor" , "string" , "" , "#000000" , "x", "t", "x", "background for decorations"],
- ["DefaultSlidePictureGeometry", "string" , "" , "0x0" , " ", "x", "x", "default size to start with"],
+ ["DefaultSlidePictureGeometry", "string" , "" , "0x0" , " ", " ", "x", "default size to start with"],
["DefaultSlidePictureQuality" , "integer", "" , "80" , " ", "x", "x", "quality of pictures in slides (1-100). High quality -> large file!"],
["DisplayFileDate" , "boolean", "" , "0" , " ", " ", "x", "display the file date in the comments"],
["DisplayGeometry" , "boolean", "" , "0" , " ", " ", "x", "display the X x Y geometry in the alt comments"],
@@ -88,7 +88,7 @@
["NoThumbBGColor" , "string" , "" , "#322207" , " ", "t", " ", "film bg color if there is no thumbnail available"],
["PicturesPerRow" , "integer", "f", "4" , " ", " ", " ", "Number of Pictures Per Row"],
["RecursiveCP" , "string" , "" , "@CPR@" , " ", "x", "x", "'cp -a' for gnu cp, set to 'cp -r' for bsd, else 'rsync -avq'"],
- ["SlidePictureGeometry" , "array" , "" , "0x0" , " ", "x", "x", "sizes to generate, 0x0 is original size"],
+ ["SlidePictureGeometry" , "array" , "" , "0x0" , " ", " ", "x", "sizes to generate, 0x0 is original size"],
["SlidePictureSmoothing" , "integer", "" , "0" , " ", "c", "x", "slide picture smoothing strength (1-100)"],
["StoryFontColor" , "string" , "" , "#FFFFFF" , " ", "t", "x", "story font color"],
["StoryFontSize" , "string" , "" , "+0" , " ", "t", "x", "story font size"],
@@ -405,7 +405,7 @@
}
if ($options[$i][1] eq "string" &&
- /^$pattern:\s*(.*)\s*?$/i) { # string w/o comment
+ /^$pattern:\s*(.*?)\s*$/i) { # string w/o comment
eval "\$$pattern = '$1'";
#print "# Source=$type $pattern='$1'\n";
# If we just set a new theme, read it in now
@@ -415,7 +415,7 @@
}
}
if ($options[$i][1] eq "array" &&
- /^$pattern:\s*(.*)\s*?$/i) { # array w/o comment
+ /^$pattern:\s*(.*?)\s*$/i) { # array w/o comment
eval "\@$pattern = qw($1)";
#print "# Source=$type $pattern=qw($1)\n";
# If Languages was set, assign NLanguages
@@ -444,15 +444,17 @@
$themeprefix = $newthemedir . $newtheme;
# reset the new them directory to a real path
- $newthemedir = "." if ($newthemedir eq "");
+ $newthemedir = "./" if ($newthemedir eq "");
- # print "DEBUG: \ImageDir: \"$ImageDir\" \$newtheme: \"$newtheme\" \$newthemedir: \"$newthemedir\"\n";
+ # print "DEBUG: \$ImageDir: \"$ImageDir\" \$newtheme: \"$newtheme\" \$newthemedir: \"$newthemedir\"\n";
# if the originals exist, update or create the local copy
if ((-e ($newthemedir . $newtheme)) || (-e ($ImageDir . "/" . $newtheme . "/"))) {
$Theme = $newtheme;
# print "DEBUG: $RecursiveCP $ImageDir/$newtheme $newthemedir\n";
- system("$RecursiveCP $ImageDir/$newtheme $newthemedir");
+ if(reduce_path($ImageDir . "/") ne reduce_path($newthemedir)) {
+ system("$RecursiveCP $ImageDir/$newtheme $newthemedir");
+ }
} else {
print "WARNING: cannot find theme \"$newtheme\" in current directory or in $ImageDir.\n";
print "proceeding with defaults in \"$Theme\" ...\n";
@@ -1477,7 +1479,7 @@
# Generate left decoration
if ($Decorations[2] >= 0) {
if (-e "$themeprefix/$thumbleft") {
- $text .= "<td><img src=\"$themeprefix/$thumbleft\" width=\"$Decorations[2]\" height=\"100%\"></td>\n";
+ $text .= "<td><img src=\"$themeprefix/$thumbleft\" width=\"$Decorations[2]\" height=\"100%\" alt=\"\"></td>\n";
} else {
$text .= "<td width=$Decorations[2]><br></td>\n";
}
@@ -1494,7 +1496,7 @@
# Generate the right decoration.
if ($Decorations[3] >= 0) {
if (-e "$themeprefix/$thumbright") {
- $text .= "<td><img src=\"$themeprefix/$thumbright\" width=\"$Decorations[3]\" height=\"100%\"></td>\n";
+ $text .= "<td><img src=\"$themeprefix/$thumbright\" width=\"$Decorations[3]\" height=\"100%\" alt=\"\"></td>\n";
} else {
$text .= "<td width=$Decorations[3]><br></td>\n";
}
@@ -1504,7 +1506,7 @@
$text .= "</tr></table></td>\n";
}
for my $k ($npics .. ($PicturesPerRow-1)) {
- $text .= "<td bgcolor=\"$BGColor\"><img border=\"0\" src=\"$themeprefix/$pixel\"></td>\n"
+ $text .= "<td bgcolor=\"$BGColor\"><img border=\"0\" src=\"$themeprefix/$pixel\" alt=\"\"></td>\n"
}
$text .= "</tr>\n";
@@ -1558,7 +1560,7 @@
}
}
for my $k ($npics .. ($PicturesPerRow-1)) {
- $text .= "<td bgcolor=\"$BGColor\"><img border=\"0\" src=\"$themeprefix/$pixel\"></td>"
+ $text .= "<td bgcolor=\"$BGColor\"><img border=\"0\" src=\"$themeprefix/$pixel\" alt=\"\"></td>"
}
$text .= "</tr>\n";
@@ -1587,7 +1589,7 @@
}
for my $i ($npics+1..$PicturesPerRow) {
# fill the rest
- $str .= "<td bgcolor=\"$BGColor\"><img border=\"0\" src=\"$themeprefix/$pixel\"></td>\n";
+ $str .= "<td bgcolor=\"$BGColor\"><img border=\"0\" src=\"$themeprefix/$pixel\" alt=\"\"></td>\n";
}
$str .= "</tr>\n";
return $str;
Index: doc/keywords.html
===================================================================
RCS file: /cvsroot/cthumb/cthumb/doc/keywords.html,v
retrieving revision 1.2
diff -u -r1.2 keywords.html
--- doc/keywords.html 27 May 2003 09:06:30 -0000 1.2
+++ doc/keywords.html 7 Nov 2003 21:50:26 -0000
@@ -135,7 +135,7 @@
<TD>default size to start with</TD>
<TD>string</TD>
<TD>'0x0'</TD>
- <TD>.cthumbrc</TD>
+ <TD>.cthumbrc, .album files</TD>
</TR>
<TR>
<TD><B>DefaultSlidePictureQuality</B></TD>
@@ -275,7 +275,7 @@
<TD>sizes to generate, 0x0 is original size</TD>
<TD>array</TD>
<TD>'0x0'</TD>
- <TD>.cthumbrc</TD>
+ <TD>.cthumbrc, .album files</TD>
</TR>
<TR>
<TD><B>SlidePictureSmoothing</B></TD>
-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/