Diff for /scripts/pgallery/src/libpgallery.sh between versions 1.1 and 1.5

version 1.1, 2012/08/31 12:33:07 version 1.5, 2012/09/11 16:24:46
Line 5 Line 5
 # can do whatever you want with this stuff. If we meet some day, and you think  # 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  # 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"  BIN_CONVERT="/usr/local/bin/convert"
Line 14  BIN_IMGINFO="/usr/local/bin/imginfo" Line 14  BIN_IMGINFO="/usr/local/bin/imginfo"
 BIN_SENDMAIL="/usr/sbin/sendmail"  BIN_SENDMAIL="/usr/sbin/sendmail"
 BIN_EXIFTRAN="/usr/local/bin/exiftran"  BIN_EXIFTRAN="/usr/local/bin/exiftran"
 BIN_EXIF="/usr/local/bin/exif"  BIN_EXIF="/usr/local/bin/exif"
   BIN_JPEGINFO="/usr/local/bin/jpeginfo"
   BIN_ICONV="/usr/local/bin/iconv"
   
 ARGFILE=".htpgallery"  ARGFILE=".htpgallery"
VERSION="pgallery-1.3"VERSION="pgallery-1.4"
   
 #  #
 # get_my_path()  # get_my_path()
Line 112  div.tn { Line 114  div.tn {
         margin: 4px;          margin: 4px;
 }  }
 div.t {  div.t {
         height: 20px;  
         line-height: 18px;  
         text-overflow: ellipsis;          text-overflow: ellipsis;
         overflow: hidden;          overflow: hidden;
         white-space: nowrap;          white-space: nowrap;
         width: $(($ARG_TNSIZE - 8))px;  
         padding: 0 4px;  
         margin-bottom: 1px;          margin-bottom: 1px;
         background: rgb(38,38,38); /* Old browsers */          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+ */          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+ */
Line 129  div.t { Line 127  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 */          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 */          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 {  div.tn a {
         position: relative;          position: relative;
         display: inline-block;          display: inline-block;
Line 233  div.nav { Line 256  div.nav {
         width: ${ARG_BIGSIZE}px;          width: ${ARG_BIGSIZE}px;
         height: 20px;          height: 20px;
 }  }
div.nav a {a {
         color: #FFF;          color: #FFF;
         text-decoration: none;          text-decoration: none;
 }  }
div.nav a:hover {a:hover {
         text-decoration: underline;          text-decoration: underline;
 }  }
 div.nav div.top {  div.nav div.top {
Line 359  HTML Line 382  HTML
 }  }
   
 #  #
   # html_title()
   #
   html_title()
   {
           left="$1"
           center="$2"
           right="$3"
           cat <<HTML
   <div class="t">
           <div class="left">$left</div>
           <div class="right">$right</div>
           <div class="center">$center</div>
           <div class="clear"></div>
   </div>
   HTML
   }
   
   #
 # err  # err
 #  #
 err()  err()
Line 451  get_exif_info() Line 492  get_exif_info()
                         exifinfo="$exifinfo$exif "                          exifinfo="$exifinfo$exif "
                 fi                  fi
         done          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/'
 }  }
   
 #  #

Removed from v.1.1  
changed lines
  Added in v.1.5