picture, footer and picture modify template migration

git-svn-id: http://piwigo.org/svn/trunk@2227 68402e56-0260-453c-a942-63ccdbb3a9ee

5 files changed, 345 insertions, 323 deletions

diff --git a/template/yoga/admin/picture_modify.tpl b/template/yoga/admin/picture_modify.tpl
index b0fe64911..2dada069f 100644
--- a/template/yoga/admin/picture_modify.tpl
+++ b/template/yoga/admin/picture_modify.tpl
@@ -1,129 +1,125 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
-<h2>{lang:title_picmod}</h2>
+{* $Id$ *}
+<h2>{'title_picmod'|@translate}</h2>
 
-<img src="{TN_SRC}" alt="{lang:thumbnail}" class="thumbnail" />
+<img src="{$TN_SRC}" alt="{'thumbnail'|@translate}" class="thumbnail" />
 
 <ul class="categoryActions">
-  <!-- BEGIN jumpto -->
-  <li><a href="{jumpto.URL}" title="{lang:jump to image}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to image}" /></a></li>
-  <!-- END jumpto -->
-  <li><a href="{U_SYNC}" title="{lang:synchronize metadata}" {TAG_INPUT_ENABLED}><img src="{themeconf:icon_dir}/sync_metadata.png" class="button" alt="{lang:synchronize}" /></a></li>
+  {if isset($U_JUMPTO) }
+  <li><a href="{$U_JUMPTO}" title="{'jump to image'|@translate}"><img src="{$themeconf.icon_dir}/category_jump-to.png" class="button" alt="{'jump to image'|@translate}" /></a></li>
+  {/if}
+  <li><a href="{$U_SYNC}" title="{'synchronize metadata'|@translate}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.icon_dir}/sync_metadata.png" class="button" alt="{'synchronize'|@translate}" /></a></li>
 </ul>
 
-<form action="{F_ACTION}" method="post" id="properties">
+<form action="{$F_ACTION}" method="post" id="properties">
 
   <fieldset>
-    <legend>{lang:Informations}</legend>
+    <legend>{'Informations'|@translate}</legend>
 
     <table>
 
       <tr>
-        <td><strong>{lang:Path}</strong></td>
-        <td>{PATH}</td>
+        <td><strong>{'Path'|@translate}</strong></td>
+        <td>{$PATH}</td>
       </tr>
 
       <tr>
-        <td><strong>{lang:Post date}</strong></td>
-        <td>{REGISTRATION_DATE}</td>
+        <td><strong>{'Post date'|@translate}</strong></td>
+        <td>{$REGISTRATION_DATE}</td>
       </tr>
 
       <tr>
-        <td><strong>{lang:Dimensions}</strong></td>
-        <td>{DIMENSIONS}</td>
+        <td><strong>{'Dimensions'|@translate}</strong></td>
+        <td>{$DIMENSIONS}</td>
       </tr>
 
       <tr>
-        <td><strong>{lang:Filesize}</strong></td>
-        <td>{FILESIZE}</td>
+        <td><strong>{'Filesize'|@translate}</strong></td>
+        <td>{$FILESIZE}</td>
       </tr>
 
-<!-- BEGIN high -->
+{if isset($HIGH_FILESIZE) }
       <tr>
-        <td><strong>{lang:High filesize}</strong></td>
-        <td>{high.FILESIZE}</td>
+        <td><strong>{'High filesize'|@translate}</strong></td>
+        <td>{$HIGH_FILESIZE}</td>
       </tr>
-<!-- END high -->
+{/if}
 
       <tr>
-        <td><strong>{lang:Storage category}</strong></td>
-        <td>{STORAGE_CATEGORY}</td>
+        <td><strong>{'Storage category'|@translate}</strong></td>
+        <td>{$STORAGE_CATEGORY}</td>
       </tr>
 
-      <!-- BEGIN links -->
+      {if isset($related_categories) }
       <tr>
-        <td><strong>{lang:Linked categories}</strong></td>
+        <td><strong>{'Linked categories'|@translate}</strong></td>
         <td>
           <ul>
-            <!-- BEGIN category -->
-            <li>{links.category.NAME}</li>
-            <!-- END category -->
+            {foreach from=$related_categories item=name}
+            <li>{$name}</li>
+            {/foreach}
           </ul>
         </td>
       </tr>
-      <!-- END links -->
+      {/if}
 
     </table>
 
   </fieldset>
 
   <fieldset>
-    <legend>{lang:Properties}</legend>
+    <legend>{'Properties'|@translate}</legend>
 
     <table>
 
       <tr>
-        <td><strong>{lang:Name}</strong></td>
-        <td><input type="text" name="name" value="{NAME}" /></td>
+        <td><strong>{'Name'|@translate}</strong></td>
+        <td><input type="text" name="name" value="{$NAME}" /></td>
       </tr>
 
       <tr>
-        <td><strong>{lang:Author}</strong></td>
-        <td><input type="text" name="author" value="{AUTHOR}" /></td>
+        <td><strong>{'Author'|@translate}</strong></td>
+        <td><input type="text" name="author" value="{$AUTHOR}" /></td>
       </tr>
 
       <tr>
-        <td><strong>{lang:Creation date}</strong></td>
+        <td><strong>{'Creation date'|@translate}</strong></td>
         <td>
