Changeset 10179

Timestamp:

Apr 9, 2011, 12:53:42 PM (13 years ago)

Author:

cljosse

Message:

[extensions] mail_supervisor fix bug with theme: clear/roma

Location:

extensions/Mail_supervisor

Files:

• admin/clear (added)
• admin/clear/collapse.gif (added)
• admin/clear/expand.gif (added)
• admin/clear/theme.css (added)
• admin/default (added)
• admin/default/collapse.gif (added)
• admin/default/expand.gif (added)
• admin/default/theme.css (added)
• admin/header_2_1.tpl (modified) (1 diff)
• admin/header_2_2.tpl (modified) (1 diff)
• admin/roma (added)
• admin/roma/collapse.gif (added)
• admin/roma/expand.gif (added)
• admin/roma/theme.css (added)
• mail_super.inc.php (modified) (2 diffs)

extensions/Mail_supervisor/admin/header_2_1.tpl

@@ -2 +2 @@
 {known_script id="jquery" src= $ROOT_URL|@cat:$path_js|@cat:"jquery.packed.js" } 
 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:$path_js|@cat:"plugins/jquery.cluetip.packed.js" }
-{known_script id="mail_script" src= $MAIL_SUPERV_PATH|@cat:"include/Scripts.js"}{/html_head}
+{known_script id="mail_script" src= $MAIL_SUPERV_PATH|@cat:"include/Scripts.js"}
+<link rel="stylesheet" type="text/css" href="{$MAIL_SUPERV_PATH}admin/{$theme}/theme.css" />
+
+{/html_head}
 <input id="action_spam" name="action_spam" type="hidden" value="{$action_spam}" />

extensions/Mail_supervisor/admin/header_2_2.tpl

@@ -4 +4 @@
 
 <input id="action_spam" name="action_spam" type="hidden" value="{$action_spam}" />
-{combine_css path= $MAIL_SUPERV_PATH|@cat:'admin/theme.css'}
+{if $theme=='clear'}{combine_css path= $MAIL_SUPERV_PATH|@cat:'admin/clear/theme.css'}{/if}
+{if $theme=='roma'}{combine_css path= $MAIL_SUPERV_PATH|@cat:'admin/roma/theme.css'}{/if}
+{if $theme=='default'}{combine_css path= $MAIL_SUPERV_PATH|@cat:'admin/clear/theme.css'}{/if}
+

extensions/Mail_supervisor/mail_super.inc.php

@@ -47 +47 @@
  static public function init() {
   global  $template,$version,$path_js,$icon_path;
+
+ $theme="default";
+
   if (PHPWG_VERSION < 2.2 ) {
     $file =MAIL_SUPERV_PATH_ABS.'admin/header_2_1.tpl' ;
     if (PHPWG_VERSION < 2.0 ) $path_js =  "template-common/lib/";
     else $path_js=  'themes/default/js/' ;
+    $themeconf=$template->get_template_vars('themeconf');
+    $theme=$themeconf['id'];
+   
   } else {
+     $themeconf=$template->get_template_vars('themeconf');
+    $theme=$themeconf['id'];
     $file =MAIL_SUPERV_PATH_ABS.'admin/header_2_2.tpl' ;
     $path_js=  'themes/default/js/' ;
@@ -60 +68 @@
     unset ($_SESSION['pwg_'.'action_spam']);
   }
+ 
 
   $template->set_filenames(array('mail_superv_init'=> $file ));
   if (file_exists ( 'admin/themes/clear/icon/help.png')) $icon_path = 'themes/default/icon/help.png';
   else  $icon_path =  "admin/template/goto/theme/clear/icon/help.png";
-  $template->assign(
-      array('version' => $version,
+  $template->assign( 
+      array('theme' => $theme,'version' => $version,
       'PHPWG_VERSION' =>     PHPWG_VERSION ,
       'MAIL_SUPERV_PATH' =>  MAIL_SUPERV_PATH ,