- index.tpl, menubar.tpl, mainpage_categories.tpl and month_calendar.tpl go smarty

- better template debugging tweak (the smarty console is shown only once at the end)

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

5 files changed, 310 insertions, 273 deletions

diff --git a/template/yoga/footer.tpl b/template/yoga/footer.tpl
index 37aab1fba..68abea4fb 100644
--- a/template/yoga/footer.tpl
+++ b/template/yoga/footer.tpl
@@ -29,4 +29,4 @@
 
 {if isset($debug.QUERIES_LIST)}{$debug.QUERIES_LIST}{/if}
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl
index 48c4a7df3..944c5153e 100644
--- a/template/yoga/index.tpl
+++ b/template/yoga/index.tpl
@@ -1,116 +1,117 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
-{MENUBAR}
+{* $Id$ *}
+{$MENUBAR}
 <div id="content">
   <div class="titrePage">
     <ul class="categoryActions">
       <li>&nbsp;</li>
-      <!-- BEGIN preferred_image_order -->
+      {if !empty($image_orders) }
       <li>
-      {lang:Sort order}:
+      {'Sort order'|@translate}:
       <select onchange="document.location = this.options[this.selectedIndex].value;">
-        <!-- BEGIN order -->
-        <option value="{preferred_image_order.order.URL}" {preferred_image_order.order.SELECTED_OPTION}>{preferred_image_order.order.DISPLAY}</option>
-        <!-- END order -->
+        {foreach from=$image_orders item=image_order }
+        <option value="{$image_order.URL}"{if $image_order.SELECTED} selected="selected"{/if}}>{$image_order.DISPLAY}</option>
+        {/foreach}
       </select>
       </li>
-      <!-- END preferred_image_order -->
-
-      <!-- BEGIN caddie -->
-      <li><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></li>
-      <!-- END caddie -->
-
-      <!-- BEGIN edit -->
-      <li><a href="{edit.URL}" title="{lang:edit category informations}"><img src="{pwg_root}{themeconf:icon_dir}/category_edit.png" class="button" alt="{lang:edit}"/></a></li>
-      <!-- END edit -->
-
-      <!-- BEGIN search_rules -->
-      <li><a href="{search_rules.URL}" style="border:none;" onclick="popuphelp(this.href); return false;" title="{lang:Search rules}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/search_rules.png" class="button" alt="(?)"></a></li>
-      <!-- END search_rules -->
-
-      <!-- BEGIN slideshow -->
-      <li><a href="{slideshow.URL}" title="{lang:slideshow}"><img src="{pwg_root}{themeconf:icon_dir}/slideshow.png" class="button" alt="{lang:slideshow}"/></a></li>
-      <!-- END slideshow -->
-
-      <!-- BEGIN mode_normal -->
-      <li><a href="{mode_normal.URL}" title="{lang:mode_normal_hint}"><img src="{pwg_root}{themeconf:icon_dir}/normal_mode.png" class="button" alt="{lang:mode_normal_hint}"></a></li>
-      <!-- END mode_normal -->
-
-      <!-- BEGIN flat -->
-      <li><a href="{flat.URL}" title="{lang:mode_flat_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/flat.png" class="button" alt="{lang:mode_flat_hint}"></a></li>
-      <!-- END flat -->
-
-      <!-- BEGIN mode_posted -->
-      <li><a href="{mode_posted.URL}" title="{lang:mode_posted_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/calendar.png" class="button" alt="{lang:mode_posted_hint}"></a></li>
-      <!-- END mode_posted -->
-      <!-- BEGIN mode_created -->
-      <li><a href="{mode_created.URL}" title="{lang:mode_created_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/calendar_created.png" class="button" alt="{lang:mode_created_hint}"></a></li>
-      <!-- END mode_created -->
-      {PLUGIN_INDEX_ACTIONS}
+      {/if}
+
+      {if isset($U_CADDIE) }
+      <li><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></li>
+      {/if}
+
+      {if isset($U_EDIT) }
+      <li><a href="{$U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"/></a></li>
+      {/if}
+
+      {if isset($U_SEARCH_RULES) }
+      <li><a href="{$U_SEARCH_RULES}" style="border:none;" onclick="popuphelp(this.href); return false;" title="{'Search rules'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/search_rules.png" class="button" alt="(?)"></a></li>
+      {/if}
+
+      {if isset($U_SLIDESHOW) }
+      <li><a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/slideshow.png" class="button" alt="{'slideshow'|@translate}"/></a></li>
+      {/if}
+
+      {if isset($U_MODE_FLAT) }
+      <li><a href="{$U_MODE_FLAT}" title="{'mode_flat_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/flat.png" class="button" alt="{'mode_flat_hint'|@translate}"></a></li>
+      {/if}
+
+      {if isset($U_MODE_NORMAL) }
+      <li><a href="{$U_MODE_NORMAL}" title="{'mode_normal_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/normal_mode.png" class="button" alt="{'mode_normal_hint'|@translate}"></a></li>
+      {/if}
+
+      {if isset($U_MODE_POSTED) }
+      <li><a href="{$U_MODE_POSTED}" title="{'mode_posted_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar.png" class="button" alt="{'mode_posted_hint'|@translate}"></a></li>
+      {/if}
+      
+      {if isset($U_MODE_CREATED) }
+      <li><a href="{$U_MODE_CREATED}" title="{'mode_created_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar_created.png" class="button" alt="{'mode_created_hint'|@translate}"></a></li>
+      {/if}
+      
+      {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if}
     </ul>
 