-          <label><input type="radio" name="date_creation_action" value="unset" /> {lang:unset}</label>
-          <input type="radio" name="date_creation_action" value="set" id="date_creation_action_set" /> {lang:set to}
+          <label><input type="radio" name="date_creation_action" value="unset" /> {'unset'|@translate}</label>
+          <input type="radio" name="date_creation_action" value="set" id="date_creation_action_set" /> {'set to'|@translate}
           <select onmousedown="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_day">
-            <!-- BEGIN date_creation_day -->
-            <option {date_creation_day.SELECTED} value="{date_creation_day.VALUE}">{date_creation_day.OPTION}</option>
-            <!-- END date_creation_day -->
+            <option value="0">--</option>
+            {section name=day start=1 loop=31}
+              <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$DATE_CREATION_DAY_VALUE}selected="selected"{/if}>{$smarty.section.day.index}</option>
+            {/section}
           </select>
           <select onmousedown="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_month">
-            <!-- BEGIN date_creation_month -->
-            <option {date_creation_month.SELECTED} value="{date_creation_month.VALUE}">{date_creation_month.OPTION}</option>
-            <!-- END date_creation_month -->
+            {html_options options=$month_list selected=$DATE_CREATION_MONTH_VALUE}
           </select>
           <input onmousedown="document.getElementById('date_creation_action_set').checked = true;"
                  name="date_creation_year"
                  type="text"
                  size="4"
                  maxlength="4"
-                 value="{DATE_CREATION_YEAR_VALUE}" />
+                 value="{$DATE_CREATION_YEAR_VALUE}" />
         </td>
       </tr>
 
       <tr>
-        <td><strong>{lang:Tags}</strong></td>
-        <td>{TAG_SELECTION}</td>
+        <td><strong>{'Tags'|@translate}</strong></td>
+        <td>{$TAG_SELECTION}</td>
       </tr>
 
 
       <tr>
-        <td><strong>{lang:Description}</strong></td>
-        <td><textarea name="description" class="description">{DESCRIPTION}</textarea></td>
+        <td><strong>{'Description'|@translate}</strong></td>
+        <td><textarea name="description" class="description">{$DESCRIPTION}</textarea></td>
       </tr>
 
 	<tr>
-		<td><strong>{lang:Minimum privacy level}</strong></td>
+		<td><strong>{'Minimum privacy level'|@translate}</strong></td>
 		<td>
 			<select name="level" size="1">
-			<!-- BEGIN level_option -->
-			<option {level_option.SELECTED} value="{level_option.VALUE}">{level_option.CONTENT} ({level_option.VALUE})</option>
-			<!-- END level_option -->
+  			{html_options options=$level_options selected=$level_options_selected}
 			</select>
 	  </td>
 	</tr>
@@ -131,38 +127,34 @@
     </table>
 
     <p style="text-align:center;">
-      <input class="submit" type="submit" value="{lang:Submit}" name="submit" {TAG_INPUT_ENABLED}/>
-      <input class="submit" type="reset" value="{lang:Reset}" name="reset" />
+      <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/>
+      <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" />
     </p>
 
   </fieldset>
 
 </form>
 
-<form id="associations" method="post" action="{F_ACTION}#associations">
+<form id="associations" method="post" action="{$F_ACTION}#associations">
   <fieldset>
-    <legend>{lang:Association to categories}</legend>
+    <legend>{'Association to categories'|@translate}</legend>
 
     <table class="doubleSelect">
       <tr>
         <td>
-          <h3>{lang:Associated}</h3>
+          <h3>{'Associated'|@translate}</h3>
           <select class="categoryList" name="cat_associated[]" multiple="multiple" size="30">
