Changeset 9925

Show
Ignore:
Timestamp:
03/29/11 21:37:56 (2 years ago)
Author:
Eric
Message:

r9924 merged from trunk to branch 2.20

Location:
extensions/UserAdvManager/branches/2.20
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • extensions/UserAdvManager/branches/2.20/GT_del_account.php

    r9267 r9925  
    3939  array( 
    4040    'GALLERY_URL'          => make_index_url(), 
    41         'CUSTOM_REDIR_MSG'     => $custom_text, 
     41    'CUSTOM_REDIR_MSG'     => $custom_text, 
    4242  ) 
    4343); 

  • extensions/UserAdvManager/branches/2.20/USR_del_account.php

    r9267 r9925  
    3939  array( 
    4040    'GALLERY_URL'          => make_index_url(), 
    41         'CUSTOM_REDIR_MSG'     => $custom_text, 
     41    'CUSTOM_REDIR_MSG'     => $custom_text, 
    4242  ) 
    4343); 

  • extensions/UserAdvManager/branches/2.20/admin/template/ghosttracker.tpl

    r9459 r9925  
    44{combine_script id='jquery.tablesorter.pager' require='jquery' path=$UAM_PATH|@cat:'admin/template/js/jquery.tablesorter.pager.js'} 
    55 
    6 {html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head} 
     6{combine_css path= $UAM_PATH|@cat:'admin/template/uam.css'} 
    77 
    88<script type="text/javascript"> 

  • extensions/UserAdvManager/branches/2.20/admin/template/global.tpl

    r9909 r9925  
    22{combine_script id='jquery.cluetip' require='jquery' path='themes/default/js/plugins/jquery.cluetip.packed.js'} 
    33 
    4 {html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head} 
     4{combine_css path= $UAM_PATH|@cat:'admin/template/uam.css'} 
    55 
    66<script type="text/javascript"> 

  • extensions/UserAdvManager/branches/2.20/admin/template/userlist.tpl

    r9459 r9925  
    44{combine_script id='jquery.tablesorter.pager' require='jquery' path=$UAM_PATH|@cat:'admin/template/js/jquery.tablesorter.pager.js'} 
    55 
    6 {html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head} 
     6{combine_css path= $UAM_PATH|@cat:'admin/template/uam.css'} 
    77 
    88<script type="text/javascript"> 

  • extensions/UserAdvManager/branches/2.20/admin/template/usermanager.tpl

    r9459 r9925  
    44{combine_script id='jquery.tablesorter.pager' require='jquery' path=$UAM_PATH|@cat:'admin/template/js/jquery.tablesorter.pager.js'} 
    55 
    6 {html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head} 
     6{combine_css path= $UAM_PATH|@cat:'admin/template/uam.css'} 
    77 
    88<script type="text/javascript">