diff options
| -rw-r--r-- | install/config.sql | 6 | ||||
| -rw-r--r-- | themes/default/template/picture.tpl | 27 |
2 files changed, 14 insertions, 19 deletions
diff --git a/install/config.sql b/install/config.sql index f4e7ce7eb..9e10291c5 100644 --- a/install/config.sql +++ b/install/config.sql @@ -31,9 +31,9 @@ INSERT INTO piwigo_config (param,value,comment) VALUES ('obligatory_user_mail_ad INSERT INTO piwigo_config (param,value,comment) VALUES ('c13y_ignore',null,'List of ignored anomalies'); INSERT INTO piwigo_config (param,value,comment) VALUES ('extents_for_templates','a:0:{}','Actived template-extension(s)'); INSERT INTO piwigo_config (param,value,comment) VALUES ('blk_menubar','','Menubar options'); -INSERT INTO piwigo_config (param,value,comment) VALUES ('menubar_filter_icon','true','Display filter icon'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('menubar_filter_icon','false','Display filter icon'); INSERT INTO piwigo_config (param,value,comment) VALUES ('index_sort_order_input','true','Display image order selection list'); -INSERT INTO piwigo_config (param,value,comment) VALUES ('index_flat_icon','true','Display flat icon'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('index_flat_icon','false','Display flat icon'); INSERT INTO piwigo_config (param,value,comment) VALUES ('index_posted_date_icon','true','Display calendar by posted date'); INSERT INTO piwigo_config (param,value,comment) VALUES ('index_created_date_icon','true','Display calendar by creation date icon'); INSERT INTO piwigo_config (param,value,comment) VALUES ('index_slideshow_icon','true','Display slideshow icon'); @@ -48,7 +48,7 @@ INSERT INTO piwigo_config (param,value,comment) VALUES ('picture_menu','false',' INSERT INTO piwigo_config (param,value,comment) VALUES ( 'picture_informations', - 'a:11:{s:6:"author";b:1;s:10:"created_on";b:1;s:9:"posted_on";b:1;s:10:"dimensions";b:1;s:4:"file";b:1;s:8:"filesize";b:1;s:4:"tags";b:1;s:10:"categories";b:1;s:6:"visits";b:1;s:12:"rating_score";b:1;s:13:"privacy_level";b:1;}', + 'a:11:{s:6:"author";b:1;s:10:"created_on";b:1;s:9:"posted_on";b:1;s:10:"dimensions";b:0;s:4:"file";b:0;s:8:"filesize";b:0;s:4:"tags";b:1;s:10:"categories";b:1;s:6:"visits";b:1;s:12:"rating_score";b:1;s:13:"privacy_level";b:1;}', 'Information displayed on picture page' ); INSERT INTO piwigo_config (param,value,comment) VALUES ('week_starts_on','monday','Monday may not be the first day of the week'); diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index fb7fddf72..87d813713 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -161,16 +161,16 @@ y.callService( <dl id="standard" class="imageInfoTable infoTable"> {strip} - {if $display_info.author} + {if $display_info.author and isset($INFO_AUTHOR)} <div id="Author" class="imageInfo"> <dt>{'Author'|@translate}</dt> - <dd>{if isset($INFO_AUTHOR)}{$INFO_AUTHOR}{else}{'N/A'|@translate}{/if}</dd> + <dd>{$INFO_AUTHOR}</dd> </div> {/if} - {if $display_info.created_on} + {if $display_info.created_on and isset($INFO_CREATION_DATE)} <div id="datecreate" class="imageInfo"> <dt>{'Created on'|@translate}</dt> - <dd>{if isset($INFO_CREATION_DATE)}{$INFO_CREATION_DATE}{else}{'N/A'|@translate}{/if}</dd> + <dd>{$INFO_CREATION_DATE}</dd> </div> {/if} {if $display_info.posted_on} @@ -179,10 +179,10 @@ y.callService( <dd>{$INFO_POSTED_DATE}</dd> </div> {/if} - {if $display_info.dimensions} + {if $display_info.dimensions and isset($INFO_DIMENSIONS)} <div id="Dimensions" class="imageInfo"> <dt>{'Dimensions'|@translate}</dt> - <dd>{if isset($INFO_DIMENSIONS)}{$INFO_DIMENSIONS}{else}{'N/A'|@translate}{/if}</dd> + <dd>{$INFO_DIMENSIONS}</dd> </div> {/if} {if $display_info.file} @@ -191,34 +191,29 @@ y.callService( <dd>{$INFO_FILE}</dd> </div> {/if} - {if $display_info.filesize} + {if $display_info.filesize and isset($INFO_FILESIZE)} <div id="Filesize" class="imageInfo"> <dt>{'Filesize'|@translate}</dt> - <dd>{if isset($INFO_FILESIZE)}{$INFO_FILESIZE}{else}{'N/A'|@translate}{/if}</dd> + <dd>{$INFO_FILESIZE}</dd> </div> {/if} - {if $display_info.tags } + {if $display_info.tags and isset($related_tags)} <div id="Tags" class="imageInfo"> <dt>{'Tags'|@translate}</dt> <dd> - {if isset($related_tags)} - {foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}<a href="{$tag.URL}">{$tag.name}</a>{/foreach} - {else} - {/if} + {foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}<a href="{$tag.URL}">{$tag.name}</a>{/foreach} </dd> </div> {/if} - {if $display_info.categories} + {if $display_info.categories and isset($related_categories)} <div id="Categories" class="imageInfo"> <dt>{'Albums'|@translate}</dt> <dd> - {if isset($related_categories)} <ul> {foreach from=$related_categories item=cat} <li>{$cat}</li> {/foreach} </ul> - {/if} </dd> </div> {/if} |