-            <!-- BEGIN associated_option -->
-            <option {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
-            <!-- END associated_option -->
+            {html_options options=$associated_options}
           </select>
-          <p><input class="submit" type="submit" value="&raquo;" name="dissociate" style="font-size:15px;" {TAG_INPUT_ENABLED}/></p>
+          <p><input class="submit" type="submit" value="&raquo;" name="dissociate" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p>
         </td>
 
         <td>
-          <h3>{lang:Dissociated}</h3>
+          <h3>{'Dissociated'|@translate}</h3>
           <select class="categoryList" name="cat_dissociated[]" multiple="multiple" size="30">
-            <!-- BEGIN dissociated_option -->
-            <option {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
-            <!-- END dissociated_option -->
+            {html_options options=$dissociated_options}
           </select>
-          <p><input class="submit" type="submit" value="&laquo;" name="associate" style="font-size:15px;" {TAG_INPUT_ENABLED}/></p>
+          <p><input class="submit" type="submit" value="&laquo;" name="associate" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p>
         </td>
       </tr>
     </table>
@@ -170,30 +162,26 @@
   </fieldset>
 </form>
 
-<form id="representation" method="post" action="{F_ACTION}#representation">
+<form id="representation" method="post" action="{$F_ACTION}#representation">
   <fieldset>
-    <legend>{lang:Representation of categories}</legend>
+    <legend>{'Representation of categories'|@translate}</legend>
 
     <table class="doubleSelect">
       <tr>
         <td>
-          <h3>{lang:Represents}</h3>
+          <h3>{'Represents'|@translate}</h3>
           <select class="categoryList" name="cat_elected[]" multiple="multiple" size="30">
-            <!-- BEGIN elected_option -->
-            <option {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
-            <!-- END elected_option -->
+            {html_options options=$elected_options}
           </select>
-          <p><input class="submit" type="submit" value="&raquo;" name="dismiss" style="font-size:15px;" {TAG_INPUT_ENABLED}/></p>
+          <p><input class="submit" type="submit" value="&raquo;" name="dismiss" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p>
         </td>
 
         <td>
-          <h3>{lang:Does not represent}</h3>
+          <h3>{'Does not represent'|@translate}</h3>
           <select class="categoryList" name="cat_dismissed[]" multiple="multiple" size="30">
-            <!-- BEGIN dismissed_option -->
-            <option {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
-            <!-- END dismissed_option -->
+            {html_options options=$dismissed_options}
           </select>
-          <p><input class="submit" type="submit" value="&laquo;" name="elect" style="font-size:15px;" {TAG_INPUT_ENABLED}/></p>
+          <p><input class="submit" type="submit" value="&laquo;" name="elect" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p>
         </td>
       </tr>
     </table>
diff --git a/template/yoga/footer.tpl b/template/yoga/footer.tpl
index e21969078..37aab1fba 100644
--- a/template/yoga/footer.tpl
+++ b/template/yoga/footer.tpl
@@ -1,31 +1,32 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 <div id="copyright">
  <a name="EoP"></a> <!-- End of Page -->
- <!-- BEGIN debug -->
- {lang:generation_time} {debug.TIME} ({debug.NB_QUERIES} {lang:sql_queries_in} {debug.SQL_TIME}) -
- <!-- END debug -->
+ {if isset($debug.TIME) }
+ {'generation_time'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'sql_queries_in'|@translate} {$debug.SQL_TIME}) -
+ {/if}
 
- <!-- Please, do not remove this copyright. If you really want to,
+ {* Please, do not remove this copyright. If you really want to,
       contact us on http://phpwebgallery.net to find a solution on how
-      to show the origin of the script...-->
+      to show the origin of the script...
+  *}
 
-  {lang:powered_by} 
+  {'powered_by'|@translate}
   <a href="http://www.phpwebgallery.net" class="PWG">
   <span class="P">Php</span><span class="W">Web</span><span class="G">Gallery</span></a>
-  {VERSION}
-  <!-- BEGIN contact -->
-  - {lang:send_mail}
-  <a href="mailto:{contact.MAIL}?subject={L_TITLE_MAIL}">{lang:Webmaster}</a>
-  <!-- END contact -->
+  {$VERSION}
+  {if isset($CONTACT_MAIL)}
+  - {'send_mail'|@translate}
+  <a href="mailto:{$CONTACT_MAIL}?subject={'title_send_mail'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
+  {/if}
 
 </div> <!-- copyright -->
-<!-- BEGIN footer_element -->
-{footer_element.CONTENT}
-<!-- END footer_element -->
+{if isset($footer_elemets)}
+{foreach from=$footer_elements item=v}
+{$v}
+{/foreach}
+{/if}
 </div> <!-- the_page -->
 
-<!-- BEGIN debug -->
-  {debug.QUERIES_LIST}
-<!-- END debug -->
+{if isset($debug.QUERIES_LIST)}{$debug.QUERIES_LIST}{/if}
 </body>
 </html>
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index ebfba0998..9f77b8b56 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -1,207 +1,230 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- BEGIN errors -->
+{* $Id$ *}
+{if isset($errors)}
 <div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.TEXT}</li>
-  <!-- END error -->
-</ul>
+  <ul>
+    {foreach from=$errors item=error}
+    <li>{$error}</li>
+    {/foreach}
+  </ul>
 </div>
-<!-- END errors -->
-<!-- BEGIN infos -->
+{/if}
+
+{if isset($infos)}
 <div class="infos">
-<ul>
-  <!-- BEGIN info -->
-  <li>{infos.info.TEXT}</li>
-  <!-- END info -->
-</ul>
+  <ul>
+    {foreach from=$infos item=info}
+    <li>{$info}</li>
+    {/foreach}
+  </ul>
 </div>
-<!-- END infos -->
+{/if}
 
 <div id="imageHeaderBar">
   <div class="browsePath">
-    <a href="{U_HOME}" rel="home">{lang:home}</a>
-    {LEVEL_SEPARATOR}{SECTION_TITLE}
-    {LEVEL_SEPARATOR}{PICTURE_TITLE}
+    <a href="{$U_HOME}" rel="home">{'home'|@translate}</a>
+    {$LEVEL_SEPARATOR}{$SECTION_TITLE}
+    {$LEVEL_SEPARATOR}{$current.TITLE}
   </div>
-  <div class="imageNumber">{PHOTO}</div>
-  <!-- BEGIN title -->
-  <h2>{TITLE}</h2>
-  <!-- END title -->
+  <div class="imageNumber">{$PHOTO}</div>
+  {if $SHOW_PICTURE_NAME_ON_TITLE }
+  <h2>{$current.TITLE}</h2>
+  {/if}
 </div>
 
 <div id="imageToolBar">
   <div class="randomButtons">
-    <!-- BEGIN start_slideshow -->
-      <a href="{start_slideshow.U_SLIDESHOW}" title="{lang:slideshow}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/slideshow.png" class="button" alt="{lang:slideshow}"></a>
-    <!-- END start_slideshow -->
-    <!-- BEGIN stop_slideshow -->
-      <a href="{stop_slideshow.U_SLIDESHOW}" title="{lang:slideshow_stop}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/stop_slideshow.png" class="button" alt="{lang:slideshow_stop}"></a>
-    <!-- END stop_slideshow -->
-      <a href="{U_METADATA}" title="{lang:picture_show_metadata}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/metadata.png" class="button" alt="{lang:picture_show_metadata}"></a>
-    <!-- BEGIN download -->
-      <a href="{download.U_DOWNLOAD}" title="{lang:download_hint}"><img src="{pwg_root}{themeconf:icon_dir}/save.png" class="button" alt="{lang:download}"></a>
-    <!-- END download -->
-      {PLUGIN_PICTURE_ACTIONS}
-    <!-- BEGIN favorite -->
-      <a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}"><img src="{favorite.FAVORITE_IMG}" class="button" alt="{favorite.FAVORITE_ALT}"></a>
-    <!-- END favorite -->
-    <!-- BEGIN representative -->
-      <a href="{representative.URL}" title="{lang:set as category representative}"><img src="{pwg_root}{themeconf:icon_dir}/representative.png" class="button" alt="{lang:representative}"></a>
-    <!-- END representative -->
-    <!-- BEGIN admin -->
-      <a href="{U_ADMIN}" title="{lang:link_info_image}"><img src="{pwg_root}{themeconf:icon_dir}/preferences.png" class="button" alt="{lang:link_info_image}"></a>
-    <!-- END admin -->
-    <!-- BEGIN caddie -->
-      <a href="{caddie.URL}" title="{lang:add to caddie}"><img src="{pwg_root}{themeconf:icon_dir}/caddie_add.png" class="button" alt="{lang:caddie}"></a>
-    <!-- END caddie -->
+    {if isset($U_SLIDESHOW_START) }
+      <a href="{$U_SLIDESHOW_START}" title="{'slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/slideshow.png" class="button" alt="{'slideshow'|@translate}"></a>
+    {/if}
+    {if isset($U_SLIDESHOW_STOP) }
+      <a href="{$U_SLIDESHOW_STOP}" title="{'slideshow_stop'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_slideshow.png" class="button" alt="{'slideshow_stop'|@translate}"></a>
+    {/if}
+      <a href="{$U_METADATA}" title="{'picture_show_metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="{'picture_show_metadata'|@translate}"></a>
+    {if isset($current.U_DOWNLOAD) }
+      <a href="{$current.U_DOWNLOAD}" title="{'download_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
+    {/if}
+    {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
+    {if isset($favorite) }
+      <a href="{$favorite.U_FAVORITE}" title="{$favorite.FAVORITE_HINT}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="{$favorite.FAVORITE_ALT}"></a>
+    {/if}
+    {if !empty($U_SET_AS_REPRESENTATIVE) }
+      <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as category representative'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/representative.png" class="button" alt="{'representative'|@translate}"></a>
+    {/if}
+    {if isset($U_ADMIN) }
+      <a href="{$U_ADMIN}" title="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'link_info_image'|@translate}"></a>
+    {/if}
+    {if isset($U_CADDIE) }
+      <a href="{$U_CADDIE}" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
+    {/if}
   </div>
-  {NAV_BUTTONS}
+  {include file=$FILE_PICTURE_NAV_BUTTONS}
 </div> <!-- imageToolBar -->
 
 <div id="theImage">
-{ELEMENT_CONTENT}
-<!-- BEGIN legend -->
-<p>{legend.COMMENT_IMG}</p>
-<!-- END legend -->
-<!-- BEGIN stop_slideshow -->
+{$ELEMENT_CONTENT}
+
+{if isset($COMMENT_IMG)}
+<p>{$COMMENT_IMG}</p>
+{/if}
+
+{if isset($U_SLIDESHOW_STOP) }
 <p>
-  [ <a href="{stop_slideshow.U_SLIDESHOW}">{lang:slideshow_stop}</a> ]
+  [ <a href="{$U_SLIDESHOW_STOP}">{'slideshow_stop'|@translate}</a> ]
 </p>
-<!-- END stop_slideshow -->
+{/if}
+
 </div>
 
-<!-- BEGIN previous -->
-<a class="navThumb" id="thumbPrev" href="{previous.U_IMG}" title="{lang:previous_page} : {previous.TITLE_IMG}" rel="prev">
-  <img src="{previous.IMG}" class="thumbLink" id="linkPrev" alt="{previous.TITLE_IMG}">
+{if isset($previous) }
+<a class="navThumb" id="thumbPrev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev">
+  <img src="{$previous.THUMB_SRC}" class="thumbLink" id="linkPrev" alt="{$previous.TITLE}">
 </a>
-<!-- END previous -->
-<!-- BEGIN next -->
-<a class="navThumb" id="thumbNext" href="{next.U_IMG}" title="{lang:next_page} : {next.TITLE_IMG}" rel="next">
-  <img src="{next.IMG}" class="thumbLink" id="linkNext" alt="{next.TITLE_IMG}">
+{/if}
+{if isset($next) }
+<a class="navThumb" id="thumbNext" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next">
+  <img src="{$next.THUMB_SRC}" class="thumbLink" id="linkNext" alt="{$next.TITLE}">
 </a>
-<!-- END next -->
+{/if}
 
 <table class="infoTable" summary="Some info about this picture">
   <tr>
-    <td class="label">{lang:Author}</td>
-    <td class="value">{INFO_AUTHOR}</td>
+    <td class="label">{'Author'|@translate}</td>
+    <td class="value">{if isset($INFO_AUTHOR)}{$INFO_AUTHOR}{else}{'N/A'|@translate}{/if}</td>
   </tr>
   <tr>
-    <td class="label">{lang:Created on}</td>
-    <td class="value">{INFO_CREATION_DATE}</td>
+    <td class="label">{'Created on'|@translate}</td>
+    <td class="value">{if isset($INFO_CREATION_DATE)}{$INFO_CREATION_DATE}{else}{'N/A'|@translate}{/if}</td>
   </tr>
   <tr>
-    <td class="label">{lang:Posted on}</td>
-    <td class="value">{INFO_POSTED_DATE}</td>
+    <td class="label">{'Posted on'|@translate}</td>
+    <td class="value">{$INFO_POSTED_DATE}</td>
   </tr>
   <tr>
-    <td class="label">{lang:Dimensions}</td>
-    <td class="value">{INFO_DIMENSIONS}</td>
+    <td class="label">{'Dimensions'|@translate}</td>
+    <td class="value">{if isset($INFO_DIMENSIONS)}{$INFO_DIMENSIONS}{else}{'N/A'|@translate}{/if}</td>
   </tr>
   <tr>
-    <td class="label">{lang:File}</td>
-    <td class="value">{INFO_FILE}</td>
+    <td class="label">{'File'|@translate}</td>
+    <td class="value">{$INFO_FILE}</td>
   </tr>
   <tr>
-    <td class="label">{lang:Filesize}</td>
-    <td class="value">{INFO_FILESIZE}</td>
+    <td class="label">{'Filesize'|@translate}</td>
+    <td class="value">{if isset($INFO_FILESIZE)}{$INFO_FILESIZE}{else}{'N/A'|@translate}{/if}</td>
   </tr>
   <tr>
-    <td class="label">{lang:Tags}</td>
-    <td class="value">{INFO_TAGS}</td>
+    <td class="label">{'Tags'|@translate}</td>
+    <td class="value">
+      {if isset($related_tags)}
+        {foreach from=$related_tags item=tag name=tag_loop}
+        {if !$smarty.foreach.tag_loop.first}, {/if}
+        <a href="{$tag.U_TAG}">{$tag.NAME}</a>
+        {/foreach}
+      {/if}
+    </td>
   </tr>
   <tr>
-    <td class="label">{lang:Categories}</td>
+    <td class="label">{'Categories'|@translate}</td>
     <td class="value">
+      {if isset($related_categories)}
       <ul>
-        <!-- BEGIN category -->
-        <li>{category.LINE}</li>
-        <!-- END category -->
+        {foreach from=$related_categories item=cat}
+        <li>{$cat}</li>
+        {/foreach}
       </ul>
+      {/if}
     </td>
   </tr>
   <tr>
-    <td class="label">{lang:Visits}</td>
-    <td class="value">{INFO_VISITS}</td>
+    <td class="label">{'Visits'|@translate}</td>
+    <td class="value">{$INFO_VISITS}</td>
   </tr>
-  <!-- BEGIN info_rate -->
+  {if isset($rate_summary) }
   <tr>
-    <td class="label">{lang:Average rate}</td>
-    <td class="value">{info_rate.CONTENT}</td>
+    <td class="label">{'Average rate'|@translate}</td>
+    <td class="value">
+    {if $rate_summary.count}
+      {assign var='rate_text' value='%.2f (rated %d times, standard deviation = %.2f)'|@translate }
+      {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count, $rate_summary.std) }
+    {else}
+      {'no_rate'|@translate}
+    {/if}
+    </td>
   </tr>
-  <!-- END info_rate -->
+  {/if}
 </table>
 
-<!-- BEGIN metadata -->
+{if isset($metadata)}
 <table class="infoTable" summary="Some more (technical) info about this picture">
-  <!-- BEGIN headline -->
+{foreach from=$metadata item=meta}
   <tr>
-    <th colspan="2">{metadata.headline.TITLE}</th>
+    <th colspan="2">{$meta.TITLE}</th>
   </tr>
-  <!-- END headline -->
-  <!-- BEGIN line -->
+  {foreach from=$meta.lines item=value key=label}
   <tr>
-    <td class="label">{metadata.line.KEY}</td>
-    <td class="value">{metadata.line.VALUE}</td>
+    <td class="label">{$label}</td>
+    <td class="value">{$value}</td>
   </tr>
-  <!-- END line -->
+  {/foreach}
+{/foreach}
 </table>
-<!-- END metadata -->
-
-<!-- BEGIN rate -->
-<form action="{rate.F_ACTION}" method="post" id="rateForm">
-<div>{rate.SENTENCE} :
-<!-- BEGIN rate_option -->
-{rate.rate_option.SEPARATOR}
-<!-- BEGIN my_rate -->
-<input type="button" name="rate" value="{rate.rate_option.OPTION}" class="rateButtonSelected" />
-<!-- END my_rate -->
-<!-- BEGIN not_my_rate -->
-<input type="submit" name="rate" value="{rate.rate_option.OPTION}" class="rateButton" />
-<!-- END not_my_rate -->
-<!-- END rate_option -->
-<script type="text/javascript" src="{pwg_root}{themeconf:template_dir}/rating.js"></script>
+{/if}
+
+{if isset($rating)}
+<form action="{$rating.F_ACTION}" method="post" id="rateForm">
+<div>
+{if isset($rating.USER_RATE)}{'update_rate'|@translate}{else}{'new_rate'|@translate}{/if}
+:
+{foreach from=$rating.marks item=mark name=rate_loop}
+{if !$smarty.foreach.rate_loop.first} | {/if}
+{if $mark==$rating.USER_RATE}
+  <input type="button" name="rate" value="{$mark}" class="rateButtonSelected" />
+{else}
+  <input type="submit" name="rate" value="{$mark}" class="rateButton" />
+{/if}
+{/foreach}
+<script type="text/javascript" src="{$ROOT_URL}{$themeconf.template_dir}/rating.js"></script>
 </div>
 </form>
-<!-- END rate -->
+{/if}
 
 <hr class="separation">
 
-<!-- BEGIN comments -->
+{if isset($COMMENT_COUNT)}
 <div id="comments">
-  <h2>[{comments.NB_COMMENT}] {lang:comments_title}</h2>
+  <h2>[{$COMMENT_COUNT}] {'comments_title'|@translate}</h2>
 
-  <div class="navigationBar">{comments.NAV_BAR}</div>
+  <div class="navigationBar">{$COMMENT_NAV_BAR}</div>
 
-  <!-- BEGIN comment -->
+  {if isset($comments)}
+  {foreach from=$comments item=comment}
   <div class="comment">
-    <!-- BEGIN delete -->
+    {if isset($comment.U_DELETE)}
     <p class="userCommentDelete">
-    <a href="{comments.comment.delete.U_COMMENT_DELETE}" title="{lang:comments_del}">
-      <img src="{pwg_root}{themeconf:icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{lang:delete}]"/>
+    <a href="{$comment.U_DELETE}" title="{'comments_del'|@translate}">
+      <img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{'delete'|@translate}]"/>
     </a>
     </p>
