Changeset 10360


Ignore:
Timestamp:
04/13/11 19:13:17 (8 years ago)
Author:
Eric
Message:

r10359 merged from trunk to branch 2.20

Location:
extensions/UserAdvManager/branches/2.20
Files:
13 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/branches/2.20/admin/UAM_admin.php

    r10343 r10360  
    381381 
    382382  // Template initialization for forms and data 
     383 
     384  $themeconf=$template->get_template_vars('themeconf'); 
     385  $UAM_theme=$themeconf['id']; 
     386 
    383387  $template->assign( 
    384388    array( 
     
    388392    'UAM_PATH'                       => UAM_PATH, 
    389393    'UAM_DUMP_DOWNLOAD'              => $dump_download, 
     394    'UAM_THEME'                      => $UAM_theme, 
    390395                'UAM_MAIL_INFO_TRUE'             => $conf_UAM[0]=='true' ?  'checked="checked"' : '' , 
    391396                'UAM_MAIL_INFO_FALSE'            => $conf_UAM[0]=='false' ?  'checked="checked"' : '' , 
  • extensions/UserAdvManager/branches/2.20/admin/template/global.tpl

    r10343 r10360  
    33 
    44{combine_css path= $UAM_PATH|@cat:'admin/template/uam.css'} 
     5{if $UAM_THEME=='clear'}{combine_css path= $UAM_PATH|@cat:'admin/template/themes/clear/theme.css'}{/if} 
     6{if $UAM_THEME=='roma'}{combine_css path= $UAM_PATH|@cat:'admin/template/themes/roma/theme.css'}{/if} 
     7{if $UAM_THEME=='default'}{combine_css path= $UAM_PATH|@cat:'admin/template/themes/default/theme.css'}{/if} 
     8 
    59 
    610<script type="text/javascript"> 
  • extensions/UserAdvManager/branches/2.20/admin/template/uam.css

    r10145 r10360  
    3838.instructionBlockHeaderCollapsed, .instructionBlockHeaderExpanded 
    3939{ 
    40   background-color:#111; 
    41   background-position:15px center; 
    42   background-repeat:no-repeat; 
    43   color:#ff3363; 
    44   cursor:pointer; 
    45   font-size:110%; 
    46   overflow:hidden; 
    47   padding:8px 41px; 
     40  background-color: #111; 
     41  background-position: 15px center; 
     42  background-repeat: no-repeat; 
     43  color: #ff3363; 
     44  cursor: pointer; 
     45  font-size: 110%; 
     46  overflow: hidden; 
     47  padding: 8px 41px; 
    4848  text-align: left; 
    4949} 
     
    5353  border-bottom: none; 
    5454} 
    55   
    56 .instructionBlockHeaderCollapsed 
    57 { 
    58   background-image: url(./icon/expand.gif); 
    59 } 
    60  
    61 .instructionBlockHeaderExpanded 
    62 { 
    63   background-image: url(./icon/collapse.gif); 
    64 } 
    6555 
    6656.instructionBlockContent 
    6757{ 
    68   padding:0 15px 15px; 
     58  padding: 0 15px 15px; 
    6959} 
    7060 
  • extensions/UserAdvManager/branches/2.20/changelog.txt.php

    r10343 r10360  
    239239-- 2.20.2 : Bug 2256 fixed - Error on upgrade from version 2.20.0 to 2.20.1 
    240240 
    241 -- 2.20.3 : Bug 2257 
     241-- 2.20.3 : Bug 2257 fixed - Improve admin panel display with clear theme 
    242242            Bug 2258 fixed - New feature to backup UAM configuration and personnal settings 
    243243 
Note: See TracChangeset for help on using the changeset viewer.