diff options
| -rw-r--r-- | sample/src/setup.xml | 3 | ||||
| -rw-r--r-- | src/generators.c | 9 | ||||
| -rw-r--r-- | src/setup.c | 1 | ||||
| -rw-r--r-- | src/setup.h | 1 | ||||
| -rw-r--r-- | templates/default.xml | 2 | ||||
| -rw-r--r-- | templates/template_picture.html | 4 |
6 files changed, 4 insertions, 16 deletions
diff --git a/sample/src/setup.xml b/sample/src/setup.xml index 8ccde39..6ebb46c 100644 --- a/sample/src/setup.xml +++ b/sample/src/setup.xml @@ -79,9 +79,6 @@ And the second line.</add_copyright> <!-- enabled: show "Go Up..." links if not top-level (default) --> <!-- disabled: never show that link --> <show_go_up value="yes" /> - - <!-- show/hide exif table in single photo view (default = yes) --> - <show_exif_table value="yes" /> </navigation> <feed enable="yes"> diff --git a/src/generators.c b/src/generators.c index c27b2e5..168c5b0 100644 --- a/src/generators.c +++ b/src/generators.c @@ -883,7 +883,6 @@ write_html_image (TGallerySetup *setup, /* Setup block parser */ block_parser_register_key (block_parser, "IMG_FULLSIZE_LINK", "IMG_FULLSIZE_LINK"); - block_parser_register_key (block_parser, "EXIF_TABLE", "EXIF_TABLE"); /* Read through the template and replace placeholders with real data */ @@ -901,14 +900,6 @@ write_html_image (TGallerySetup *setup, } g_free (block); } - if (block_parser_has_unused_data (block_parser, "EXIF_TABLE")) { - block = block_parser_get_data (block_parser, "EXIF_TABLE"); - if (block) { - replace_table_process (&block, replace_table); - replace_table_add_key (replace_table, "EXIF_TABLE", setup->show_exif_table ? block : ""); - } - g_free (block); - } /* Replace all known tags */ replace_table_process (&line, replace_table); diff --git a/src/setup.c b/src/setup.c index 2d7fbac..48e03c5 100644 --- a/src/setup.c +++ b/src/setup.c @@ -117,7 +117,6 @@ parse_setup_xml (const gchar *filename) /* navigation section */ setup->use_inpage_links = xml_file_get_node_attribute_boolean (xml, "/gallery_setup/navigation/use_inpage_links", "value", TRUE); setup->show_go_up = xml_file_get_node_attribute_boolean (xml, "/gallery_setup/navigation/show_go_up", "value", TRUE); - setup->show_exif_table = xml_file_get_node_attribute_boolean (xml, "/gallery_setup/navigation/show_exif_table", "value", TRUE); /* feed section */ setup->feed_enabled = xml_file_get_node_attribute_boolean (xml, "/gallery_setup/feed", "enable", FALSE); diff --git a/src/setup.h b/src/setup.h index 75cbef7..7b98634 100644 --- a/src/setup.h +++ b/src/setup.h @@ -73,7 +73,6 @@ typedef struct { /* navigation section */ gboolean use_inpage_links; gboolean show_go_up; - gboolean show_exif_table; /* feed section */ gboolean feed_enabled; diff --git a/templates/default.xml b/templates/default.xml index 83a1c1a..826133a 100644 --- a/templates/default.xml +++ b/templates/default.xml @@ -99,6 +99,8 @@ <!-- image border style, overriden by <border style> tags from the album source file --> <define name="BORDER_STYLE" value="border_single" /> + <!-- show EXIF table in single photo view (comment out to hide it) --> + <define name="SHOW_EXIF_TABLE" /> </theme> <!-- Here you can define another theme, with different templates etc. diff --git a/templates/template_picture.html b/templates/template_picture.html index d9b72b2..bce658e 100644 --- a/templates/template_picture.html +++ b/templates/template_picture.html @@ -41,7 +41,7 @@ <!-- $(END_IMG_FULLSIZE_LINK) --> </div> - <!-- $(BEGIN_EXIF_TABLE) --> + <!-- $(ifdef(SHOW_EXIF_TABLE)) --> <!-- ## EXIF --> <div class="exif"> <div id="exif_table" style="display: none;"> @@ -60,7 +60,7 @@ :: <a href="javascript: set_exif_table_visibility('yes'); write_exif_table_cookie('yes');">Show EXIF</a> </div> </div> - <!-- $(END_EXIF_TABLE) --> + <!-- $(endif(SHOW_EXIF_TABLE)) --> <!-- ## Footnote, also acts as a bottom border --> <div class="footnote"> |