summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>2001-03-23 14:01:35 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>2001-03-23 14:01:35 +0000
commitcb5e4836346c12398edfa9279b438729de166deb (patch)
treee1e2643b20c718491ad149451c3ba5f74da172b4 /www
parentUpdate to version 2.0.5 (diff)
Generate Up button on the first page when possible
Notes
Notes: svn path=/head/; revision=40268
Diffstat (limited to 'www')
-rw-r--r--www/WebMagick/files/patch-aa33
1 files changed, 21 insertions, 12 deletions
diff --git a/www/WebMagick/files/patch-aa b/www/WebMagick/files/patch-aa
index ab358cdf747b..4f13390bebe0 100644
--- a/www/WebMagick/files/patch-aa
+++ b/www/WebMagick/files/patch-aa
@@ -1,5 +1,5 @@
---- webmagick.in.orig Sun Oct 17 23:55:14 1999
-+++ webmagick.in Mon Nov 29 13:50:46 1999
+--- webmagick.in.old Sun Oct 17 23:55:14 1999
++++ webmagick.in Fri Mar 23 16:50:54 2001
@@ -127,6 +127,7 @@
$opt_dircolorlink,
$opt_dircolorvlink,
@@ -201,7 +201,7 @@
" for output\n$@\n");
print( INDEX "<HTML>\n<HEAD>\n" );
print( INDEX " <TITLE>${pageTitle}</TITLE>\n" );
-@@ -1985,24 +2008,24 @@
+@@ -1985,24 +2008,32 @@
# --- readme link ---
if ( $haveReadme ) {
@@ -212,11 +212,20 @@
}
# --- prev link ---
if( $pageNumber == 1 ) {
- # Go to base index page if on first page
+- # Go to base index page if on first page
- $indexbar .= "<A HREF=\"${opt_indexname}\" TARGET=\"$opt_frame_name_top\"
- ><IMG SRC=\"$iconImageUrls{'prev'}\" $iconImageSizes{'prev'} ALT=\"Prev\" BORDER=0></A>\n";
-+ $indexbar .= "<A HREF=\"${opt_indexname}\" TARGET=\"$opt_frame_name_top\"><IMG
-+ SRC=\"$iconImageUrls{'prev'}\" $iconImageSizes{'prev'} ALT=\"Prev\" BORDER=0></A>\n";
++ my $indexname = get_rc_var('..', 'opt_indexname', $opt_indexname);
++
++ if ( !$haveReadme && $indexname ne 'NOLINK' ) {
++ # Go to up index page if on first page
++ $indexbar .= "<A HREF=\"../${indexname}\" TARGET=\"$opt_frame_name_top\"><IMG
++ SRC=\"$iconImageUrls{'up'}\" $iconImageSizes{'up'} ALT=\"^\" BORDER=0></A>\n";
++ } else {
++ # Go to base index page if on first page
++ $indexbar .= "<A HREF=\"${opt_indexname}\" TARGET=\"$opt_frame_name_top\"><IMG
++ SRC=\"$iconImageUrls{'prev'}\" $iconImageSizes{'prev'} ALT=\"Prev\" BORDER=0></A>\n";
++ }
} else {
# Go to preceding page
- $indexbar .= "<A HREF=\"$fileNames{'htmlPrevIndex'}\" TARGET=\"$frameTargets{'thumbview'}\"
@@ -234,7 +243,7 @@
} else {
# Print a grayed out arrow to maintain alignment
$indexbar .= "<IMG SRC=\"$iconImageUrls{'next_gray'}\" $iconImageSizes{'next_gray'} ALT=\"\" BORDER=0>\n";
-@@ -2058,7 +2081,7 @@
+@@ -2058,7 +2089,7 @@
# Total HACK!!!
if( $opt_framestyle == 1 ) {
print( INDEX "<p><FONT SIZE=-1>Index of files \"$imageNames[$pageNumber - 1][0]\" through",
@@ -243,7 +252,7 @@
}
print( INDEX "\n$indexbar<BR>\n\n" );
-@@ -2143,6 +2166,7 @@
+@@ -2143,6 +2174,7 @@
">WebMagick</A>" );
print( INDEX " $webmagickInfo{version}</NOBR>, <NOBR>Copyright &copy;</NOBR> <NOBR>Bob Friesenhahn</NOBR>\n" );
}
@@ -251,7 +260,7 @@
print( INDEX "</ADDRESS>\n" );
}
-@@ -2762,7 +2786,7 @@
+@@ -2762,7 +2794,7 @@
$status = $montage->Write(
filename=>"JPEG:$fileNames{'montageJPEG'}",
interlace=>'Plane',
@@ -260,7 +269,7 @@
);
handleMagickError( __FILE__, __LINE__, $fileNames{'montageJPEG'}, $status) if "$status";
last MONTAGE if "$status";
-@@ -3346,6 +3370,7 @@
+@@ -3346,6 +3378,7 @@
Paths:
--iconpath Relative path under rootdir to webmagick icons
@@ -268,7 +277,7 @@
--prefixpath Path to prepend to generated URLs (e.g. /~username)
--rootpath Absolute path to server root (NCSA DocumentRoot)
-@@ -3369,6 +3394,8 @@
+@@ -3369,6 +3402,8 @@
Montage:
--forcegif Force imagemap to be in GIF format
@@ -277,7 +286,7 @@
--maxgif Maximum size of GIF imagemap before trying JPEG
--columns Montage columns
--rows Montage rows (max)
-@@ -3408,9 +3435,11 @@
+@@ -3408,9 +3443,11 @@
--dircolorfore Foreground color (directory frame)
--dircolorlink Link (unvisited) color (directory frame)
--dircolorvlink Link (visited) color (directory frame)