merge spread_menus to the core

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

14 files changed, 49 insertions, 60 deletions

diff --git a/themes/Sylvia/theme.css b/themes/Sylvia/theme.css
index 22f0ff13f..252ccf5c0 100644
--- a/themes/Sylvia/theme.css
+++ b/themes/Sylvia/theme.css
@@ -141,6 +141,10 @@
 .content { 
 	background:#222 url(images/fillet.gif) repeat-x scroll left top; 
 	min-height:466px; 
+	border: 1px solid #000; 
+	border-top: 0; 
+	margin:21px 7px 0 290px !important; 
+	padding-top:7px; 
 }
 
 #the_page { 
@@ -155,13 +159,6 @@
 	min-width: 100%; 
 }
 
-#theCategoryPage .content { 
-	border: 1px solid #000; 
-	border-top: 0; 
-	margin:21px 7px 0 290px !important; 
-	padding-top:7px; 
-}
-
 .content h2 { 
 	margin:0; 
 	padding:0px 10px 15px 15px; 
@@ -362,6 +359,10 @@
 	border-top:0 !important; 
 }
 
+.pictureContent {
+	margin:0 7px 7px 290px;
+}
+
 #addComment fieldset {
   color: #f70;
 	border-color: #f70;
diff --git a/themes/default/local_head.tpl b/themes/default/local_head.tpl
index d35ab8401..38bb4ec0e 100644
--- a/themes/default/local_head.tpl
+++ b/themes/default/local_head.tpl
@@ -6,4 +6,6 @@
 		<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie7.css">
 	<![endif]-->
 	{combine_css path="themes/default/print.css" order=-10}
-{/if}
\ No newline at end of file
+{/if}
+
+{if !isset($MENUBAR)}<style type="text/css">.content {ldelim} margin-left:auto !important; }</style>{/if}
\ No newline at end of file
diff --git a/themes/default/template/about.tpl b/themes/default/template/about.tpl
index 2ce658c44..f86d7bef3 100644
--- a/themes/default/template/about.tpl
+++ b/themes/default/template/about.tpl
@@ -1,10 +1,7 @@
+{if isset($MENUBAR)}{$MENUBAR}{/if}
 <div id="content" class="content">
   <div class="titrePage">
-    <ul class="categoryActions">
-			<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
-				<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
-			</a></li>
-    </ul>
+    <ul class="categoryActions"></ul>
     <h2>{'About'|@translate}</h2>
   </div>
   <div id="piwigoAbout">
diff --git a/themes/default/template/comments.tpl b/themes/default/template/comments.tpl
index 56f3b8a86..543a15cb8 100644
--- a/themes/default/template/comments.tpl
+++ b/themes/default/template/comments.tpl
@@ -1,11 +1,8 @@
+{if isset($MENUBAR)}{$MENUBAR}{/if}
 <div id="content" class="content">
 
 <div class="titrePage">
-	<ul class="categoryActions">
-		<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
-			<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
-		</a></li>
-	</ul>
+	<ul class="categoryActions"></ul>
 	<h2>{'User comments'|@translate}</h2>
 </div>
 
diff --git a/themes/default/template/identification.tpl b/themes/default/template/identification.tpl
index 3fcc24b50..2741e685b 100644
--- a/themes/default/template/identification.tpl
+++ b/themes/default/template/identification.tpl
@@ -1,11 +1,8 @@
+{if isset($MENUBAR)}{$MENUBAR}{/if}
 <div id="content" class="content">
 
 <div class="titrePage">
-	<ul class="categoryActions">
-		<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
-			<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
-		</a></li>
-	</ul>
+	<ul class="categoryActions"></ul>
 	<h2>{'Identification'|@translate}</h2>
 </div>
 
diff --git a/themes/default/template/nbm.tpl b/themes/default/template/nbm.tpl
index 5c40d2938..2227e1453 100644
--- a/themes/default/template/nbm.tpl
+++ b/themes/default/template/nbm.tpl
@@ -1,11 +1,7 @@
-
+{if isset($MENUBAR)}{$MENUBAR}{/if}
 <div id="content" class="content">
 	<div class="titrePage">
-		<ul class="categoryActions">
-			<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
-				<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
-			</a></li>
-		</ul>
+		<ul class="categoryActions"></ul>
 		<h2>{'Notification'|@translate}</h2>
 	</div>
 
diff --git a/themes/default/template/notification.tpl b/themes/default/template/notification.tpl
index 99317a872..62a6d47cd 100644
--- a/themes/default/template/notification.tpl
+++ b/themes/default/template/notification.tpl
@@ -2,14 +2,12 @@
 <link rel="alternate" type="application/rss+xml" title="{'Photos only RSS feed'|@translate}" href="{$U_FEED_IMAGE_ONLY}"> 
 <link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed (photos, comments)'|@translate}" href="{$U_FEED}"> 
 {/html_head} 
