Fix some issues on NBM: move css rules to mail body if it's possible.

Remove fieldset on available plugins page.

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

8 files changed, 6 insertions, 44 deletions

diff --git a/themes/Sylvia/mail-css.tpl b/themes/Sylvia/mail-css.tpl
index 66d51cac1..a579f7a0b 100644
--- a/themes/Sylvia/mail-css.tpl
+++ b/themes/Sylvia/mail-css.tpl
@@ -1,11 +1,9 @@
 /* Theme Sylvia mail css */
 
 body {ldelim} background-color:#111; color:#666;}
-#the_page {ldelim} }
-#content {ldelim} }
-#copyright {ldelim} background: transparent url({$ROOT_URL}themes/{$themeconf.theme}/images/bottom-left-bg.jpg) no-repeat scroll left bottom;
+#copyright {ldelim} background: transparent url({$ROOT_URL}themes/Sylvia/images/bottom-left-bg.jpg) no-repeat scroll left bottom;
 min-height: 220px; height: 220px; width: 100%; min-width: 100%; padding: 10px 100px 30px 100px; }
-h2 {ldelim} color:#f70;background: transparent url({$ROOT_URL}themes/{$themeconf.theme}/images/fillet.gif) repeat-x scroll left bottom; padding-bottom: 5px;}
+h2 {ldelim} color:#f70;background: transparent url({$ROOT_URL}themes/Sylvia/images/fillet.gif) repeat-x scroll left bottom; padding-bottom: 5px;}
 img {ldelim} margin: 16px; border: 16px solid #444; -moz-border-radius: 4px; border-radius: 4px 4px; }
 img:hover {ldelim} padding: 15px; border: 0; background-color:#222;-moz-border-radius: 4px; border-radius: 4px 4px; }
 a {ldelim} color: #f70; background-color: transparent; border:0; text-decoration: none;}
diff --git a/themes/clear/mail-css.tpl b/themes/clear/mail-css.tpl
index 6c5e149cd..c61e369ef 100644
--- a/themes/clear/mail-css.tpl
+++ b/themes/clear/mail-css.tpl
@@ -1,10 +1,7 @@
 /* Theme clear mail css */
 
 body {ldelim} background-color:#fff; color:#696969;}
-#the_page {ldelim} background: #fff url({$ROOT_URL}themes/default/images/mail/mailbody-bg.png) repeat-y scroll left top;}
-#content {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/header-bg.png) no-repeat scroll left top;}
-#copyright {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/footer-bg.png) no-repeat scroll left bottom;
-color: #333;}
+#copyright {ldelim} background: transparent; color: #333;}
 h2 {ldelim} background-color: #ddd;}
 img {ldelim} margin: 16px; border: 16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; }
 img:hover {ldelim} padding: 15px; border: 1px solid yellow;background-color:#faebd7; -moz-border-radius: 4px; border-radius: 4px 4px; }
diff --git a/themes/dark/mail-css.tpl b/themes/dark/mail-css.tpl
index e904a248d..6399c9efd 100644
--- a/themes/dark/mail-css.tpl
+++ b/themes/dark/mail-css.tpl
@@ -1,11 +1,8 @@
 /* Theme dark mail css */
 
 body {ldelim} background-color:#444; color:#fff;}
-#the_page {ldelim} background: #444 url({$ROOT_URL}themes/default/images/mail/mailbody-bg.png) repeat-y scroll left top;}
-#content {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/header-bg.png) no-repeat scroll left top;}
-#copyright {ldelim} background: transparent url({$ROOT_URL}themes/default/images/mail/footer-bg.png) no-repeat scroll left bottom;
-color: #69c;}
-h2 {ldelim} background-color: #333;color:#fff48e;background-image: url({$ROOT_URL}themes/{$themeconf.theme}/images/tableh1_bg.png);}
+#copyright {ldelim} color: #69c;}
+h2 {ldelim} background-color: #333; color:#fff48e;}
 img {ldelim} margin: 16px; border: 16px solid #111; -moz-border-radius: 4px; border-radius: 4px 4px; }
 img:hover {ldelim} padding: 15px; border: 1px solid yellow;background-color:#444;-moz-border-radius: 4px; border-radius: 4px 4px; }
 a {ldelim} color: #fff48e; background: transparent;border-bottom:1px dotted #005e89; }
diff --git a/themes/default/images/mail/footer-bg.png b/themes/default/images/mail/footer-bg.png
deleted file mode 100644
index fd3c2925f..000000000
--- a/themes/default/images/mail/footer-bg.png
+++ /dev/null
diff --git a/themes/default/images/mail/header-bg.png b/themes/default/images/mail/header-bg.png
deleted file mode 100644
index 1770a3ddc..000000000
--- a/themes/default/images/mail/header-bg.png
+++ /dev/null
diff --git a/themes/default/images/mail/index.php b/themes/default/images/mail/index.php
deleted file mode 100644
index 17747c927..000000000
--- a/themes/default/images/mail/index.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2010 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// Recursive call
-$url = '../';
-header( 'Request-URI: '.$url );
-header( 'Content-Location: '.$url );
-header( 'Location: '.$url );
-exit();
-?>
diff --git a/themes/default/images/mail/mailbody-bg.png b/themes/default/images/mail/mailbody-bg.png
deleted file mode 100644
index 722a24f63..000000000
--- a/themes/default/images/mail/mailbody-bg.png
+++ /dev/null
diff --git a/themes/default/template/mail/text/html/global-mail-css.tpl b/themes/default/template/mail/text/html/global-mail-css.tpl
index 5c8e87a54..072bcb0be 100644
--- a/themes/default/template/mail/text/html/global-mail-css.tpl
+++ b/themes/default/template/mail/text/html/global-mail-css.tpl
@@ -2,7 +2,7 @@
 
 body {ldelim} font-family: Univers, Helvetica, Optima; font-size:12px; margin:0px; padding:0px; }
 #the_page {ldelim} margin:0px; padding:0px; text-align:left;}
-#content {ldelim} margin:0px; padding:82px 0px 0px 62px; width:732px;}
+#content {ldelim} margin:0px; padding:30px 0px 0px 30px; width:732px;}
 hr {ldelim} width:632px; margin-left:0;}
 #copyright {ldelim} font-size:10px; margin:0px; padding:48px 0px 32px 62px;}
 .PWG {ldelim} font-family:verdana, sans-serif !important; font-size:0.9em; font-weight:normal; letter-spacing:0px;}