-  <h2>{TITLE}</h2>
-  <!-- BEGIN calendar -->
-  <!-- BEGIN views -->
-  <div class="calendarViews">{lang:calendar_view}:
+  <h2>{$TITLE}</h2>
+
+  {if isset($chronology_views) }
+  <div class="calendarViews">{'calendar_view'|@translate}:
     <select onchange="document.location = this.options[this.selectedIndex].value;">
-    <!-- BEGIN view -->
-      <option value="{calendar.views.view.VALUE}" {calendar.views.view.SELECTED}>{calendar.views.view.CONTENT}</option>
-    <!-- END view -->
+      {foreach from=$chronology_views item=view}
+      <option value="{$view.VALUE}"{if $view.SELECTED} selected="selected"{/if}}>{$view.CONTENT}</option>
+      {/foreach}
     </select>
   </div>
-  <!-- END views -->
-  <!-- END calendar -->
+  {/if}
 
-  <!-- BEGIN calendar -->
-  <h2>{calendar.TITLE}</h2>
-  <!-- END calendar -->
+  {if isset($chronology.TITLE) }
+  <h2>{$chronology.TITLE}</h2>
+  {/if}
 
   </div> <!-- titrePage -->
 
-{PLUGIN_INDEX_CONTENT_BEGIN}
-
-<!-- BEGIN category_search_results -->
-<div style="font-size:16px;text-align:left;margin:10px">{lang:Category results for} <strong>{QUERY_SEARCH}</strong> : <em><strong>{category_search_results.CONTENT}</strong></em></div>
-<!-- END category_search_results -->
-<!-- BEGIN tag_search_results -->
-<div style="font-size:16px;text-align:left;margin:10px">{lang:Tag results for} <strong>{QUERY_SEARCH}</strong> : <em><strong>{tag_search_results.CONTENT}</strong></em></div>
-<!-- END tag_search_results -->
-
-
-<!-- BEGIN calendar -->
-<!-- BEGIN navbar -->
-<div class="calendarBar">
-<!-- BEGIN prev -->
-	<div style="float:left">&laquo; <a href="{calendar.navbar.prev.URL}">{calendar.navbar.prev.LABEL}</a></div>
-<!-- END prev -->
-<!-- BEGIN next -->
-	<div style="float:right"><a href="{calendar.navbar.next.URL}">{calendar.navbar.next.LABEL}</a> &raquo;</div>
-<!-- END next -->
-	{calendar.navbar.BAR}&nbsp;
+{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
+
+{if !empty($category_search_results) }
+<div style="font-size:16px;text-align:left;margin:10px">{'Category results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
+  <em><strong>
+  {foreach from=$category_search_results item=res name=res_loop}
+  {if !$smarty.foreach.res_loop.first} &mdash; {/if}
+  {$res}
+  {/foreach}
+  </strong></em>
+</div>
+{/if}
+
+{if !empty($tag_search_results) }
+<div style="font-size:16px;text-align:left;margin:10px">{'Tag results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
+  <em><strong>
+  {foreach from=$tag_search_results item=res name=res_loop}
+  {if !$smarty.foreach.res_loop.first} &mdash; {/if}
+  {$res}
+  {/foreach}
+  </strong></em>
 </div>
-<!-- END navbar -->
+{/if}
 
-<!-- BEGIN calbar -->
-<div class="calendarCalBar">{calendar.calbar.BAR}</div>
-<!-- END calbar -->
-<!-- END calendar -->
+{if isset($FILE_CHRONOLOGY_VIEW) }
+{include file=$FILE_CHRONOLOGY_VIEW}
+{/if}
 
-{MONTH_CALENDAR}
-{CATEGORIES}
-{THUMBNAILS}
+{if !empty($CATEGORIES) }{$CATEGORIES}{/if}
+{if !empty($THUMBNAILS) }{$THUMBNAILS}{/if}
 
-<!-- BEGIN cat_infos -->
-<!-- BEGIN navigation -->
+
+{if !empty($NAV_BAR) }
 <div class="navigationBar">
-{cat_infos.navigation.NAV_BAR}
+  {$NAV_BAR}
+</div>
+{/if}
+
+{if !empty($CONTENT_DESCRIPTION) }
+<div class="additional_info">
+  {$CONTENT_DESCRIPTION}
 </div>
-<!-- END navigation -->
-<!-- BEGIN comment -->
-<div class="additional_info">{cat_infos.comment.COMMENTS}</div>
-<!-- END comment -->
-<!-- END cat_infos -->
+{/if}
 
 
-{PLUGIN_INDEX_CONTENT_END}
+{if !empty($PLUGIN_INDEX_CONTENT_END) }{$PLUGIN_INDEX_CONTENT_END}{/if}
 </div> <!-- content -->
diff --git a/template/yoga/mainpage_categories.tpl b/template/yoga/mainpage_categories.tpl
index dcf589b51..b28c619fb 100644
--- a/template/yoga/mainpage_categories.tpl
+++ b/template/yoga/mainpage_categories.tpl
@@ -1,28 +1,27 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- BEGIN categories -->
-<!-- $Id$ -->
+{* $Id$ *}
+
 <ul class="thumbnailCategories">
-  <!-- BEGIN category -->
+  {foreach from=$category_thumbnails item=cat}
   <li>
     <div class="thumbnailCategory">
       <div class="illustration">
-        <a href="{categories.category.URL}">
-          <img src="{categories.category.SRC}" alt="{categories.category.ALT}" title="{categories.category.TITLE}">
+        <a href="{$cat.URL}">
+          <img src="{$cat.TN_SRC}" alt="{$cat.ALT}" title="{'hint_category'|@translate}">
         </a>
       </div>
       <div class="description">
         <h3>
-          <a href="{categories.category.URL}">{categories.category.NAME}</a>
-          {categories.category.ICON}
+          <a href="{$cat.URL}">{$cat.NAME}</a>
+          {$cat.ICON}
         </h3>
-        <!-- BEGIN dates -->
-        <p>{categories.category.dates.INFO}</p>
-        <!-- END dates -->
-        <p>{categories.category.CAPTION_NB_IMAGES}&nbsp;</p>
-        <p>{categories.category.DESCRIPTION}&nbsp;</p>
+        {if isset($cat.INFO_DATES) }
+        <p>{$cat.INFO_DATES}</p>
+        {/if}
+        <p>{$cat.CAPTION_NB_IMAGES}</p>
+        <p>{$cat.DESCRIPTION}</p>
       </div>
     </div>
   </li>
-  <!-- END category -->
+  {/foreach}
 </ul>
-<!-- END categories -->
+
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index 3fe8ded73..a7e01fcad 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -1,155 +1,164 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
+
 <div id="menubar">
-<!-- BEGIN links -->
+{if not empty($links)}
 <dl id="mbLinks">
-  <dt>{lang:Links}</dt>
-  <dd>
-    <ul>
-      <!-- BEGIN link -->
-      <li>
-        <a href="{links.link.URL}"
-        <!-- BEGIN new_window -->
-         onclick="window.open(this.href, 
-                              '{links.link.new_window.name}',
-                              '{links.link.new_window.features}'
-                              ); return false;"
-        <!-- END new_window -->
-        >{links.link.LABEL}
-        </a>
-      </li>
-      <!-- END link -->
-    </ul>
-  </dd>
+	<dt>{'Links'|@translate}</dt>
+	<dd>
+	<ul>
+		{foreach from=$links item=link}
+		<li>
+		<a href="{$link.URL}"
+			{if isset($link.new_window) }onclick="window.open(this.href, '{$link.new_window.NAME|@escape:'javascript'}','{$link.new_window.FEATURES|@escape:'javascript'}'); return false;"{/if}
+		>
+			{$link.LABEL}
+		</a>
+		</li>
+		{/foreach}{*links*}
+	</ul>
+	</dd>
 </dl>
-<!-- END links -->
-  <!-- BEGIN start_filter -->
-  <a href="{start_filter.URL}" title="{lang:start_filter_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/start_filter.png" class="button" alt="{lang:start_filter_hint}"></a>
-  <!-- END start_filter -->
-  <!-- BEGIN stop_filter -->
-  <a href="{stop_filter.URL}" title="{lang:stop_filter_hint}"><img src="{pwg_root}{themeconf:icon_dir}/stop_filter.png" class="button" alt="{lang:stop_filter_hint}"></a>
-  <!-- END stop_filter -->
+{/if}{*links*}
+
+  {if isset($U_START_FILTER)}
+  <a href="{$U_START_FILTER}" title="{'start_filter_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_filter.png" class="button" alt="{'start_filter_hint'|@translate}"></a>
+  {/if}
+  {if isset($U_STOP_FILTER)}
+  <a href="{$U_STOP_FILTER}" title="{'stop_filter_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_filter.png" class="button" alt="{'stop_filter_hint'|@translate}"></a>
+  {/if}
+
 <dl id="mbCategories">
-  <dt><a href="{U_CATEGORIES}">{lang:Categories}</a></dt>
-  <dd>
-    {MENU_CATEGORIES_CONTENT}
-  <!-- BEGIN upload -->
+	<dt><a href="{$U_CATEGORIES}">{'Categories'|@translate}</a></dt>
+	<dd>
+		{$MENU_CATEGORIES_CONTENT}
+  {if isset($U_UPLOAD)}
   <ul><li>
-    <a href="{upload.U_UPLOAD}">{lang:upload_picture}</a>
+    <a href="{$U_UPLOAD}">{'upload_picture'|@translate}</a>
   </li></ul>
-  <!-- END upload -->
-    <p class="totalImages">{NB_PICTURE} {lang:total}</p>
+  {/if}
+		<p class="totalImages">{$NB_PICTURE} {'total'|@translate}</p>
   </dd>
-
 </dl>
 
-<!-- BEGIN tags -->
+
+{if not empty($related_tags)}
 <dl id="mbTags">
-  <dt>{lang:Related tags}</dt>
-  <dd>
-    <ul id="menuTagCloud">
-      <!-- BEGIN tag -->
-      <li>
-        <!-- BEGIN add -->
-        <a href="{tags.tag.add.URL}" title="{tags.tag.add.TITLE}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/add_tag.png" alt="+"></a>
-        <!-- END add -->
-        <a href="{tags.tag.URL}" class="{tags.tag.CLASS}" title="{tags.tag.TITLE}">{tags.tag.NAME}</a>
-      </li>
-      <!-- END tag -->
-    </ul>
-  </dd>
+	<dt>{'Related tags'|@translate}</dt>
+	<dd>
+		<ul id="menuTagCloud">
+		{foreach from=$related_tags item=tag}
+		<li>
+		{if !empty($tag.add) }
+			<a href="{$tag.add.URL}" 
+				title="{$pwg->l10n_dec('%d picture are also linked to current tags', '%d pictures are also linked to current tags', $tag.add.COUNTER)}" 
+				rel="nofollow">
+				<img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" />
+			</a>
+		{/if}
+		<a href="{$tag.U_TAG}" class="{$tag.CLASS}" title="{'See pictures linked to this tag only'|@translate}">{$tag.NAME}</a>
+		</li>
+		{/foreach}
+		</ul>
+	</dd>
 </dl>
-<!-- END tags -->
+{/if}
+
 
 <dl id="mbSpecial">
-  <dt>{lang:special_categories}</dt>
-  <dd>
-    <ul>
-      <!-- BEGIN special_cat -->
-      <li><a href="{special_cat.URL}" title="{special_cat.TITLE}" {special_cat.REL}>{special_cat.NAME}</a></li>
-      <!-- END special_cat -->
-    </ul>
-  </dd>
+	<dt>{'special_categories'|@translate}</dt>
+	<dd>
+		<ul>
+			{foreach from=$special_categories item=cat}
+			<li><a href="{$cat.URL}" title="{$cat.TITLE}" {if isset($cat.REL)}{$cat.REL}{/if}>{$cat.NAME}</a></li>
+			{/foreach}
+		</ul>
+	</dd>
 </dl>
+
+
 <dl id="mbMenu">
-  <dt>{lang:title_menu}</dt>
-  <dd>
-      <!-- BEGIN summary -->
-      <!-- BEGIN quick_search -->
-      <form action="{pwg_root}qsearch.php" method="get" id="quicksearch">
-      <p>
-      <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" />
-      </p>
-      </form>
-      <script type="text/javascript">var qsearch_prompt="{lang:qsearch}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
-      <!-- END quick_search -->
-      <!-- END summary -->
-    <ul>
-      <!-- BEGIN summary -->
-      <li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}" {summary.REL}>{summary.NAME}</a></li>
-      <!-- END summary -->
-
-    </ul>
-  </dd>
+	<dt>{'title_menu'|@translate}</dt>
+	<dd>
+		<form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch">
+			<p>
+				<input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" />
+			</p>
+		</form>
+		<script type="text/javascript">var qsearch_prompt="{'qsearch'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
+
+		<ul>
+		{foreach from=$summaries item=sum}
+			<li><a href="{$sum.U_SUMMARY}" title="{$sum.TITLE}" {if isset($sum.REL)}{$sum.REL}{/if}>{$sum.NAME}</a></li>
+		{/foreach}
+		</ul>
+	</dd>
 </dl>
+
+
 <dl id="mbIdentification">
-  <dt>{lang:identification}</dt>
-  <dd>
-    <!-- BEGIN hello -->
-    <p>{lang:hello}&nbsp;{USERNAME}&nbsp;!</p>
-    <!-- END hello -->
-    <ul>
-      <!-- BEGIN register -->
-      <li><a href="{U_REGISTER}" title="{lang:Create a new account}" rel="nofollow">{lang:Register}</a></li>
-      <!-- END register -->
-      <!-- BEGIN login -->
-      <li><a href="{F_IDENTIFY}" rel="nofollow">{lang:Connection}</a></li>
-      <!-- END login -->
-      <!-- BEGIN logout -->
-      <li><a href="{U_LOGOUT}">{lang:logout}</a></li>
-      <!-- END logout -->
-      <!-- BEGIN profile -->
-      <li><a href="{U_PROFILE}" title="{lang:hint_customize}">{lang:customize}</a></li>
-      <!-- END profile -->
-      <!-- BEGIN admin -->
-      <li><a href="{U_ADMIN}" title="{lang:hint_admin}">{lang:admin}</a></li>
-      <!-- END admin -->
-    </ul>
-    <!-- BEGIN quickconnect -->
-    <form method="post" action="{F_IDENTIFY}" class="filter" id="quickconnect">
-      <fieldset>
-        <legend>{lang:Quick connect}</legend>
-
-        <label>
-          {lang:Username}
-          <input type="text" name="username" size="15" value="">
-        </label>
-
-        <label>
-          {lang:Password}
-          <input type="password" name="password" size="15">
-        </label>
-
-        <!-- BEGIN remember_me -->
-        <label>
-          {lang:remember_me}
-          <input type="checkbox" name="remember_me" value="1">
-        </label>
-        <!-- END remember_me -->
-
-        <p>
-         <input class="submit" type="submit" name="login" value="{lang:submit}">
-        </p>
-    <ul class="actions">
-      <li><a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/lost_password.png" class="button" alt="{lang:Forgot your password?}"></a></li>
-      <!-- BEGIN register -->
-      <li><a href="{U_REGISTER}" title="{lang:Create a new account}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/register.png" class="button" alt="{lang:register}"/></a></li>
-      <!-- END register -->
-    </ul>
-
-      </fieldset>
-    </form>
-    <!-- END quickconnect -->
+	<dt>{'identification'|@translate}</dt>
+	<dd>
+    {if isset($USERNAME)}
+    <p>{'hello'|@translate}&nbsp;{$USERNAME}&nbsp;!</p>
+    {/if}
+    
+	<ul>
+		{if isset($U_REGISTER)}
+		<li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow">{'Register'|@translate}</a></li>
+		{/if}
+
+		{if isset($U_IDENTIFY)}
+		<li><a href="{$U_IDENTIFY}" rel="nofollow">{'Connection'|@translate}</a></li>
+		{/if}
+
+		{if isset($U_LOGOUT)}
+		<li><a href="{$U_LOGOUT}">{'logout'|@translate}</a></li>
+		{/if}
+
+		{if isset($U_PROFILE)}
+		<li><a href="{$U_PROFILE}" title="{'hint_customize'|@translate}">{'customize'|@translate}</a></li>
+		{/if}
+
+		{if isset($U_ADMIN)}
+		<li><a href="{$U_ADMIN}" title="{'hint_admin'|@translate}">{'admin'|@translate}</a></li>
+		{/if}
+	</ul>
+	
+	{if isset($U_IDENTIFY)}
+	<form method="post" action="{$U_IDENTIFY}" class="filter" id="quickconnect">
+	<fieldset>
+		<legend>{'Quick connect'|@translate}</legend>
+
+		<label>
+		  {'Username'|@translate}
+		  <input type="text" name="username" size="15" value="">
+		</label>
+
+		<label>
+		  {'Password'|@translate}
+		  <input type="password" name="password" size="15">
+		</label>
+
+		{if $AUTHORIZE_REMEMBERING}
+		<label>
+		  {'remember_me'|@translate}
+		  <input type="checkbox" name="remember_me" value="1">
+		</label>
+		{/if}
+		<p>
+		 <input class="submit" type="submit" name="login" value="{'submit'|@translate}">
+		</p>
+		
+		<ul class="actions">
+		  <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
+		  {if isset($U_REGISTER)}
+		  <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'register'|@translate}"/></a></li>
+		  {/if}
+		</ul>
+
+	</fieldset>
+	</form>
+    {/if}
 
   </dd>
 </dl>
