- remove square/thumb from choices on picture

- fix content margin on password register 
- purge derivative cache by type of derivative
- session saved infos/messages are not given to the page on html redirections
- shorter/faster code in functions_xxx

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

4 files changed, 6 insertions, 7 deletions

diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl
index c0c8c8002..519e1a732 100644
--- a/themes/default/template/index.tpl
+++ b/themes/default/template/index.tpl
@@ -131,8 +131,9 @@ function toggleImageDerivativesBox() {
 
 </div>{* <!-- titrePage --> *}
 
+{if isset($errors) or not empty($infos)}
 {include file='infos_errors.tpl'}
-
+{/if}
 {if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
 
 {if !empty($category_search_results)}
diff --git a/themes/default/template/password.tpl b/themes/default/template/password.tpl
index 2546adea2..eb78122e6 100644
--- a/themes/default/template/password.tpl
+++ b/themes/default/template/password.tpl
@@ -1,5 +1,5 @@
 {if isset($MENUBAR)}{$MENUBAR}{/if}
-<div id="content" class="content">
+<div id="content" class="content{if isset($MENUBAR)} contentWithMenu{/if}">
   <div class="titrePage">
     <ul class="categoryActions">
       <li>
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index ff9ad2729..b679d2ebb 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -1,14 +1,13 @@
 {* Example of resizeable
 {include file='include/autosize.inc.tpl'}
 *}
-
 {if isset($MENUBAR)}
 {$MENUBAR}
 <div id="content" class="contentWithMenu">
 {/if}
-
+{if isset($errors) or not empty($infos)}
 {include file='infos_errors.tpl'}
-
+{/if}
 {if !empty($PLUGIN_PICTURE_BEFORE)}{$PLUGIN_PICTURE_BEFORE}{/if}
 
 <div id="imageHeaderBar">
@@ -274,7 +273,6 @@ y.callService(
 </div>
 
 {if isset($COMMENT_COUNT)}
-<a name="comments"></a>
 <div id="comments">
 	{if $COMMENT_COUNT > 0}
 		<h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3>
diff --git a/themes/default/template/register.tpl b/themes/default/template/register.tpl
index 525d53342..e1d25a2ad 100644
--- a/themes/default/template/register.tpl
+++ b/themes/default/template/register.tpl
@@ -1,7 +1,7 @@
 {if isset($MENUBAR)}{$MENUBAR}{/if}
 <div id="registerPage">
 
-<div id="content" class="content">
+<div id="content" class="content{if isset($MENUBAR)} contentWithMenu{/if}">
 
 <div class="titrePage">
 	<ul class="categoryActions">