Changeset 12592 for extensions/gally/gally-default/template

Timestamp:

Nov 11, 2011, 12:10:02 AM (12 years ago)

Author:

grum

Message:

feature:2499 - compatibility with Piwigo 2.3

Location:

extensions/gally/gally-default/template

Files:

• about.tpl (modified) (2 diffs)
• comment_list.tpl (modified) (3 diffs)
• comments.tpl (modified) (2 diffs)
• config.js.tpl (modified) (1 diff)
• dialogs.tpl (modified) (1 diff)
• header.tpl (modified) (1 diff)
• identification.tpl (modified) (2 diffs)
• index.tpl (modified) (1 diff)
• mainpage_categories.tpl (modified) (1 diff)
• menubar_categories.tpl (modified) (2 diffs)
• menubar_identification.tpl (modified) (1 diff)
• menubar_tags.tpl (modified) (1 diff)
• nbm.tpl (modified) (2 diffs)
• notification.tpl (modified) (2 diffs)
• password.tpl (modified) (2 diffs)
• picture.tpl (modified) (6 diffs)
• picture_content.tpl (modified) (1 diff)
• picture_nav_buttons.tpl (modified) (4 diffs)
• profile.tpl (modified) (2 diffs)
• profile_content.tpl (modified) (1 diff)
• register.tpl (modified) (4 diffs)
• search.tpl (modified) (2 diffs)
• tags.tpl (modified) (3 diffs)
• thumbnails.tpl (modified) (2 diffs)

extensions/gally/gally-default/template/about.tpl

@@ -1 +1 @@
 <!-- **GBL** >ABOUT> -->
+
 <div id="content" class="content">