diff --git a/template/yoga/month_calendar.tpl b/template/yoga/month_calendar.tpl
index 3e5ef4f62..a965d40e1 100644
--- a/template/yoga/month_calendar.tpl
+++ b/template/yoga/month_calendar.tpl
@@ -1,36 +1,64 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- BEGIN calendar -->
-<!-- $Id$ -->
-<!-- BEGIN thumbnails -->
+{* $Id$ *}
+
+{if !empty($chronology_navigation_bars) }
+{foreach from=$chronology_navigation_bars item=bar}
+<div class="calendarBar">
+  {if isset($bar.previous)}
+    <div style="float:left">&laquo; <a href="{$bar.previous.URL}">{$bar.previous.LABEL}</a></div>
+  {/if}
+  {if isset($bar.next)}
+    <div style="float:right"><a href="{$bar.next.URL}">{$bar.next.LABEL}</a> &raquo;</div>
+  {/if}
+  {if isset($bar.CONTENT)}
+  {$bar.CONTENT}
+  {else}
+  &nbsp;
+  {/if}
+</div>
+{/foreach}
+{/if}
+
+{if !empty($chronology_calendar.calendar_bars) }
+{foreach from=$chronology_calendar.calendar_bars item=bar}
+<div class="calendarCalBar">
+  <span class="calCalHead"><a href="{$bar.U_HEAD}">{$bar.HEAD_LABEL}</a>  ({$bar.NB_IMAGES})</span><br/>
+  {$bar.NAV_BAR}
+</div>
+{/foreach}
+{/if}
+
+{if isset($chronology_calendar.month_view) }
 <table class="calMonth">
