diff options
| author | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2010-10-30 19:57:54 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2010-10-30 19:57:54 +0200 |
| commit | 96bb4779d6c28be3e598266cff2dbd71ada82242 (patch) | |
| tree | 5a5038247377a7cbe71ae440c9cd8f64ef99ffea | |
| parent | cd37dc9ed94f0fa8738396c9a18a0c398f52694c (diff) | |
| download | cataract-96bb4779d6c28be3e598266cff2dbd71ada82242.tar.xz | |
Write image sizes for thumbnails in HTML files
| -rw-r--r-- | src/generators.c | 11 | ||||
| -rw-r--r-- | templates/template-album.tmpl | 6 | ||||
| -rw-r--r-- | templates/template-index.tmpl | 6 |
3 files changed, 16 insertions, 7 deletions
diff --git a/src/generators.c b/src/generators.c index cf32819..75c1209 100644 --- a/src/generators.c +++ b/src/generators.c @@ -276,6 +276,7 @@ write_html_album (TGallerySetup *setup, int bb; int i; unsigned int real_total_items; + unsigned long img_thumb_w, img_thumb_h; ReplaceTable *global_replace_table; ReplaceTable *local_replace_table; BlockParser *block_parser; @@ -472,8 +473,16 @@ write_html_album (TGallerySetup *setup, replace_table_add_key (local_replace_table, "IMG_FILENAME", s3); g_free (s3); s3 = item_get_thumbnail_src (setup, items, item, i); - if (s3 != NULL) + if (s3 != NULL) { replace_table_add_key_printf (local_replace_table, "IMG_THUMBNAIL", "%s/%s", setup->thumbnail_dir, s3); + s5 = g_path_get_dirname (dst); + s4 = g_build_filename (s5, setup->thumbnail_dir, s3, NULL); + get_image_sizes (s4, &img_thumb_w, &img_thumb_h); + g_free (s5); + g_free (s4); + replace_table_add_key_int (local_replace_table, "IMG_SIZE_THUMB_W", img_thumb_w); + replace_table_add_key_int (local_replace_table, "IMG_SIZE_THUMB_H", img_thumb_h); + } g_free (s3); replace_table_add_key (local_replace_table, "IMG_TITLE", item->title); replace_table_add_key (local_replace_table, "IMG_DESCRIPTION", item->title_description); diff --git a/templates/template-album.tmpl b/templates/template-album.tmpl index aaff9ef..0162f68 100644 --- a/templates/template-album.tmpl +++ b/templates/template-album.tmpl @@ -37,7 +37,7 @@ <!-- $(BEGIN_IMG_LIST_LANDSCAPE) --> <div class="album_item" id="$(IMG_LIST_ID)"> <a href="$(IMG_SUBPAGE)"> - <img src="$(IMG_THUMBNAIL)" alt="$(IMG_TITLE)" /> + <img src="$(IMG_THUMBNAIL)" width="$(IMG_SIZE_THUMB_W)" height="$(IMG_SIZE_THUMB_H)" alt="$(IMG_TITLE)" /> <span class="album_thumb_text"><!-- $(IMG_FILENAME) --></span> </a> </div> @@ -45,7 +45,7 @@ <!-- $(BEGIN_IMG_LIST_PORTRAIT) --> <div class="album_item" id="$(IMG_LIST_ID)"> <a href="$(IMG_SUBPAGE)"> - <img src="$(IMG_THUMBNAIL)" alt="$(IMG_TITLE)" class="portrait" /> + <img src="$(IMG_THUMBNAIL)" width="$(IMG_SIZE_THUMB_W)" height="$(IMG_SIZE_THUMB_H)" alt="$(IMG_TITLE)" class="portrait" /> <span class="album_thumb_text"><!-- $(IMG_FILENAME) --></span> </a> </div> @@ -53,7 +53,7 @@ <!-- $(BEGIN_IMG_LIST_SQUARED) --> <div class="album_item" id="$(IMG_LIST_ID)"> <a href="$(IMG_SUBPAGE)"> - <img src="$(IMG_THUMBNAIL)" alt="$(IMG_TITLE)" class="squared" /> + <img src="$(IMG_THUMBNAIL)" width="$(IMG_SIZE_THUMB_W)" height="$(IMG_SIZE_THUMB_H)" alt="$(IMG_TITLE)" class="squared" /> <span class="album_thumb_text"><!-- $(IMG_FILENAME) --></span> </a> </div> diff --git a/templates/template-index.tmpl b/templates/template-index.tmpl index 77504e7..6c91b76 100644 --- a/templates/template-index.tmpl +++ b/templates/template-index.tmpl @@ -37,7 +37,7 @@ <!-- $(BEGIN_IMG_LIST_LANDSCAPE) --> <div class="index_item" id="$(IMG_LIST_ID)"> <a href="$(ALBUM_SUBPATH)"> - <img src="$(IMG_THUMBNAIL)" alt="" /> + <img src="$(IMG_THUMBNAIL)" width="$(IMG_SIZE_THUMB_W)" height="$(IMG_SIZE_THUMB_H)" alt="" /> <span class="album_text"><!-- $(IMG_TITLE) --></span><br /> <span class="album_subtext"><!-- $(IMG_DESCRIPTION) --></span> <span class="album_note">(<!-- $(ALBUM_NUM_ITEMS) --> items)</span> @@ -47,7 +47,7 @@ <!-- $(BEGIN_IMG_LIST_PORTRAIT) --> <div class="index_item" id="$(IMG_LIST_ID)"> <a href="$(ALBUM_SUBPATH)"> - <img src="$(IMG_THUMBNAIL)" alt="" /> + <img src="$(IMG_THUMBNAIL)" width="$(IMG_SIZE_THUMB_W)" height="$(IMG_SIZE_THUMB_H)" alt="" /> <span class="album_text_portrait"><!-- $(IMG_TITLE) --></span><br /> <span class="album_subtext_portrait"><!-- $(IMG_DESCRIPTION) --></span> <span class="album_note">(<!-- $(ALBUM_NUM_ITEMS) --> items)</span> @@ -57,7 +57,7 @@ <!-- $(BEGIN_IMG_LIST_SQUARED) --> <div class="index_item" id="$(IMG_LIST_ID)"> <a href="$(ALBUM_SUBPATH)"> - <img src="$(IMG_THUMBNAIL)" alt="" /> + <img src="$(IMG_THUMBNAIL)" width="$(IMG_SIZE_THUMB_W)" height="$(IMG_SIZE_THUMB_H)" alt="" /> <span class="album_text_squared"><!-- $(IMG_TITLE) --></span><br /> <span class="album_subtext_squared"><!-- $(IMG_DESCRIPTION) --></span> <span class="album_note">(<!-- $(ALBUM_NUM_ITEMS) --> items)</span> |