-    <!-- END delete -->
-    <p class="commentInfo"><span class="author">{comments.comment.COMMENT_AUTHOR}</span> - {comments.comment.COMMENT_DATE}</p>
-    <blockquote>{comments.comment.COMMENT}</blockquote>
+    {/if}
+    <p class="commentInfo"><span class="author">{$comment.AUTHOR}</span> - {$comment.DATE}</p>
+    <blockquote>{$comment.CONTENT}</blockquote>
   </div>
-  <!-- END comment -->
+  {/foreach}
+  {/if}
 
-  <!-- BEGIN add_comment -->
-  <form  method="post" action="{U_ADD_COMMENT}" class="filter" id="addComment">
+  {if isset($comment_add)}
+  <form  method="post" action="{$comment_add.F_ACTION}" class="filter" id="addComment">
     <fieldset>
-      <legend>{lang:comments_add}</legend>
-      <!-- BEGIN author_field -->
-      <label>{lang:upload_author}<input type="text" name="author"></label>
-      <!-- END author_field -->
-      <label>{lang:comment}<textarea name="content" rows="5" cols="80">{comments.add_comment.CONTENT}</textarea></label>
-      <input type="hidden" name="key" value="{comments.add_comment.KEY}" />
-      <input class="submit" type="submit" value="{lang:submit}">
+      <legend>{'comments_add'|@translate}</legend>
+      {if $comment_add.SHOW_AUTHOR}
+      <label>{'upload_author'|@translate}<input type="text" name="author"></label>
+      {/if}
+      <label>{'comment'|@translate}<textarea name="content" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label>
+      <input type="hidden" name="key" value="{$comment_add.KEY}" />
+      <input class="submit" type="submit" value="{'submit'|@translate}">
     </fieldset>
   </form>
