Changeset 31343

Timestamp:

Jan 27, 2016, 8:28:47 PM (8 years ago)

Author:

pjgust

Message:

Rewritten DL block with class "imageInfoTable" does not conditionalize the standard fields to respect the admin display options (e.g. Show Creation Date) as does the code in the 'picture.tpl' file. Added code to to conditionalize these standard fields.

File:

• extensions/manage_properties_photos/initpicture.php (modified) (3 diffs)

extensions/manage_properties_photos/initpicture.php

@@ -17 +17 @@
    $repla='<dl id="standard" class="imageInfoTable">{strip}
 {foreach from=$add_info_photos item=addinfophotos}
-    {if $addinfophotos.AIPID == 1 and isset($INFO_AUTHOR)}
+    {if $addinfophotos.AIPID == 1 and $display_info.author and isset($INFO_AUTHOR)}
         <div id="Author" class="imageInfo">
                 <dt>{\'Author\'|@translate}</dt>
                 <dd>{$INFO_AUTHOR}</dd>
         </div>
-    {else if $addinfophotos.AIPID == 2 and isset($INFO_CREATION_DATE)}
+    {else if $addinfophotos.AIPID == 2 and $display_info.created_on and isset($INFO_CREATION_DATE)}
         <div id="datecreate" class="imageInfo">
                 <dt>{\'Created on\'|@translate}</dt>
                 <dd>{$INFO_CREATION_DATE}</dd>
         </div>
-    {else if $addinfophotos.AIPID == 3 and isset($INFO_CREATION_DATE)}
+    {else if $addinfophotos.AIPID == 3 and $display_info.posted_on and isset($INFO_POSTED_DATE)}
         <div id="datepost" class="imageInfo">
                 <dt>{\'Posted on\'|@translate}</dt>
                 <dd>{$INFO_POSTED_DATE}</dd>
         </div>
-    {else if $addinfophotos.AIPID == 4 and isset($INFO_DIMENSIONS)}
+    {else if $addinfophotos.AIPID == 4 and $display_info.dimensions and isset($INFO_DIMENSIONS)}
         <div id="Dimensions" class="imageInfo">
                 <dt>{\'Dimensions\'|@translate}</dt>
                 <dd>{$INFO_DIMENSIONS}</dd>
         </div>
-    {else if $addinfophotos.AIPID == 5}
+    {else if $addinfophotos.AIPID == 5 and $display_info.file}
         <div id="File" class="imageInfo">
                 <dt>{\'File\'|@translate}</dt>
                 <dd>{$INFO_FILE}</dd>
         </div>
-    {else if $addinfophotos.AIPID == 6 and isset($INFO_FILESIZE)}
+    {else if $addinfophotos.AIPID == 6 and $display_info.filesize and isset($INFO_FILESIZE)}
         <div id="Filesize" class="imageInfo">
                 <dt>{\'Filesize\'|@translate}</dt>
                 <dd>{$INFO_FILESIZE}</dd>
         </div>
-    {else if $addinfophotos.AIPID == 7 and isset($related_tags)}
+    {else if $addinfophotos.AIPID == 7 and $display_info.tags and isset($related_tags)}
         <div id="Tags" class="imageInfo">
         <dt>{\'Tags\'|@translate}</dt>
@@ -54 +54 @@
                 </dd>
         </div>
-    {else if $addinfophotos.AIPID == 8 and isset($related_categories)}
+    {else if $addinfophotos.AIPID == 8 and $display_info.categories and isset($related_categories)}
         <div id="Categories" class="imageInfo">
             <dt>{\'Albums\'|@translate}</dt>
@@ -65 +65 @@
             </dd>
         </div>
-    {else if $addinfophotos.AIPID == 9}
+    {else if $addinfophotos.AIPID == 9 and $display_info.visits}
         <div id="Visits" class="imageInfo">
                 <dt>{\'Visits\'|@translate}</dt>
                 <dd>{$INFO_VISITS}</dd>
         </div>
-    {else if $addinfophotos.AIPID == 10 and isset($rate_summary)}
+    {else if $addinfophotos.AIPID == 10 and $display_info.rating_score and isset($rate_summary)}
         <div id="Average" class="imageInfo">
                 <dt>{\'Rating score\'|@translate}</dt>