Skip to content

Commit

Permalink
feature 2600: less info displayed by default
Browse files Browse the repository at this point in the history 
On picture.php, if there is no data, hide author/tags/date creation/dimensions/filesize

By default on picture.php, do not show file/filesize/dimensions

By default on index.php, hide the "filter" icon in the menubar, hide the "flat" icon (the concept is complex to understand) 


git-svn-id: http://piwigo.org/svn/trunk@13782 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
@plegall
plegall committed Mar 28, 2012
1 parent 379319d commit 03ed425
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 19 deletions.
6 changes: 3 additions & 3 deletions install/config.sql
View file
Expand Up @@ -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');
Expand All @@ -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');
Expand Down
27 changes: 11 additions & 16 deletions themes/default/template/picture.tpl
View file
Expand Up @@ -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}
Expand All @@ -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}
Expand All @@ -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}&nbsp;
{/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}
Expand Down

0 comments on commit 03ed425

Please sign in to comment.