-  <!-- END add_comment -->
+  {/if}
 
 </div>
-<!-- END comments -->
+{/if} {*comments*}
 
diff --git a/template/yoga/picture_nav_buttons.tpl b/template/yoga/picture_nav_buttons.tpl
index 4041f7b42..f82f5f467 100644
--- a/template/yoga/picture_nav_buttons.tpl
+++ b/template/yoga/picture_nav_buttons.tpl
@@ -1,90 +1,101 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
   <div class="navButtons">
-  <!-- BEGIN last -->
-    <a class="navButton prev" href="{last.U_IMG}" title="{lang:last_page} : {last.TITLE_IMG}" rel="last"><img src="{pwg_root}{themeconf:icon_dir}/last.png" class="button" alt="{lang:last_page}"></a>
-  <!-- END last -->
-  <!-- BEGIN last_unactive -->
-    <a class="navButton prev"><img src="{pwg_root}{themeconf:icon_dir}/last_unactive.png" class="button" alt=""></a>
-  <!-- END last_unactive -->
-  <!-- BEGIN next -->
-    <a class="navButton next" href="{next.U_IMG}" title="{lang:next_page} : {next.TITLE_IMG}" rel="next"><img src="{pwg_root}{themeconf:icon_dir}/right.png" class="button" alt="{lang:next_page}"></a>
-  <!-- END next -->
-  <!-- BEGIN next_unactive -->
-    <a class="navButton next"><img src="{pwg_root}{themeconf:icon_dir}/right_unactive.png" class="button" alt=""></a>
-  <!-- END next_unactive -->
-  <!-- BEGIN start_play -->
-    <a class="navButton play" href="{start_play.U_IMG}" title="{lang:start_play}" rel="play"><img src="{pwg_root}{themeconf:icon_dir}/play.png" class="button" alt="{lang:start_play}"></a>
-  <!-- END start_play -->
-  <!-- BEGIN stop_play -->
-    <a class="navButton play" href="{stop_play.U_IMG}" title="{lang:stop_play}" rel="play"><img src="{pwg_root}{themeconf:icon_dir}/pause.png" class="button" alt="{lang:stop_play}"></a>
-  <!-- END stop_play -->
-  <!-- BEGIN up -->
-    <a class="navButton up" href="{up.U_URL}" title="{lang:thumbnails}" rel="up"><img src="{pwg_root}{themeconf:icon_dir}/up.png" class="button" alt="{lang:thumbnails}"></a>
-  <!-- END up -->
-  <!-- BEGIN previous -->
-    <a class="navButton prev" href="{previous.U_IMG}" title="{lang:previous_page} : {previous.TITLE_IMG}" rel="prev"><img src="{pwg_root}{themeconf:icon_dir}/left.png" class="button" alt="{lang:previous_page}"></a>
-  <!-- END previous -->
-  <!-- BEGIN previous_unactive -->
-    <a class="navButton prev"><img src="{pwg_root}{themeconf:icon_dir}/left_unactive.png" class="button" alt=""></a>
-  <!-- END previous_unactive -->
-  <!-- BEGIN first -->
-    <a class="navButton prev" href="{first.U_IMG}" title="{lang:first_page} : {first.TITLE_IMG}" rel="first"><img src="{pwg_root}{themeconf:icon_dir}/first.png" class="button" alt="{lang:first_page}"></a>
-  <!-- END first -->
-  <!-- BEGIN first_unactive -->
-    <a class="navButton prev"><img src="{pwg_root}{themeconf:icon_dir}/first_unactive.png" class="button" alt=""></a>
-  <!-- END first_unactive -->
-  <!-- BEGIN start_repeat -->
-    <a class="navButton repeat" href="{start_repeat.U_IMG}" title="{lang:start_repeat}" rel="repeat"><img src="{pwg_root}{themeconf:icon_dir}/start_repeat.png" class="button" alt="{lang:start_repeat}"></a>
-  <!-- END start_repeat -->
-  <!-- BEGIN stop_repeat -->
-    <a class="navButton repeat" href="{stop_repeat.U_IMG}" title="{lang:stop_repeat}" rel="repeat"><img src="{pwg_root}{themeconf:icon_dir}/stop_repeat.png" class="button" alt="{lang:stop_repeat}"></a>
-  <!-- END stop_repeat -->
-  <!-- BEGIN inc_period -->
-    <a class="navButton inc_period" href="{inc_period.U_IMG}" title="{lang:inc_period}" rel="repeat"><img src="{pwg_root}{themeconf:icon_dir}/inc_period.png" class="button" alt="{lang:inc_period}"></a>
-  <!-- END inc_period -->
-  <!-- BEGIN inc_period_unactive -->
-    <a class="navButton inc_period" <img src="{pwg_root}{themeconf:icon_dir}/inc_period_unactive.png" class="button" alt=""></a>
-  <!-- END inc_period_unactive -->
-  <!-- BEGIN dec_period -->
-    <a class="navButton dec_period" href="{dec_period.U_IMG}" title="{lang:dec_period}" rel="repeat"><img src="{pwg_root}{themeconf:icon_dir}/dec_period.png" class="button" alt="{lang:dec_period}"></a>
-  <!-- END dec_period -->
-  <!-- BEGIN dec_period_unactive -->
-    <a class="navButton dec_period" <img src="{pwg_root}{themeconf:icon_dir}/dec_period_unactive.png" class="button" alt=""></a>
-  <!-- END dec_period_unactive -->
+  
+{if isset($last)}
+	<a class="navButton prev" href="{$last.U_IMG}" title="{'last_page'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'last_page'|@translate}"></a>
+{else}
+	<a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a>
+{/if}
+  
+{if isset($next)}
+	<a class="navButton next" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right.png" class="button" alt="{'next_page'|@translate}"></a>
+{else}
+	<a class="navButton next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a>
+{/if}
+
+{if isset($slideshow.U_START_PLAY)}
+	<a class="navButton play" href="{$slideshow.U_START_PLAY}" title="{'start_play'|@translate}" rel="play"><img src="{$ROOT_URL}{$themeconf.icon_dir}/play.png" class="button" alt="{'start_play'|@translate}"></a>
+{/if}
+
+{if isset($slideshow.U_STOP_PLAY)}
+	<a class="navButton play" href="{$slideshow.U_STOP_PLAY}" title="{'stop_play'|@translate}" rel="play"><img src="{$ROOT_URL}{$themeconf.icon_dir}/pause.png" class="button" alt="{'stop_play'|@translate}"></a>
+{/if}
+
+{if isset($U_UP) and !isset($slideshow)}
+	<a class="navButton up" href="{$U_UP}" title="{'thumbnails'|@translate}" rel="up"><img src="{$ROOT_URL}{$themeconf.icon_dir}/up.png" class="button" alt="{'thumbnails'|@translate}"></a>
+{/if}
+  
+{if isset($previous)}
+	<a class="navButton prev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left.png" class="button" alt="{'previous_page'|@translate}"></a>
+{else}
+	<a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a>
+{/if}
+  
+{if isset($first)}
+	<a class="navButton prev" href="{$first.U_IMG}" title="{'first_page'|@translate} : {$first.TITLE}" rel="first"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first.png" class="button" alt="{'first_page'|@translate}"></a>
+{else}
+	<a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a>
+{/if}
+
+
+{if isset($slideshow.U_START_REPEAT)}
+	<a class="navButton repeat" href="{$slideshow.U_START_REPEAT}" title="{'start_repeat'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_repeat.png" class="button" alt="{'start_repeat'|@translate}"></a>
+{/if}
+
+{if isset($slideshow.U_STOP_REPEAT)}
+	<a class="navButton repeat" href="{$slideshow.U_STOP_REPEAT}" title="{'stop_repeat'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_repeat.png" class="button" alt="{'stop_repeat'|@translate}"></a>
+{/if}
+
+{if isset($slideshow)}
+{if isset($slideshow.U_INC_PERIOD)}
+	<a class="navButton inc_period" href="{$slideshow.U_INC_PERIOD}" title="{'inc_period'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period.png" class="button" alt="{'inc_period'|@translate}"></a>
+{else}
+	<a class="navButton inc_period"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a>
+{/if}
+
+{if isset($slideshow.U_DEC_PERIOD)}
+	<a class="navButton dec_period" href="{$slideshow.U_DEC_PERIOD}" title="{'dec_period'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period.png" class="button" alt="{'dec_period'|@translate}"></a>
+{else}
+	<a class="navButton dec_period"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a>
+{/if}
+{/if}
+
   </div>
 
 <script type="text/javascript">
