Changeset 13549 for extensions/simple_themes/simple/template/picture.tpl

Timestamp:

Mar 14, 2012, 2:34:13 PM (12 years ago)

Author:

plg

Message:

import theme Simple version 2.3

• if cl_conflit is used, don't add jQuery.noConflict
• fix the possibility to toggle visibility of image informations
• show logout link when connected - thanks to gbo
• update jquery to 1.4.4
• backport commit from piwigo: r6244, r6430 & r6438
• add gitignore
• update javascripts + add script to combine/minify
• apply r6594 from piwigo's trunk
• move jquery in the header, using known_script
• translation for the menu title
• add 1px icon start_filter.png to avoid loading error with rvtree plugin
• margin for error & info divs

File:

• extensions/simple_themes/simple/template/picture.tpl (modified) (3 diffs)

extensions/simple_themes/simple/template/picture.tpl

@@ -80 +80 @@
     <div id="imageInfos">
       <dl>
-        {if $display_info.author}
+        {if $display_info.author and isset($INFO_AUTHOR)}
         <dt>{'Author'|@translate}</dt>
         <dd>{$INFO_AUTHOR}</dd>
         {/if}
-         {if $display_info.created_on}
+        {if $display_info.created_on and isset($INFO_CREATION_DATE)}
         <dt>{'Created on'|@translate}</dt>
         <dd>{$INFO_CREATION_DATE}</dd>
         {/if}
-                 {if $display_info.posted_on}
+        {if $display_info.posted_on}
         <dt>{'Posted on'|@translate}</dt>
         <dd>{$INFO_POSTED_DATE}</dd>
-                {/if}
-        {if isset($related_tags)}
+        {/if}
+        {if $display_info.tags and isset($related_tags)}
         <dt>{'Tags'|@translate}</dt>
-        <dd>{foreach from=$related_tags item=tag name=tag_loop}
+        <dd>
+          {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>
+          <a href="{$tag.URL}">{$tag.name}</a>{/foreach}
+        </dd>
         {/if}
-         {if $display_info.tags}
+        {if $display_info.categories and isset($related_categories)}
         <dt>{'Categories'|@translate}</dt>
         <dd>
           {foreach from=$related_categories item=cat name=tag_loop}
-          {if !$smarty.foreach.tag_loop.first}, {/if} {'&nbsp;'|@str_ireplace:'&#32;':$cat}{/foreach}
+          {if !$smarty.foreach.tag_loop.first}, {/if}
+          {'&nbsp;'|@str_ireplace:'&#32;':$cat}{/foreach}
         </dd>
         {/if}
-                 {if $display_info.visits}
+        {if $display_info.visits}
         <dt>{'Visits'|@translate}</dt>
         <dd>{$INFO_VISITS}</dd>
-                 {/if}
-        {if $display_info.average_rate and isset($rate_summary) }
+        {/if}
+        {if $display_info.average_rate}
+        {if isset($rate_summary)}
         <dt>{'Average rate'|@translate}</dt>
         <dd id="ratingSummary">
@@ -133 +137 @@
               {/if}
               {/foreach}
-              <script type="text/javascript" src="{$ROOT_URL}themes/{$themeconf.theme_dir}/js/rating.min.js"></script>
               <script type="text/javascript">
                 makeNiceRatingForm( {ldelim}rootUrl: '{$ROOT_URL|@escape:"javascript"}',
@@ -145 +148 @@
           </form>
         </dd>
+        {/if}
         {/if}
       </dl>