-<!-- BEGIN head -->
- <thead><tr>
- <!-- BEGIN col -->
-   <td class="calDayHead">{calendar.thumbnails.head.col.LABEL}</td>
- <!-- END col -->
- </tr></thead>
-<!-- END head -->
-<!-- BEGIN row -->
+ <thead>
  <tr>
- <!-- BEGIN col -->
- <!-- BEGIN blank -->
- <td class="calDayCellBlank" style="width:{calendar.thumbnails.WIDTH}px;height:{calendar.thumbnails.HEIGHT}px;">
- <!-- END blank -->
- <!-- BEGIN empty -->
- <td class="calDayCellEmpty" style="width:{calendar.thumbnails.WIDTH}px;height:{calendar.thumbnails.HEIGHT}px;">{calendar.thumbnails.row.col.empty.LABEL}
- <!-- END empty -->
- <!-- BEGIN full -->
- <td class="calDayCellFull"><div class="calBackDate">{calendar.thumbnails.row.col.full.LABEL}</div><div class="calForeDate">{calendar.thumbnails.row.col.full.LABEL}</div>
-	<div class="calImg" style="width:{calendar.thumbnails.WIDTH}px;height:{calendar.thumbnails.HEIGHT}px;"><a href="{calendar.thumbnails.row.col.full.U_IMG_LINK}">
-	  <img style="{calendar.thumbnails.row.col.full.STYLE}" {calendar.thumbnails.row.col.full.IMG_WIDTH} {calendar.thumbnails.row.col.full.IMG_HEIGHT}
-	       src="{calendar.thumbnails.row.col.full.IMAGE}" alt="{calendar.thumbnails.row.col.full.IMAGE_ALT}"
-	    title="{calendar.thumbnails.row.col.full.IMAGE_ALT}">
-	</a></div>
- <!-- END full -->
- </td>
- <!-- END col -->
+ {foreach from=$chronology_calendar.month_view.wday_labels item=wday}
+	<td class="calDayHead">{$wday}</td>
+ {/foreach}
  </tr>
-<!-- END row -->
+ </thead>
+
+ {foreach from=$chronology_calendar.month_view.weeks item=week}
+ <tr>
+ 	{foreach from=$week item=day}
+ 	{if !empty($day)}
+ 		{if isset($day.IMAGE)}
+ 			<td class="calDayCellFull">
+	 			<div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div>
+	 			<div class="calImg" style="width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px;">
+					<a href="{$day.U_IMG_LINK}">
+			  			<img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$day.IMAGE_ALT}" />
+					</a>
+				</div>
+ 		{else}
+ 			<td class="calDayCellEmpty" style="width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px;">{$day.DAY}
+ 		{/if}
+ 	{else}
+ 		<td class="calDayCellBlank" style="width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px;">
+ 	{/if}
+ 	</td>
+ 	{/foreach} {*day in week*}
+ </tr>
+ {/foreach}  {*week in month*}
 </table>
-<!-- END thumbnails -->
-<!-- END calendar -->
+{/if}
+