+{literal}
 function keyboardNavigation(e)
 {
-  if(!e) var e=window.event;
-  if (e.altKey) return true;
-  var target = e.target || e.srcElement;
-  if (target && target.type) return true; //an input editable element
-  var keyCode=e.keyCode || e.which;
-  var docElem = document.documentElement;
-  switch(keyCode) {
-<!-- BEGIN next -->
-    case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth ){window.location="{next.U_IMG}".replace( "&amp;", "&" ); return false; } break;
-<!-- END next -->
-<!-- BEGIN previous -->
-    case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0){ window.location="{previous.U_IMG}".replace("&amp;","&"); return false; } break;
-<!-- END previous -->
-<!-- BEGIN first -->
-    /*Home*/case 36: if (e.ctrlKey){window.location="{first.U_IMG}".replace("&amp;","&"); return false; } break;
-<!-- END first -->
-<!-- BEGIN last -->
-    /*End*/case 35: if (e.ctrlKey){window.location="{last.U_IMG}".replace("&amp;","&"); return false; } break;
-<!-- END last -->
-<!-- BEGIN up -->
-    /*Up*/case 38: if (e.ctrlKey){window.location="{up.U_UP}".replace("&amp;","&"); return false; } break;
-<!-- END up -->
-<!-- BEGIN start_play -->
-    /*Pause*/case 32: {window.location="{start_play.U_IMG}".replace("&amp;","&"); return false; } break;
-<!-- END start_play -->
-<!-- BEGIN stop_play -->
-    /*Play*/case 32: {window.location="{stop_play.U_IMG}".replace("&amp;","&"); return false; } break;
-<!-- END stop_play -->
+	if(!e) var e=window.event;
+	if (e.altKey) return true;
+	var target = e.target || e.srcElement;
+	if (target && target.type) return true; //an input editable element
+	var keyCode=e.keyCode || e.which;
+	var docElem = document.documentElement;
+	switch(keyCode) {
+{/literal}
+{if isset($next)}
+	case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth ){ldelim}window.location="{$next.U_IMG}".replace( "&amp;", "&" ); return false; } break;
+{/if}
+{if isset($previous)}
+	case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0){ldelim}window.location="{$previous.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+{/if}
+{if isset($first)}
+	/*Home*/case 36: if (e.ctrlKey){ldelim}window.location="{$first.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+{/if}
+{if isset($last)}
+	/*End*/case 35: if (e.ctrlKey){ldelim}window.location="{$last.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+{/if}
+{if isset($U_UP) and !isset($slideshow)}
+    /*Up*/case 38: if (e.ctrlKey){ldelim}window.location="{$U_UP|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+{/if}
+
+{if isset($slideshow.U_START_PLAY)}
+    /*Pause*/case 32: {ldelim}window.location="{$slideshow.U_START_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+{/if}
+{if isset($slideshow.U_STOP_PLAY)}
+    /*Play*/case 32: {ldelim}window.location="{$slideshow.U_STOP_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+{/if}
   }
   return true;
 }
