10 files changed, 16 insertions, 18 deletions
diff --git a/themes/default/template/about.tpl b/themes/default/template/about.tpl
index 407ca2839..f95713c13 100644
--- a/themes/default/template/about.tpl
+++ b/themes/default/template/about.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><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
diff --git a/themes/default/template/comments.tpl b/themes/default/template/comments.tpl
index 8ea49754c..fd2cace00 100644
--- a/themes/default/template/comments.tpl
+++ b/themes/default/template/comments.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">
diff --git a/themes/default/template/identification.tpl b/themes/default/template/identification.tpl
index ecdff0bb1..7f6d53091 100644
--- a/themes/default/template/identification.tpl
+++ b/themes/default/template/identification.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">
@@ -47,16 +47,18 @@
     <input tabindex="4" type="submit" name="login" value="{'Submit'|@translate}">
   </p>
 
-  <p>
+	<p>
 {if isset($U_REGISTER)}
 		<a href="{$U_REGISTER}" title="{'Register'|@translate}" class="pwg-state-default pwg-button">
 			<span class="pwg-icon pwg-icon-register">&nbsp;</span><span>{'Register'|@translate}</span>
 		</a>
 {/if}
+{if isset($U_LOST_PASSWORD)}
 		<a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" class="pwg-state-default pwg-button">
 			<span class="pwg-icon pwg-icon-lost-password">&nbsp;</span><span>{'Forgot your password?'|@translate}</span>
 		</a>
-  </p>
+{/if}
+	</p>
 
 </form>
 
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl
index 5af08ba6d..bac0125e5 100644
--- a/themes/default/template/index.tpl
+++ b/themes/default/template/index.tpl
@@ -1,6 +1,6 @@
 {$MENUBAR}
 {if !empty($PLUGIN_INDEX_CONTENT_BEFORE)}{$PLUGIN_INDEX_CONTENT_BEFORE}{/if}
-<div id="content" class="content">
+<div id="content" class="content{if isset($MENUBAR)} contentWithMenu{/if}">
 <div class="titrePage">
 	<ul class="categoryActions">
 {if !empty($image_orders)}
diff --git a/themes/default/template/notification.tpl b/themes/default/template/notification.tpl
index 2a0718f5e..50cbd69ff 100644
--- a/themes/default/template/notification.tpl
+++ b/themes/default/template/notification.tpl
@@ -4,7 +4,7 @@
 {/html_head} 
 
 {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">
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 7eca7e650..6fb873771 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -4,7 +4,7 @@
 
 {if isset($MENUBAR)}
 {$MENUBAR}
-<div id="content" class="pictureContent">
+<div id="content" class="contentWithMenu">
 {/if}
 
 {include file='infos_errors.tpl'}
diff --git a/themes/default/template/profile.tpl b/themes/default/template/profile.tpl
index 0cd94c6b8..d1d26a126 100644
--- a/themes/default/template/profile.tpl
+++ b/themes/default/template/profile.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">
diff --git a/themes/default/template/search.tpl b/themes/default/template/search.tpl
index dd40a66c1..9c4e6450e 100644
--- a/themes/default/template/search.tpl
+++ b/themes/default/template/search.tpl
@@ -15,7 +15,7 @@
 *}
 
 {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">
diff --git a/themes/default/template/tags.tpl b/themes/default/template/tags.tpl
index 2858ae9f3..ca563e80f 100644
--- a/themes/default/template/tags.tpl
+++ b/themes/default/template/tags.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">
diff --git a/themes/default/theme.css b/themes/default/theme.css
index d3d6e9475..bf7e9355d 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -83,7 +83,7 @@
 /**
  * Content
  */
-.content {
+.contentWithMenu {
 	margin-left: 20em;  /* = #menubar width + 2em */
 }
 
@@ -417,12 +417,8 @@ TD.calDayHead {
 	background: url('icon/rating-stars.gif') no-repeat 0 center; width:16px;
 }
 
-/* only if menubar is shown */
-.pictureContent {
-	margin-left:20em;
-}
-.pictureContent #imageToolBar, 
-.pictureContent #theImage { 
+.contentWithMenu #imageToolBar, 
+.contentWithMenu #theImage { 
 	clear: none;
 }