-  <div class="titrePage">
+  <div class="titrePage" id='titrePageID'>
+
+    {if isset($MENUBAR)}
+      {if #menuAnimated# == "noswitch"}
+        {$MENUBAR}
+      {else}
+      <div id="menuswitcher">
+        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp;
+        </a>
+      </div>
+      {/if}
+    {/if}
+
     <ul class="categoryActions">
       <li>
@@ -10 +23 @@
     <h2>{'About'|@translate}</h2>
   </div>
+
+  {if #menuAnimated# != "noswitch" and isset($MENUBAR)}
+    {$MENUBAR}
+  {/if}
+
   <div id="content2">
   {$ABOUT_MESSAGE}

extensions/gally/gally-default/template/comment_list.tpl

@@ -51 +51 @@
         {if isset($comment.U_DELETE)}
         <li>
-          <img style="cursor:pointer;" src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" class="button" alt="[delete]" onclick="document.location='{$comment.U_DELETE}';" title="{'delete this comment'|@translate}"/>
+          <span class="button id_delete" onclick="document.location='{$comment.U_DELETE}';" title="{'delete this comment'|@translate}"></span>
         </li>
         {/if}
@@ -87 +87 @@
             $this->assign_by_ref('comment', $comment);
           {/php}
-          <img style="cursor:pointer;" src="{$ROOT_URL}{$themeconf.icon_dir}/edit.png" class="button" alt="[edit]"
-               onclick="editInside('{$comment.U_EDIT}#edit_comment}', '{$comment.CONTENT|@escape}', {$comment.IMAGE_ID|@default:$current.id}, '{$comment.KEY}', {$smarty.foreach.comment_loop.index});" title="{'edit this comment'|@translate}"/>
+          <span class="button id_edit" onclick="editInside('{$comment.U_EDIT}#edit_comment}', '{$comment.CONTENT|@escape}', {$comment.IMAGE_ID|@default:$current.id}, '{$comment.KEY}', {$smarty.foreach.comment_loop.index});" title="{'edit this comment'|@translate}"></span>
+
         </li>
         {/if}
@@ -94 +94 @@
         {if isset($comment.U_VALIDATE)}
         <li>
-          <img style="cursor:pointer;" src="{$ROOT_URL}{$themeconf.icon_dir}/validate_s.png" class="button" alt="[validate]" onclick="document.location='{$comment.U_VALIDATE}';" title="{'validate this comment'|@translate}"/>
+          <span class="button id_validate" onclick="document.location='{$comment.U_VALIDATE}';" title="{'validate this comment'|@translate}"></span>
         </li>
         {/if}

extensions/gally/gally-default/template/comments.tpl

@@ -1 @@
-
 <div id="content" class="content">
 
-  <div class="titrePage">
+  <div class="titrePage" id='titrePageID'>
+
+    {if isset($MENUBAR)}
+      {if #menuAnimated# == "noswitch"}
+        {$MENUBAR}
+      {else}
+      <div id="menuswitcher">
+        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp;
+        </a>
+      </div>
+      {/if}
+    {/if}
+
     <ul class="categoryActions">
       <li><a id="icon_home" class="button" href="{$U_HOME}" title="{'Home'|@translate}"></a></li>
@@ -8 +19 @@
     <h2>{'User comments'|@translate}</h2>
   </div>
+
+  {if #menuAnimated# != "noswitch" and isset($MENUBAR)}
+    {$MENUBAR}
+  {/if}
 
 <form class="filter" action="{$F_ACTION}" method="get">

extensions/gally/gally-default/template/config.js.tpl

@@ -29 +29 @@
   displayHighResIcon:{if #displayHighResIcon#=='yes'}true{else}false{/if},
   highResClickMode:"{#highResClickMode#}",
-{/if} {if $BODY_ID=='theCategoryPage'}
+{/if} {if $BODY_ID=='theCategoryPage' or isset($MENUBAR)}
   menuAnimated:"{#menuAnimated#}",
   menuWidth:"{#menuWidth#}",

extensions/gally/gally-default/template/dialogs.tpl

@@ -7 +7 @@
   $(function() {
     $("#divMsg").dialog({
-      bgiframe: true,
       modal: true,
       dialogClass: '{/literal}{if isset($errors) and count($errors)}errors{elseif isset($infos) and count($infos)}infos{/if}{literal}',

extensions/gally/gally-default/template/header.tpl

@@ -80 +80 @@
   {if #manageTips#=='yes'}
     {combine_script id="gpc.simpleTip" path="themes/gally-default/js/simpleTip.min.js" require="jquery"}
-    {combine_script id="gallyjs-ttm" path="themes/gally-default/js/gallyjs-ttm.min.js" require="jquery"}
+    {combine_script id="gallyjs-ttm" path="themes/gally-default/js/gallyjs-ttm.js" require="jquery"}
   {/if}
 
-  {if $BODY_ID=='theCategoryPage'}
-  {combine_script id="gallyjs-tcp" path="themes/gally-default/js/gallyjs-tcp.min.js" require="jquery"}
+  {if $BODY_ID=='theCategoryPage' or isset($MENUBAR)}
+  {combine_script id="gallyjs-tcp" path="themes/gally-default/js/gallyjs-tcp.js" require="jquery"}
   <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/gally-default/css/thumbnails.css">
   <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/gally-default/css/menubar.css">

extensions/gally/gally-default/template/identification.tpl

@@ -3 +3 @@
 <div id="content" class="content">
 
-  <div class="titrePage">
+  <div class="titrePage" id='titrePageID'>
+
+    {if isset($MENUBAR)}
+      {if #menuAnimated# == "noswitch"}
+        {$MENUBAR}
+      {else}
+      <div id="menuswitcher">
+        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp;
+        </a>
+      </div>
+      {/if}
+    {/if}
+
     <ul class="categoryActions">
       <li><a id="icon_lost_password" class="button" href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"> </a></li>
@@ -13 +25 @@
     <h2>{'Identification'|@translate}</h2>
   </div>
+
+
+  {if #menuAnimated# != "noswitch" and isset($MENUBAR)}
+    {$MENUBAR}
+  {/if}
 
 {include file='dialogs.tpl'}

extensions/gally/gally-default/template/index.tpl

@@ -11 +11 @@
     <div id="menuswitcher">
       <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp;
-        <!-- <img  src="{$ROOT_URL}{$themeconf.icon_dir}/menu-show.png"  alt="{'display all elements in all sub-categories'|@translate}"> -->
       </a>
     </div>

extensions/gally/gally-default/template/mainpage_categories.tpl

@@ -7 +7 @@
       <div class="illustration">
 
-          <img {if isset($cat.EXTRA_CLASS)}class="{$cat.EXTRA_CLASS}"{/if} src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '} - {'display this album'|@translate}">
+          <img {if isset($cat.EXTRA_CLASS)}class="{$cat.EXTRA_CLASS}"{/if} src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}">
 
       </div>

extensions/gally/gally-default/template/menubar_categories.tpl

@@ -1 +1 @@
 <dt>
   {if isset($U_START_FILTER)}
-  <a id="icon_start_filter" class="button" href="{$U_START_FILTER}" title="{'display only recently posted photos'|@translate}" rel="nofollow"></a>
+  <a id="icon_start_filter" class="button sTipOnTop" href="{$U_START_FILTER}" title="{'display only recently posted photos'|@translate}" rel="nofollow"></a>
   {/if}
   {if isset($U_STOP_FILTER)}
-  <a id="icon_stop_filter" class="button" href="{$U_STOP_FILTER}" title="{'return to the display of all photos'|@translate}"></a>
+  <a id="icon_stop_filter" class="button sTipOnTop" href="{$U_STOP_FILTER}" title="{'return to the display of all photos'|@translate}"></a>
   {/if}
   <a href="{$block->data.U_CATEGORIES}">{'Albums'|@translate}</a>
@@ -21 +21 @@
         <a href="{$cat.URL}" {if $cat.IS_UPPERCAT}rel="up"{/if} title="{$cat.TITLE}">{$cat.NAME}</a>
         {if $cat.count_images > 0}
-        <span class="{if $cat.nb_images > 0}menuInfoCat{else}menuInfoCatByChild{/if}" title="{$cat.TITLE}">[{$cat.count_images}]</span>
+        <span class="{if $cat.nb_images > 0}menuInfoCat{else}menuInfoCatByChild{/if} sTipOnTop" title="{$cat.TITLE}">[{$cat.count_images}]</span>
         {/if}
         {if !empty($cat.icon_ts)}
-        <img title="{$cat.icon_ts.TITLE}" src="{$ROOT_URL}{$themeconf.icon_dir}/recent{if $cat.icon_ts.IS_CHILD_DATE}_by_child{/if}.png" class="icon" alt="(!)">
+        <span class="button {if $cat.icon_ts.IS_CHILD_DATE}id_recent_cat_by_child{else}id_recent_cat{/if}"></span>
         {/if}
     {assign var='ref_level' value=$cat.LEVEL}

extensions/gally/gally-default/template/menubar_identification.tpl

@@ +1 @@
+{if isset($MENUBAR)}{$MENUBAR}{/if}
 <dt>{'Identification'|@translate}</dt>
 <dd>

extensions/gally/gally-default/template/menubar_tags.tpl

@@ -9 +9 @@
         title="{$pwg->l10n_dec('%d photo is also linked to current tags', '%d photos are also linked to current tags', $tag.counter)}"
         rel="nofollow">
-        <img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" />
+        <span class="add_tag"></span>
       </a>
       {/if}

extensions/gally/gally-default/template/nbm.tpl

@@ -1 +1 @@
 <!-- **GBL** >NBM> -->
+<div id="content" class="content">
+  <div class="titrePage" id='titrePageID'>
 
-<div id="content" class="content">
-  <div class="titrePage">
+    {if isset($MENUBAR)}
+      {if #menuAnimated# == "noswitch"}
+        {$MENUBAR}
+      {else}
+      <div id="menuswitcher">
+        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp;
+        </a>
+      </div>
+      {/if}
+    {/if}
+
     <ul class="categoryActions">
       <li><a id="icon_home" class="button" href="{$U_HOME}" title="{'Home'|@translate}"></a></li>
@@ -9 +20 @@
   </div>
 
+  {if #menuAnimated# != "noswitch" and isset($MENUBAR)}
+    {$MENUBAR}
+  {/if}
+
+
 {include file='dialogs.tpl'}
 

extensions/gally/gally-default/template/notification.tpl

@@ -5 +5 @@
 <link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed (photos, comments)'|@translate}" href="{$U_FEED}">
 {/html_head}
+
 <div id="content" class="content">
 
-  <div class="titrePage">
+  <div class="titrePage" id='titrePageID'>
+
+    {if isset($MENUBAR)}
+      {if #menuAnimated# == "noswitch"}
+        {$MENUBAR}
+      {else}
+      <div id="menuswitcher">
+        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp;
+        </a>
+      </div>
+      {/if}
+    {/if}
+
     <ul class="categoryActions">
       <li><a id="icon_home" class="button" href="{$U_HOME}" title="{'Home'|@translate}"></a></li>
@@ -13 +26 @@
     <h2>{'Notification'|@translate}</h2>
   </div>
+
+  {if #menuAnimated# != "noswitch" and isset($MENUBAR)}
+    {$MENUBAR}
+  {/if}
 
   <div id="content2">

extensions/gally/gally-default/template/password.tpl

@@ -1 +1 @@
 <!-- **GBL** >PASSWORD> -->
+{if isset($MENUBAR)}{$MENUBAR}{/if}
 
 <div id="content" class="content">
@@ -13 +14 @@
 
 
-<form action="{$F_ACTION}" method="post" class="properties">
-  <fieldset>
-    <legend>{'Retrieve password'|@translate}</legend>
+{if $action != 'none'}
+  <form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&amp;key={$key}{/if}" method="post">
 
-    <ul>
-      <li>
-        <div class="property">
-          <label for="mail_address">{'Email address'|@translate}</label>
-        </div>
-        <input class="login" type="text" name="mail_address" id="mail_address" size="35" maxlength="40" >
-      </li>
-      <li>
-        <div class="property">
-          <label for="no_mail_address">{'No email address'|@translate}</label>
-        </div>
-        <input type="checkbox" id="no_mail_address" name="no_mail_address" value="1">
-      </li>
-    </ul>
-  </fieldset>
+    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 
-  <p><input class="submit" type="submit" name="submit" value="{'Send new password'|@translate}"></p>
-</form>
+    {if $action == 'lost'}
+      <div class="message">{'Please enter your username or email address.'|@translate} {'You will receive a link to create a new password via email.'|@translate}</div>
 
+      <p>
+        <label>
+          {'Username or email'|@translate}
+          <br>
+          <input type="text" id="username_or_email" name="username_or_email" size="40" maxlength="40"{if isset($username_or_email)} value="{$username_or_email}"{/if}>
+        </label>
+      </p>
+
+      <p class="bottomButtons">
+        <input type="submit" name="submit" value="{'Change my password'|@translate}">
+      </p>
+
+    {elseif $action == 'reset'}
+
+      <div class="message">{'Hello'|@translate} <em>{$username}</em>. {'Enter your new password below.'|@translate}</div>
+
+      <p>
+        <label>
+          {'New password'|@translate}
+          <br>
+          <input type="password" name="use_new_pwd" id="use_new_pwd" value="">
+        </label>
+      </p>
+
+      <p>
+        <label>
+          {'Confirm Password'|@translate}
+          <br>
+          <input type="password" name="passwordConf" id="passwordConf" value="">
+        </label>
+      </p>
+
+      <p class="bottomButtons">
+        <input type="submit" name="submit" value="{'Submit'|@translate}">
+      </p>
+
+    {/if}
+
+  </form>
+{/if}
+
+  <script type="text/javascript">
+  {if $action == 'lost'}
+    {literal}
+      try{
+        document.getElementById('username_or_email').focus();
+      }
+      catch(e){}
+    {/literal}
+    {elseif $action == 'reset'}
+    {literal}
+      try{
+        document.getElementById('use_new_pwd').focus();
+      }
+      catch(e){}
+    {/literal}
+  {/if}
+
+  </script>
 </div> <!-- content -->
 

extensions/gally/gally-default/template/picture.tpl

@@ -1 +1 @@
 <!-- **GBL** >PICTURE> -->
 
+    {if isset($MENUBAR) and #menuAnimated# == "noswitch"}
+      <div class="titrePage" id='titrePageID'>
+        {$MENUBAR}
+      </div>
+    {/if}
+
+
+
+
 {include file='dialogs.tpl'}
 
-<div id="content">
+<div id="content" {if isset($MENUBAR)}class="pictureContent"{/if}>
 
   <div id="theImageHigh" style="display:none;">
@@ -20 +29 @@
 
   <div id="imageHeaderBar">
+
+    {if isset($MENUBAR) and #menuAnimated# != "noswitch"}
+      <div class="titrePage" id='titrePageID'>
+        <div id="menuswitcher">
+          <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp;
+          </a>
+        </div>
+      </div>
+      {$MENUBAR}
+    {/if}
+
     <div class="browsePath">
       <h2>
@@ -83 +103 @@
           }{/literal}
           </script>
-          <a id="icon_caddie" class="button" href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}"></a>
-          {/if} {*caddie management END*}
+          <a id="icon_caddie" class="button" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}"></a>
+          {/if}
+          <script type="text/javascript">
+            $('div.randomButtons a.button').addClass('sTipOnRight');
+          </script>
         </div>
+
         {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
 
@@ -127 +151 @@
 
     {if isset($COMMENT_IMG)}
-    <p>{$COMMENT_IMG}</p>
+    <p class="imageComment">{$COMMENT_IMG}</p>
     {else}
     <p>&nbsp;</p>
@@ -166 +190 @@
 
     </ul>
+
     <div id="theTabsBg"></div>
 
@@ -277 +302 @@
             {/if}
 
-            {if (isset($rate_summary) or isset($rating)) and  $display_info.average_rate}
+            {if (isset($rate_summary) or isset($rating)) and  $display_info.rating_score}
               <tr>
                 {if isset($rate_summary)}
-                  <td class="label">{'Average rate'|@translate}</td>
-                  <td class="value" id="ratingSummary">
+                  <td class="label">{'Rating score'|@translate}</td>
+                  <td class="value">
                   {if $rate_summary.count}
-                    {assign var='rate_text' value='%.2f (rated %d times)'|@translate }
-                    {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count) }
+                    <span id="ratingScore">{$rate_summary.score}</span>
+                    <span id="ratingCount">({assign var='rate_text' value='%d rates'|@translate}{$pwg->sprintf($rate_text, $rate_summary.count)})</span>
                   {else}
-                    {'no rate'|@translate}
+                    <span id="ratingScore">{'no rate'|@translate}</span> <span id="ratingCount"></span>
                   {/if}
                   </td>

extensions/gally/gally-default/template/picture_content.tpl

@@ -2 +2 @@
 
   <div id="theImgContainer" {if isset($high) }onclick="gallyPP.openDisplayHigh('{$high.U_HIGH}');" class="pointer"{/if}>
-    <img id="theImg" src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}"
+    <img id="theMainImage" src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}"
       {if isset($COMMENT_IMG)}
         title="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}" {else} title="{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}"

extensions/gally/gally-default/template/picture_nav_buttons.tpl

@@ -3 +3 @@
 
   {if isset($last)}
-    <a id="icon_last" class="navButton" href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" rel="last"></a>
+    <a id="icon_last" class="navButton" href="{$last.U_IMG}"
+       title="<span class='navDesc'><span class='navAction'>{'Last'|@translate}</span>{if $DISPLAY_NAV_THUMB}<br><img src='{$last.THUMB_SRC}' class='thumbLink thumbNav' id='linkPrev' alt=''>{/if}<br><span class='navTitle'>{$last.TITLE}</span></span>"
+       rel="last"></a>
   {else}
-    <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a>
+    <a id="icon_last_unactive" class="navButton"></a>
   {/if}
 
   {if isset($next)}
-    <a id="icon_right" class="navButton" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next"></a>
+    <a id="icon_right" class="navButton" href="{$next.U_IMG}"
+       title="<span class='navDesc'><span class='navAction'>{'Next'|@translate}</span>{if $DISPLAY_NAV_THUMB}<br><img src='{$next.THUMB_SRC}' class='thumbLink thumbNav' id='linkPrev' alt=''>{/if}<br><span class='navTitle'>{$next.TITLE}</span></span>"
+       rel="next"></a>
   {else}
-    <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a>
+    <a id="icon_right_unactive" class="navButton"></a>
   {/if}
 
@@ -27 +31 @@
 
   {if isset($previous)}
-    <a id="icon_left" class="navButton" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev"></a>
+    <a id="icon_left" class="navButton" href="{$previous.U_IMG}"
+       title="<span class='navDesc'><span class='navAction'>{'Previous'|@translate}</span>{if $DISPLAY_NAV_THUMB}<br><img src='{$previous.THUMB_SRC}' class='thumbLink' id='linkPrev' alt=''>{/if}<br><span class='navTitle'>{$previous.TITLE}</span></span>"
+       rel="prev"></a>
   {else}
-    <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a>
+    <a id="icon_left_unactive" class="navButton"></a>
   {/if}
 
   {if isset($first)}
-    <a id="icon_first" class="navButton" href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" rel="first"></a>
+    <a id="icon_first" class="navButton" href="{$first.U_IMG}"
+       title="<span class='navDesc'><span class='navAction'>{'First'|@translate}</span>{if $DISPLAY_NAV_THUMB}<br><img src='{$first.THUMB_SRC}' class='thumbLink thumbNav' id='linkPrev' alt=''>{/if}<br><span class='navTitle'>{$first.TITLE}</span></span>"
+       rel="first"></a>
   {else}
-    <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a>
+    <a id="icon_first_unactive" class="navButton"></a>
   {/if}
 
@@ -51 +59 @@
       <a id="icon_dec_period" class="navButton" href="{$slideshow.U_DEC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}"></a>
     {else}
-      <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a>
+      <a id="icon_dec_period_unactive" class="navButton" ></a>
     {/if}
 
@@ -57 +65 @@
       <a id="icon_inc_period" class="navButton" href="{$slideshow.U_INC_PERIOD}" title="{'Reduce diaporama speed'|@translate}"></a>
     {else}
-      <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a>
+      <a id="icon_inc_period_unactive" class="navButton"></a>
     {/if}
   {/if}

extensions/gally/gally-default/template/profile.tpl

@@ -5 +5 @@
 {include file='dialogs.tpl'}
 
-  <div class="titrePage">
+  <div class="titrePage" id='titrePageID'>
+
+    {if isset($MENUBAR)}
+      {if #menuAnimated# == "noswitch"}
+        {$MENUBAR}
+      {else}
+      <div id="menuswitcher">
+        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp;
+        </a>
+      </div>
+      {/if}
+    {/if}
+
     <ul class="categoryActions">
       <li><a id="icon_home" class="button" href="{$U_HOME}" title="{'Home'|@translate}"></a></li>
@@ -12 +24 @@
   </div>
 
+
+  {if #menuAnimated# != "noswitch" and isset($MENUBAR)}
+    {$MENUBAR}
+  {/if}
+
 {$PROFILE_CONTENT}
 </div> <!-- content -->

extensions/gally/gally-default/template/profile_content.tpl

@@ -48 +48 @@
       <li>
         <div class="property">
-          <label for="nb_image_line">{'Number of photos per row'|@translate}</label>
+          <label for="nb_image_page">{'Number of photos per page'|@translate}</label>
         </div>
-        <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{$NB_IMAGE_LINE}">
-      </li>
-      <li>
-        <div class="property">
-          <label for="nb_line_page">{'Number of rows per page'|@translate}</label>
-        </div>
-        <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{$NB_ROW_PAGE}" >
+        <input type="text" size="3" maxlength="2" name="nb_image_page" id="nb_image_page" value="{$NB_IMAGE_PAGE}">
       </li>
       <li>

extensions/gally/gally-default/template/register.tpl

@@ -1 +1 @@
 <!-- **GBL** >REGISTER> -->
+
 
 <div id="registerPage">
@@ -5 +6 @@
 <div id="content" class="content">
 
-  <div class="titrePage">
+  <div class="titrePage" id='titrePageID'>
+
+    {if isset($MENUBAR)}
+      {if #menuAnimated# == "noswitch"}
+        {$MENUBAR}
+      {else}
+      <div id="menuswitcher">
+        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp;
+        </a>
+      </div>
+      {/if}
+    {/if}
+
     <ul class="categoryActions">
       <li><a id="icon_home" class="button" href="{$U_HOME}" title="{'Home'|@translate}"></a></li>
@@ -11 +24 @@
     <h2>{'Registration'|@translate}</h2>
   </div>
+
+  {if #menuAnimated# != "noswitch" and isset($MENUBAR)}
+    {$MENUBAR}
+  {/if}
 
 {include file='dialogs.tpl'}
@@ -41 +58 @@
           <label for="mail_address">{'Email address'|@translate}</label>
         </div>
-        <input type="text" name="mail_address" id="mail_address" value="{$F_EMAIL}" size=35>
-        ({'useful when password forgotten'|@translate})
+        <input type="text" name="mail_address" id="mail_address" value="{$F_EMAIL}" size=35>{if $main.obligatory_user_mail_address}<span class="mandatorystar">*</span>{else}({'useful when password forgotten'|@translate}){/if}
+
       </li>
     </ul>

extensions/gally/gally-default/template/search.tpl

@@ -1 +1 @@
 <!-- **GBL** >SEARCH> -->
+
 <div id="content" class="content">
 
-  <div class="titrePage">
+  <div class="titrePage" id='titrePageID'>
+
+    {if isset($MENUBAR)}
+      {if #menuAnimated# == "noswitch"}
+        {$MENUBAR}
+      {else}
+      <div id="menuswitcher">
+        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp;
+        </a>
+      </div>
+      {/if}
+    {/if}
+
     <ul class="categoryActions">
       <li><a id="icon_help" class="button" href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" rel="nofollow"> </a></li>
@@ -9 +22 @@
     <h2>{'Search'|@translate}</h2>
   </div>
+
+
+  {if #menuAnimated# != "noswitch" and isset($MENUBAR)}
+    {$MENUBAR}
+  {/if}
 
 {include file='dialogs.tpl'}

extensions/gally/gally-default/template/tags.tpl

@@ -1 +1 @@
 <div id="content" class="content">
 
-  <div class="titrePage">
+  <div class="titrePage" id='titrePageID'>
+
+    {if isset($MENUBAR)}
+      {if #menuAnimated# == "noswitch"}
+        {$MENUBAR}
+      {else}
+      <div id="menuswitcher">
+        <a id="icon_menu" class="button" onclick="gallyCP.switchmenu('', '{$ROOT_URL}{$themeconf.icon_dir}/');">&nbsp;
+        </a>
+      </div>
+      {/if}
+    {/if}
+
+
     <ul class="categoryActions">
 {if $display_mode == 'letters'}
@@ -15 +28 @@
     <h2>{'Tags'|@translate}</h2>
   </div>
+
+
+  {if #menuAnimated# != "noswitch" and isset($MENUBAR)}
+    {$MENUBAR}
+  {/if}
 
 {if isset($tags)}
@@ -35 +53 @@
       {foreach from=$letter.tags item=tag}
       <tr class="tagLine">
-        <td><a href="{$tag.URL}">{$tag.name}</a></td>
+        <td><a href="{$tag.URL}"  title="{$tag.name}">{$tag.name}</a></td>
         <td class="nbEntries">{$pwg->l10n_dec('%d photo', '%d photos', $tag.counter)}</td>
       </tr>

extensions/gally/gally-default/template/thumbnails.tpl

@@ -9 +9 @@
           <span class="wrap2">
           <a href="{$thumbnail.URL}">
-            <img {if isset($thumbnail.LONGDESC) and $thumbnail.LONGDESC!=""}longdesc="{$thumbnail.LONGDESC}"{/if} class="thumbnail {if isset($thumbnail.EXTRA_CLASS)}{$thumbnail.EXTRA_CLASS}{/if}" src="{$thumbnail.TN_SRC}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}" />
+            <img {if isset($thumbnail.LONGDESC) and $thumbnail.LONGDESC!=""}longdesc="{$thumbnail.LONGDESC}"{/if}
+                  class="thumbnail {if isset($thumbnail.EXTRA_CLASS)}{$thumbnail.EXTRA_CLASS}{/if}"
+                  src="{$thumbnail.TN_SRC}"
+                  alt="{$thumbnail.TN_ALT}"
+                  title="{$thumbnail.TN_TITLE}" />
           </a>
           </span>
@@ -16 +20 @@
       <tr>
         <td>
-          <span class="thumbLegend">
+          {if $SHOW_THUMBNAIL_CAPTION }
+            <span class="thumbLegend">
 
-          {if !empty($thumbnail.icon_ts)}
-            <img title="{$thumbnail.icon_ts.TITLE}" src="{$ROOT_URL}{$themeconf.icon_dir}/recent.png" class="newImage" alt="(!)">
-          {/if}
-          {if !empty($thumbnail.NAME)}{$thumbnail.NAME}{/if}
+            {if !empty($thumbnail.icon_ts)}
+              <span class="newImage button id_recent"></span>
+            {/if}
+            {if !empty($thumbnail.NAME)}{$thumbnail.NAME}{/if}
 
 
-          {if isset($thumbnail.NB_COMMENTS)}
-          <span class="{if 0==$thumbnail.NB_COMMENTS}zero {/if}nb-comments">
-          <br />
-          {$pwg->l10n_dec('%d comment', '%d comments',$thumbnail.NB_COMMENTS)}
-          </span>
+            {if isset($thumbnail.NB_COMMENTS)}
+            <span class="{if 0==$thumbnail.NB_COMMENTS}zero {/if}nb-comments">
+            <br />
+            {$pwg->l10n_dec('%d comment', '%d comments',$thumbnail.NB_COMMENTS)}
+            </span>
+            {/if}
+
+            {if isset($thumbnail.NB_HITS)}
+            <span class="{if 0==$thumbnail.NB_HITS}zero {/if}nb-hits">
+            <br />
+            {$pwg->l10n_dec('%d hit', '%d hits',$thumbnail.NB_HITS)}
+            </span>
+            {/if}
+            </span>
           {/if}
-
-          {if isset($thumbnail.NB_HITS)}
-          <span class="{if 0==$thumbnail.NB_HITS}zero {/if}nb-hits">
-          <br />
-          {$pwg->l10n_dec('%d hit', '%d hits',$thumbnail.NB_HITS)}
-          </span>
-          {/if}
-          </span>
         </td>
       </tr>