- 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

1 files changed, 144 insertions, 135 deletions

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>