diff --git a/template/yoga/slideshow.tpl b/template/yoga/slideshow.tpl
index d55518eed..1bbc0029f 100644
--- a/template/yoga/slideshow.tpl
+++ b/template/yoga/slideshow.tpl
@@ -1,24 +1,23 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
 <div id="imageHeaderBar">
   <div class="browsePath">
-    <!-- BEGIN stop_slideshow -->
-    [ <a href="{stop_slideshow.U_SLIDESHOW}">{lang:slideshow_stop}</a> ]
-    <!-- END stop_slideshow -->
+    {if isset($U_SLIDESHOW_STOP) }
+    [ <a href="{$U_SLIDESHOW_STOP}">{'slideshow_stop'|@translate}</a> ]
+    {/if}
   </div>
-  <div class="imageNumber">{PHOTO}</div>
-  <!-- BEGIN title -->
-  <h2 class="showtitle">{TITLE}</h2>
-  <!-- END title -->
+  <div class="imageNumber">{$PHOTO}</div>
+  {if $SHOW_PICTURE_NAME_ON_TITLE }
+  <h2 class="showtitle">{$current.TITLE}</h2>
+  {/if}
 </div>
 
 <div id="imageToolBar">
-  {NAV_BUTTONS}
+  {include file=$FILE_PICTURE_NAV_BUTTONS}
 </div>
 
 <div id="theImage">
-  {ELEMENT_CONTENT}
-  <!-- BEGIN legend -->
-  <p class="showlegend">{legend.COMMENT_IMG}</p>
-  <!-- END legend -->
+  {$ELEMENT_CONTENT}
+  {if isset($COMMENT_IMG)}
+  <p class="showlegend">{$COMMENT_IMG}</p>
+  {/if}
 </div>