diff --git a/quack.sh b/quack.sh index a7686385c7a4ca5e21a164e65866a230e45ade4d..3ba43d9e705271d36710371d576502aa7bcc9fee 100755 --- a/quack.sh +++ b/quack.sh @@ -682,6 +682,7 @@ function makePreviewPage() { local IDENTIFY=`identify "$DEST_IMAGE" | grep -o " [0-9]\+x[0-9]\\+ "` IMAGE_WIDTH=`echo $IDENTIFY | grep -o "[0-9]\+x" | grep -o "[0-9]\+"` IMAGE_HEIGHT=`echo $IDENTIFY | grep -o "x[0-9]\+" | grep -o "[0-9]\+"` + IMAGE_MP=`echo "scale=1;x=$IMAGE_WIDTH*$IMAGE_HEIGHT/1000000; if(x<1) print 0; x" | bc` local TIDENTIFY=`identify "$THUMB_IMAGE" | grep -o " [0-9]\+x[0-9]\\+ "` THUMB_WIDTH=`echo $TIDENTIFY | grep -o "[0-9]\+x" | grep -o "[0-9]\+"` THUMB_HEIGHT=`echo $TIDENTIFY | grep -o "x[0-9]\+" | grep -o "[0-9]\+"` @@ -724,7 +725,7 @@ function makePreviewPage() { NAVIGATION="${NAVIGATION} | next" fi - # PARENT, DATE, UP, NAVIGATION, BASE, SOURCE, FULL_RELATIVE_HEIGHT, EDEST, IMAGE_WIDTH, IMAGE_HEIGHT, TILE_SOURCES, THUMB, THUMB_WIDTH, THUMB_HEIGHT, PRESENTATION, PRESENTATION_WIDTH, PRESENTATION_HEIGHT, WHITE, BLACK, OVERLAYS, OCR_CONTENT, IDNEXTS, IDPREVS, ALTO_ELEMENTS_HTML, HISTOGRAM, ALTO, ALTERNATIVES + # PARENT, DATE, UP, NAVIGATION, BASE, SOURCE, FULL_RELATIVE_HEIGHT, EDEST, IMAGE_WIDTH, IMAGE_HEIGHT, IMAGE_MP, TILE_SOURCES, THUMB, THUMB_WIDTH, THUMB_HEIGHT, PRESENTATION, PRESENTATION_WIDTH, PRESENTATION_HEIGHT, WHITE, BLACK, OVERLAYS, OCR_CONTENT, IDNEXTS, IDPREVS, ALTO_ELEMENTS_HTML, HISTOGRAM, ALTO, ALTERNATIVES SOURCE="$SOURCE_IMAGE" SOURCE_SHORT=${SOURCE##*/} SOURCE_SIZE=`du -k "$SOURCE" | grep -o "^[0-9]\+"` @@ -877,25 +878,23 @@ function makeIndex() { # Generate pages local THUMBS_HTML="" local HISTOGRAMS_HTML="" + local ILIST_HTML="" local PREV_IMAGE="" if [ "." == ".$IMAGES" ]; then - IMAGES_HTML="<p>No images</p>"$'\n' + THUMBS_HTML="<p>No images</p>"$'\n' + HISTOGRAMS_HTML="<p>No images</p>"$'\n' else - # http://www.kryogenix.org/code/browser/sorttable/ - IMAGES_HTML="<table class=\"imagelinks sortable\"><tr><th>Image</th> <th>Dark</th> <th>Spike</th> <th>Light</th> <th>Unique</th> <th>Holes</th> <th>OCR</th> <th>KB</th></tr>"$'\n' - HISTOGRAMS_HTML=""$'\n' for I in $IMAGES; do local NEXT_IMAGE=`echo "$IMAGES" | grep -A 1 "$I" | tail -n 1 | grep -v "$I"` makePreviewPage "$UP" "$PARENT" "$SRC_FOLDER" "$DEST_FOLDER" "$I" "$PREV_IMAGE" "$NEXT_IMAGE" - IMAGES_HTML="${IMAGES_HTML}`cat \"$ILINK\"`"$'\n' -# IMAGES_HTML=<li><a href=\"$PAGE_LINK\">$BASE</a></li>"$'\n' + ILIST_HTML="${ILIST_HTML}`cat \"$ILINK\"`"$'\n' +# ILIST_HTML=<li><a href=\"$PAGE_LINK\">$BASE</a></li>"$'\n' THUMBS_HTML="${THUMBS_HTML}<div class=\"thumb\"><a class=\"thumblink\" href=\"$PAGE_LINK\"><span class=\"thumboverlay\"></span><img class=\"thumbimg\" src=\"${THUMB_LINK}\" alt=\"$BASE\" title=\"$BASE\" width=\"$THUMB_WIDTH\" height=\"$THUMB_HEIGHT\"/></a></div>"$'\n' HISTOGRAMS_HTML="${HISTOGRAMS_HTML}<div class=\"histograminfolder\"><a href=\"$PAGE_LINK\"><img src=\"${HISTOGRAM_LINK}\" alt=\"Histogram for $BASE\" title=\"Histogram for $BASE\" width=\"$HISTOGRAM_WIDTH\" height=\"$HISTOGRAM_HEIGHT\"/></a></div>"$'\n' # THUMBS_HTML="${THUMBS_HTML}<a class=\"thumblink\" href=\"$PAGE_LINK\"><img class=\"thumbimg\" src=\"${THUMB_LINK}\" alt=\"$BASE\" title=\"$BASE\" width=\"$THUMB_WIDTH\" height=\"$THUMB_HEIGHT\"/></a>"$'\n' PREV_IMAGE=$I done - IMAGES_HTML="${IMAGES_HTML}</table>"$'\n' fi local SUBS=`ls "$SRC_FOLDER"` @@ -938,7 +937,7 @@ function makeIndex() { fi popd > /dev/null - # UP, PARENT, SRC_FOLDER, DEST_FOLDER, IMAGES_HTML, THUMBS_HTML, HISTOGRAMS_HTML, SUBFOLDERS_HTML, EDITION_HTML, SNIPPET + # UP, PARENT, SRC_FOLDER, DEST_FOLDER, ILIST_HTML, THUMBS_HTML, HISTOGRAMS_HTML, SUBFOLDERS_HTML, EDITION_HTML, SNIPPET ctemplate $FOLDER_TEMPLATE > $PP # Generate pages for sub folders diff --git a/web/folder_template.html b/web/folder_template.html index ffda0d3ecdf7b301e84c0d4f2bbe956874f2cb1e..24d3168dd01faa1df707ee967092696d5e6c7aa7 100644 --- a/web/folder_template.html +++ b/web/folder_template.html @@ -19,11 +19,16 @@ <div class="images"> <h2>Pages</h2> <p><input type="checkbox" id="toggle_blown_thumbs" onClick="toggleBlownThumbs();">Show absolute black and white</input><br/><input type="checkbox" id="toggle_histograms" onClick="toggleHistograms();">Histogram view</input></p> + <div class="thumbs">${THUMBS_HTML}</div> + <div class="histograms">${HISTOGRAMS_HTML}</div> -<div class="imagelinks"> -${IMAGES_HTML} -</div> +<!-- http://www.kryogenix.org/code/browser/sorttable/ --> + +<div class="imagelinks"><table class="imagelinks sortable"><tr><th>Image</th> <th>Dark</th> <th>Spike</th> <th>Light</th> <th>Unique</th> <th>Holes</th> <th>OCR</th> <th>KB</th> <th>MP</th></tr> +${ILIST_HTML} +</table></div> + </div> <div class="subfolders"> diff --git a/web/image_template.html b/web/image_template.html index 6e3d43696827358a219d58a04b6884163a66ddf3..9b83099e96650e3167578408af33c4951abdfd71 100644 --- a/web/image_template.html +++ b/web/image_template.html @@ -103,7 +103,7 @@ ALTO-PC: ${ACCURACY}% <!-- TODO: Create decent bread crumbs --> <p>Parent folder: <a href="index.html">${PARENT}</a></p> -<p>Source: ${SOURCE} (${SOURCE_SIZE} KB)</p> +<p>Source: ${SOURCE} (${SOURCE_SIZE} KB, ${IMAGE_MP} MP)</p> <p>Direct: <a href="${IMAGE}">${IMAGE}</a></p> <div class="alto"> diff --git a/web/imagelink_template.html b/web/imagelink_template.html index fab02da498eddc96defd5aa445359d8df0265893..6b7e344e52a8f73758d190040636777255319880 100644 --- a/web/imagelink_template.html +++ b/web/imagelink_template.html @@ -7,4 +7,5 @@ <td>${GREY_HOLES}</td> <td>${ACCURACY}%</td> <td>${SOURCE_SIZE}</td> + <td>${IMAGE_MP}</td> </tr>