--- scripts/pgallery/src/libpgallery.sh 2012/08/31 14:26:58 1.2
+++ scripts/pgallery/src/libpgallery.sh 2012/09/11 16:24:46 1.5
@@ -5,7 +5,7 @@
# can do whatever you want with this stuff. If we meet some day, and you think
# this stuff is worth it, you can buy me a beer in return Aron Schlesinger
#
-# $Paefchen: scripts/pgallery/src/libpgallery.sh,v 1.1 2012/08/31 12:33:07 as Exp $
+# $Paefchen: scripts/pgallery/src/libpgallery.sh,v 1.4 2012/09/11 15:40:43 as Exp $
#
BIN_CONVERT="/usr/local/bin/convert"
@@ -14,9 +14,11 @@ BIN_IMGINFO="/usr/local/bin/imginfo"
BIN_SENDMAIL="/usr/sbin/sendmail"
BIN_EXIFTRAN="/usr/local/bin/exiftran"
BIN_EXIF="/usr/local/bin/exif"
+BIN_JPEGINFO="/usr/local/bin/jpeginfo"
+BIN_ICONV="/usr/local/bin/iconv"
ARGFILE=".htpgallery"
-VERSION="pgallery-1.3"
+VERSION="pgallery-1.4"
#
# get_my_path()
@@ -132,7 +134,6 @@ div.tn div.t {
line-height: 18px;
}
body > div.t {
- font-size: 120%;
font-weight: bold;
position: relative;
bottom: 10px;
@@ -140,7 +141,17 @@ body > div.t {
border-width: 0 0 1px 0;
border-color: gray;
border-style: solid;
+ box-shadow: 1px 1px 2px #000000;
+ margin-bottom: -6px;
+ display: $(test $ARG_NAVI -eq 1 && echo block || echo none);
}
+body > div.t div.center {
+ position: absolute;
+ text-align: center;
+ top: 0px;
+ padding: 6px;
+ width: 100%;
+}
div.tn a {
position: relative;
display: inline-block;
@@ -245,11 +256,11 @@ div.nav {
width: ${ARG_BIGSIZE}px;
height: 20px;
}
-div.nav a {
+a {
color: #FFF;
text-decoration: none;
}
-div.nav a:hover {
+a:hover {
text-decoration: underline;
}
div.nav div.top {
@@ -376,11 +387,13 @@ HTML
html_title()
{
left="$1"
- right="$2"
+ center="$2"
+ right="$3"
cat <
$left
$right
+ $center
HTML
@@ -479,7 +492,7 @@ get_exif_info()
exifinfo="$exifinfo$exif "
fi
done
- echo $exifinfo | sed -E -e 's/ mm /mm /' -e 's/ se(c|k)./s/' -e 's/ ISO / ISO/' -e 's/ ISO(\/| )/ \1/'
+ echo $exifinfo | sed -E -e 's/ mm /mm /' -e 's/( |([[:digit:]]))se(c|k)\./\2s/' -e 's/ ISO / ISO/' -e 's/ ISO(\/| )/ \1/'
}
#