Changeset 13782

Timestamp:

Mar 28, 2012, 11:00:24 AM (12 years ago)

Author:

plg

Message:

feature 2600: less info displayed by default

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)

Location:

trunk

Files:

• install/config.sql (modified) (2 diffs)
• themes/default/template/picture.tpl (modified) (4 diffs)

trunk/install/config.sql

@@ -32 +32 @@
 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');
@@ -49 +49 @@
   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'
   );

trunk/themes/default/template/picture.tpl

@@ -162 +162 @@
 <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>
-        </div>
-        {/if}
-        {if $display_info.created_on}
+                <dd>{$INFO_AUTHOR}</dd>
+        </div>
+        {/if}
+        {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}
@@ -180 +180 @@
         </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}
@@ -192 +192 @@
         </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>
-        </div>
-        {/if}
-        {if $display_info.tags }
+                <dd>{$INFO_FILESIZE}</dd>
+        </div>
+        {/if}
+        {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}
-                </dd>
-        </div>
-        {/if}
-        {if $display_info.categories}
+                {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 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}
@@ -219 +215 @@
                                 {/foreach}
                         </ul>
-                        {/if}
                 </dd>
         </div>