Changeset 5695

Timestamp:

Apr 7, 2010, 10:09:30 AM (14 years ago)

Author:

patdenice

Message:

Fix some issues on NBM: move css rules to mail body if it's possible.
Remove fieldset on available plugins page.

Location:

trunk

Files:

• admin/themes/default/default-layout.css (modified) (1 diff)
• admin/themes/default/template/plugins_new.tpl (modified) (2 diffs)
• include/functions_mail.inc.php (modified) (2 diffs)
• themes/Sylvia/mail-css.tpl (modified) (1 diff)
• themes/clear/mail-css.tpl (modified) (1 diff)
• themes/dark/mail-css.tpl (modified) (1 diff)
• themes/default/images/mail (deleted)
• themes/default/template/mail/text/html/global-mail-css.tpl (modified) (1 diff)

trunk/admin/themes/default/default-layout.css

@@ -771 +771 @@
 #helpContent P.nextStepLink {text-align:center; font-weight:bold; margin-bottom:20px;}
 
-#configContent FIELDSET {border:none;}
+#configContent FIELDSET, #availablePlugins FIELDSET  {border:none;}
 
 /**

trunk/admin/themes/default/template/plugins_new.tpl

@@ -31 +31 @@
 
 {if not empty($plugins)}
+<div id="availablePlugins">
 <fieldset>
 <legend></legend>
@@ -67 +68 @@
 {/foreach}
 </fieldset>
+</div>
 {else}
 <p>{'There is no other plugin available.'|@translate}</p>

trunk/include/functions_mail.inc.php

@@ -772 +772 @@
 }
 
+function move_ccs_rules_to_body($content)
+{
+  // We search all css rules in style tags
+  preg_match('#<style>(.*?)</style>#s', $content, $matches);
+
+  if (!empty($matches[1]))
+  {
+    preg_match_all('#([^\n]*?)\{(.*?)\}#s', $matches[1], $matches);
+
+    $selectors = array();
+    $unknow_selectors = '';
+
+    foreach ($matches[1] as $key => $value)
+    {
+      $selects = explode(',', $value);
+      $style = trim($matches[2][$key], ' ;');
+
+      foreach($selects as $select)
+      {
+        $select = trim($select);
+        $selectors[$select][] = $style;
+      }
+    }
+    foreach ($selectors as $selector => $style)
+    {
+      if (!preg_match('/^(#|\.|)([A-Za-z0-9_-]*)$/', $selector, $matches))
+      {
+        $unknow_selectors .= $selector.' {'.implode('; ', $style).";}\n";
+      }
+      else switch ($matches[1])
+      {
+        case '#':
+          $content = preg_replace('|id="'.$matches[2].'"|', 'id="'.$matches[2].'" style="'.implode('; ', $style).';"', $content);
+          break;
+        case '.':
+          $content = preg_replace('|class="'.$matches[2].'"|', 'class="'.$matches[2].'" style="'.implode('; ', $style).';"', $content);
+          break;
+        default:
+          $content = preg_replace('#<'.$matches[2].'( |>)#', '<'.$matches[2].' style="'.implode('; ', $style).';"$1', $content);
+          break;
+      }
+    }
+
+    // Keep unknow tags in page head
+    if (!empty($unknow_selectors))
+    {
+      $content = preg_replace('#<style>.*?</style>#s', "<style type=\"text/css\">\n$unknow_selectors</style>", $content);
+    }
+    else
+    {
+      $content = preg_replace('#<style>.*?</style>#s', '', $content);
+    }
+  }
+  return $content;
+}
+
 /*Testing block*/
 /*function pwg_send_mail_test($result, $to, $subject, $content, $headers, $args)
@@ -801 +857 @@
 
 add_event_handler('send_mail', 'pwg_send_mail', EVENT_HANDLER_PRIORITY_NEUTRAL, 5);
+add_event_handler('send_mail_content', 'move_ccs_rules_to_body');
 trigger_action('functions_mail_included');
 

trunk/themes/Sylvia/mail-css.tpl

@@ -2 +2 @@
 
 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; }

trunk/themes/clear/mail-css.tpl

@@ -2 +2 @@
 
 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; }

trunk/themes/dark/mail-css.tpl

@@ -2 +2 @@
 
 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; }

trunk/themes/default/template/mail/text/html/global-mail-css.tpl

@@ -3 +3 @@
 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;}