Changeset 10179


Ignore:
Timestamp:
Apr 9, 2011, 12:53:42 PM (10 years ago)
Author:
cljosse
Message:

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

Location:
extensions/Mail_supervisor
Files:
12 added
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/Mail_supervisor/admin/header_2_1.tpl

    r9702 r10179  
    22{known_script id="jquery" src= $ROOT_URL|@cat:$path_js|@cat:"jquery.packed.js" }
    33{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:$path_js|@cat:"plugins/jquery.cluetip.packed.js" }
    4 {known_script id="mail_script" src= $MAIL_SUPERV_PATH|@cat:"include/Scripts.js"}{/html_head}
     4{known_script id="mail_script" src= $MAIL_SUPERV_PATH|@cat:"include/Scripts.js"}
     5<link rel="stylesheet" type="text/css" href="{$MAIL_SUPERV_PATH}admin/{$theme}/theme.css" />
     6
     7{/html_head}
    58<input id="action_spam" name="action_spam" type="hidden" value="{$action_spam}" />
  • extensions/Mail_supervisor/admin/header_2_2.tpl

    r10155 r10179  
    44
    55<input id="action_spam" name="action_spam" type="hidden" value="{$action_spam}" />
    6 {combine_css path= $MAIL_SUPERV_PATH|@cat:'admin/theme.css'}
     6{if $theme=='clear'}{combine_css path= $MAIL_SUPERV_PATH|@cat:'admin/clear/theme.css'}{/if}
     7{if $theme=='roma'}{combine_css path= $MAIL_SUPERV_PATH|@cat:'admin/roma/theme.css'}{/if}
     8{if $theme=='default'}{combine_css path= $MAIL_SUPERV_PATH|@cat:'admin/clear/theme.css'}{/if}
     9
  • extensions/Mail_supervisor/mail_super.inc.php

    r10093 r10179  
    4747 static public function init() {
    4848  global  $template,$version,$path_js,$icon_path;
     49
     50 $theme="default";
     51
    4952  if (PHPWG_VERSION < 2.2 ) {
    5053    $file =MAIL_SUPERV_PATH_ABS.'admin/header_2_1.tpl' ;
    5154    if (PHPWG_VERSION < 2.0 ) $path_js =  "template-common/lib/";
    5255    else $path_js=  'themes/default/js/' ;
     56    $themeconf=$template->get_template_vars('themeconf');
     57    $theme=$themeconf['id'];
     58   
    5359  } else {
     60     $themeconf=$template->get_template_vars('themeconf');
     61    $theme=$themeconf['id'];
    5462    $file =MAIL_SUPERV_PATH_ABS.'admin/header_2_2.tpl' ;
    5563    $path_js=  'themes/default/js/' ;
     
    6068    unset ($_SESSION['pwg_'.'action_spam']);
    6169  }
     70 
    6271
    6372  $template->set_filenames(array('mail_superv_init'=> $file ));
    6473  if (file_exists ( 'admin/themes/clear/icon/help.png')) $icon_path = 'themes/default/icon/help.png';
    6574  else  $icon_path =  "admin/template/goto/theme/clear/icon/help.png";
    66   $template->assign(
    67       array('version' => $version,
     75  $template->assign( 
     76      array('theme' => $theme,'version' => $version,
    6877      'PHPWG_VERSION' =>     PHPWG_VERSION ,
    6978      'MAIL_SUPERV_PATH' =>  MAIL_SUPERV_PATH ,
Note: See TracChangeset for help on using the changeset viewer.