Changeset 9459


Ignore:
Timestamp:
03/01/11 16:53:52 (9 years ago)
Author:
Eric
Message:

r9458 merged from trunk to branch 2.20

Location:
extensions/NBC_UserAdvManager/branches/2.20/admin/template
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/NBC_UserAdvManager/branches/2.20/admin/template/ghosttracker.tpl

    r9325 r9459  
    1 {combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"} 
    2 {combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"} 
    3 {combine_script id="jquery.tablesorter" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"} 
    4 {combine_script id="jquery.tablesorter.pager" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"} 
     1{combine_script id='jquery' path='themes/default/js/jquery.min.js'} 
     2{combine_script id='jquery.cluetip' require='jquery' path='themes/default/js/plugins/jquery.cluetip.packed.js'} 
     3{combine_script id='jquery.tablesorter' require='jquery' path=$UAM_PATH|@cat:'admin/template/js/jquery.tablesorter.min.js'} 
     4{combine_script id='jquery.tablesorter.pager' require='jquery' path=$UAM_PATH|@cat:'admin/template/js/jquery.tablesorter.pager.js'} 
    55 
    66{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head} 
  • extensions/NBC_UserAdvManager/branches/2.20/admin/template/global.tpl

    r9296 r9459  
    1 {combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"} 
    2 {combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"} 
     1{combine_script id='jquery' path='themes/default/js/jquery.min.js'} 
     2{combine_script id='jquery.cluetip' require='jquery' path='themes/default/js/plugins/jquery.cluetip.packed.js'} 
    33 
    44{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head} 
  • extensions/NBC_UserAdvManager/branches/2.20/admin/template/userlist.tpl

    r9325 r9459  
    1 {combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"} 
    2 {combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"} 
    3 {combine_script id="jquery.tablesorter" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"} 
    4 {combine_script id="jquery.tablesorter.pager" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"} 
     1{combine_script id='jquery' path='themes/default/js/jquery.min.js'} 
     2{combine_script id='jquery.cluetip' require='jquery' path='themes/default/js/plugins/jquery.cluetip.packed.js'} 
     3{combine_script id='jquery.tablesorter' require='jquery' path=$UAM_PATH|@cat:'admin/template/js/jquery.tablesorter.min.js'} 
     4{combine_script id='jquery.tablesorter.pager' require='jquery' path=$UAM_PATH|@cat:'admin/template/js/jquery.tablesorter.pager.js'} 
    55 
    66{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head} 
  • extensions/NBC_UserAdvManager/branches/2.20/admin/template/usermanager.tpl

    r9325 r9459  
    1 {combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"} 
    2 {combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"} 
    3 {combine_script id="jquery.tablesorter" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"} 
    4 {combine_script id="jquery.tablesorter.pager" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"} 
     1{combine_script id='jquery' path='themes/default/js/jquery.min.js'} 
     2{combine_script id='jquery.cluetip' require='jquery' path='themes/default/js/plugins/jquery.cluetip.packed.js'} 
     3{combine_script id='jquery.tablesorter' require='jquery' path=$UAM_PATH|@cat:'admin/template/js/jquery.tablesorter.min.js'} 
     4{combine_script id='jquery.tablesorter.pager' require='jquery' path=$UAM_PATH|@cat:'admin/template/js/jquery.tablesorter.pager.js'} 
    55 
    66{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head} 
Note: See TracChangeset for help on using the changeset viewer.