--- scripts/pgallery/src/libpgallery.sh 2012/08/31 12:33:07 1.1
+++ 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/pgallery.sh,v 1.17 2012/08/29 14:44:04 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()
@@ -112,13 +114,9 @@ div.tn {
margin: 4px;
}
div.t {
- height: 20px;
- line-height: 18px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
- width: $(($ARG_TNSIZE - 8))px;
- padding: 0 4px;
margin-bottom: 1px;
background: rgb(38,38,38); /* Old browsers */
background: -moz-linear-gradient(top, rgba(38,38,38,1) 0%, rgba(53,53,53,1) 50%, rgba(48,48,48,1) 51%, rgba(73,73,73,1) 100%); /* FF3.6+ */
@@ -129,6 +127,31 @@ div.t {
background: linear-gradient(to bottom, rgba(38,38,38,1) 0%,rgba(53,53,53,1) 50%,rgba(48,48,48,1) 51%,rgba(73,73,73,1) 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#262626', endColorstr='#494949',GradientType=0 ); /* IE6-9 */
}
+div.tn div.t {
+ width: $(($ARG_TNSIZE - 8))px;
+ height: 20px;
+ padding: 0 4px;
+ line-height: 18px;
+}
+body > div.t {
+ font-weight: bold;
+ position: relative;
+ bottom: 10px;
+ padding: 6px;
+ 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;
@@ -233,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 {
@@ -359,6 +382,24 @@ HTML
}
#
+# html_title()
+#
+html_title()
+{
+ left="$1"
+ center="$2"
+ right="$3"
+ cat <
+ $left
+ $right
+ $center
+
+
+HTML
+}
+
+#
# err
#
err()
@@ -451,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/'
}
#