+
+{if isset($MENUBAR)}{$MENUBAR}{/if}
 <div id="content" class="content">
 
   <div class="titrePage">
-    <ul class="categoryActions">
-		<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
-			<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
-		</a></li>
-    </ul>
+    <ul class="categoryActions"></ul>
     <h2>{'Notification'|@translate}</h2>
   </div>
 
diff --git a/themes/default/template/password.tpl b/themes/default/template/password.tpl
index def94dff8..8b7390e4b 100644
--- a/themes/default/template/password.tpl
+++ b/themes/default/template/password.tpl
@@ -1,11 +1,8 @@
+{if isset($MENUBAR)}{$MENUBAR}{/if}
 <div id="content" class="content">
 
 	<div class="titrePage">
-		<ul class="categoryActions">
-			<li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}" class="pwg-state-default pwg-button">
-				<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
-			</a></li>
-		</ul>
+		<ul class="categoryActions"></ul>
 		<h2>{'Password forgotten'|@translate}</h2>
 	</div>
 
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 12d020269..d029aa33d 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -2,6 +2,11 @@
 {include file='include/autosize.inc.tpl'}
 *}
 
+{if isset($MENUBAR)}
+{$MENUBAR}
+<div id="content" class="pictureContent">
+{/if}
+
 {if isset($errors)}
 <div class="errors">
 	<ul>
@@ -310,3 +315,7 @@ y.callService(
 {/if}{*comments*}
 
 {if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if}
+
+{if isset($MENUBAR)}
+</div>
+{/if}
diff --git a/themes/default/template/profile.tpl b/themes/default/template/profile.tpl
index 3a401c599..0c23b7ee1 100644
--- a/themes/default/template/profile.tpl
+++ b/themes/default/template/profile.tpl
@@ -1,3 +1,4 @@
+{if isset($MENUBAR)}{$MENUBAR}{/if}
 <div id="content" class="content">
 
 {if isset($errors)}
@@ -11,11 +12,7 @@
 {/if}
 
 <div class="titrePage">
-	<ul class="categoryActions">
-		<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
-			<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
-		</a></li>
-	</ul>
+	<ul class="categoryActions"></ul>
 	<h2>{'Profile'|@translate}</h2>
 </div>
 
diff --git a/themes/default/template/register.tpl b/themes/default/template/register.tpl
index b827c3aa0..a96200f8a 100644
--- a/themes/default/template/register.tpl
+++ b/themes/default/template/register.tpl
@@ -1,13 +1,10 @@
+{if isset($MENUBAR)}{$MENUBAR}{/if}
 <div id="registerPage">
 
 <div id="content" class="content">
 
 <div class="titrePage">
-	<ul class="categoryActions">
-		<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
-			<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
-		</a></li>
-	</ul>
+	<ul class="categoryActions"></ul>
 	<h2>{'Registration'|@translate}</h2>
 </div>
 
diff --git a/themes/default/template/search.tpl b/themes/default/template/search.tpl
index e16e5e897..1a9a685d7 100644
--- a/themes/default/template/search.tpl
+++ b/themes/default/template/search.tpl
@@ -14,6 +14,7 @@
 {/literal}{/footer_script}
 *}
 
+{if isset($MENUBAR)}{$MENUBAR}{/if}
 <div id="content" class="content">
 
 	<div class="titrePage">
@@ -22,9 +23,6 @@
 			<li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" class="pwg-state-default pwg-button">
 				<span class="pwg-icon pwg-icon-help">&nbsp;</span><span class="pwg-button-text">{'Help'|@translate}</span>
 			</a></li>
-			<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
-				<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
-			</a></li>
 		</ul>
 		<h2>{'Search'|@translate}</h2>
 	</div>
diff --git a/themes/default/template/tags.tpl b/themes/default/template/tags.tpl
index f6da316f3..05b739fe4 100644
--- a/themes/default/template/tags.tpl
+++ b/themes/default/template/tags.tpl
@@ -1,3 +1,4 @@
+{if isset($MENUBAR)}{$MENUBAR}{/if}
 <div id="content" class="content">
 
 <div class="titrePage">
@@ -12,9 +13,6 @@
 			<span class="pwg-icon pwg-icon-letters">&nbsp;</span><span class="pwg-button-text">{'letters'|@translate}</span>
 		</a></li>
 {/if}
-		<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
-			<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
-		</a></li>
 	</ul>
 	<h2>{'Tags'|@translate}</h2>
 </div>
diff --git a/themes/default/theme.css b/themes/default/theme.css
index 1c7b075bb..d372d1d33 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -89,11 +89,6 @@
  * Content
  */
 .content {
-	margin: 1em;
-}
-
-#theCategoryPage .content
-{
 	margin-left: 20em;  /* = #menubar width + 2em */
 }
 
@@ -411,6 +406,16 @@ 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, 
+.pictureContent hr.separation { 
+	clear:none;
+}
+
 
 /**
  * Default Layout