Changeset 26956


Ignore:
Timestamp:
01/24/14 21:27:26 (5 years ago)
Author:
Eric
Message:

merge r26955 from trunk to branch 2.6 :
Next version is 2.6.0
Remove obsolete admin default theme
Customize tablesorter using zebra widget (colors according to admin theme in action) and tablesorter pager - step 2 and final

Add obsolete.list file

Location:
extensions/UserAdvManager/branches/2.6
Files:
1 deleted
9 edited

Legend:

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

    r26948 r26956  
    3838 
    3939$dump_download = ''; 
     40 
     41// Get admin panel theme 
     42// --------------------- 
     43$themeconf=$template->get_template_vars('themeconf'); 
     44$UAM_theme=$themeconf['id']; 
    4045 
    4146// +-----------------------------------------------------------------------+ 
     
    606611  // Template initialization for forms and data 
    607612  // ------------------------------------------ 
    608   $themeconf=$template->get_template_vars('themeconf'); 
    609   $UAM_theme=$themeconf['id']; 
    610  
    611613  $template->assign( 
    612614    array( 
     
    872874      } 
    873875 
    874       // Plugin version inserted 
    875                 // ----------------------- 
     876      // Plugin version inserted and admin panel theme 
     877                // --------------------------------------------- 
    876878                $template->assign( 
    877879                                array( 
    878880                                'UAM_VERSION'  => $version, 
    879881                  'UAM_PATH'     => UAM_PATH, 
     882            'UAM_THEME'    => $UAM_theme, 
    880883          ) 
    881884      ); 
     
    13921395    }  
    13931396     
    1394     // Plugin version inserted 
    1395     // ----------------------- 
     1397    // Plugin version inserted and admin panel theme 
     1398    // --------------------------------------------- 
    13961399    $template->assign( 
    13971400      array( 
     
    13991402        'UAM_VERSION'  => $version, 
    14001403        'UAM_PATH'     => UAM_PATH, 
     1404        'UAM_THEME'    => $UAM_theme, 
    14011405      ) 
    14021406    ); 
     
    17411745    } 
    17421746 
    1743     // Plugin version inserted 
    1744     // ----------------------- 
     1747    // Plugin version inserted and admin panel theme 
     1748    // --------------------------------------------- 
    17451749    $template->assign( 
    17461750      array( 
    17471751        'UAM_VERSION'  => $version, 
    17481752        'UAM_PATH'     => UAM_PATH, 
     1753        'UAM_THEME'    => $UAM_theme, 
    17491754      ) 
    17501755    ); 
  • extensions/UserAdvManager/branches/2.6/admin/template/ghosttracker.tpl

    r26948 r26956  
    55 
    66{combine_css path= $UAM_PATH|@cat:'admin/template/uam.css'} 
     7{if $UAM_THEME=='clear'}{combine_css path= $UAM_PATH|@cat:'admin/template/themes/clear/theme.css'}{/if} 
     8{if $UAM_THEME=='roma'}{combine_css path= $UAM_PATH|@cat:'admin/template/themes/roma/theme.css'}{/if} 
    79 
    810<script type="text/javascript"> 
     
    1921    {ldelim} 
    2022      $("#sorting") 
    21       .tablesorter({ldelim}sortList:[[4,1]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim},2: {ldelim} sorter: false {rdelim}{rdelim}{rdelim}) 
     23      .tablesorter({ldelim}widgets: ["zebra"],widgetOptions :{ldelim}zebra : [ "normal-row", "alt-row" ]{rdelim},sortList:[[4,1]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim},2: {ldelim} sorter: false {rdelim}{rdelim}{rdelim}) 
    2224      .tablesorterPager({ldelim}container: $("#pager"), page: 0, size: 20, output: '{ldelim}page{rdelim} / {ldelim}totalPages{rdelim}',{rdelim}); 
    2325    {rdelim}); 
  • extensions/UserAdvManager/branches/2.6/admin/template/themes/clear/theme.css

    r10359 r26956  
    3939  padding: 0 15px 15px; 
    4040} 
     41 
     42 
     43/* ******************************* */ 
     44/* jQuery tablesorter instructions */ 
     45/* ******************************* */ 
     46 
     47table.tablesorter tbody tr.normal-row td { 
     48  background: #EEEEEE;   
     49  color: #777777; 
     50} 
     51table.tablesorter tbody tr.alt-row td { 
     52  background: #DDDDDD; 
     53  color: #777777; 
     54} 
  • extensions/UserAdvManager/branches/2.6/admin/template/themes/roma/theme.css

    r10359 r26956  
    3939  padding: 0 15px 15px; 
    4040} 
     41 
     42 
     43/* ******************************* */ 
     44/* jQuery tablesorter instructions */ 
     45/* ******************************* */ 
     46 
     47table.tablesorter tbody tr.normal-row td { 
     48  background: #111111;   
     49  color: #666666; 
     50} 
     51table.tablesorter tbody tr.alt-row td { 
     52  background: #222222; 
     53  color: #666666; 
     54} 
  • extensions/UserAdvManager/branches/2.6/admin/template/uam.css

    r26948 r26956  
    1 /* UAM instructions */ 
     1/* ********************* */ 
     2/* UAM core instructions */ 
     3/* ********************* */ 
    24li { 
    35  margin-bottom: 15px; 
     
    5254} 
    5355 
     56 
     57 
     58/* **************************** */ 
    5459/* jQuery cluetip instructions */ 
     60/* **************************** */ 
     61 
    5562label.cluetip 
    5663{ 
     
    9198} 
    9299 
     100 
     101 
     102/* ******************************* */ 
    93103/* jQuery tablesorter instructions */ 
    94 table.tablesorter tbody tr.normal-row td { 
     104/* ******************************* */ 
     105/* ******************************* */ 
     106/* jQuery tablesorter instructions */ 
     107/* ******************************* */ 
     108 
     109/*table.tablesorter tbody tr.normal-row td { 
    95110  background: #111111;   
    96111  color: #666666; 
     
    99114  background: #222222; 
    100115  color: #666666; 
    101 } 
     116}*/ 
    102117 
    103118tr.tablesorter-headerRow, throw 
     
    129144} 
    130145 
     146 
     147 
     148/* ************************************* */ 
    131149/* jQuery tablesorter pager instructions */ 
     150/* ************************************* */ 
     151 
    132152.pager{ 
    133153  text-align:center; 
  • extensions/UserAdvManager/branches/2.6/admin/template/userlist.tpl

    r26948 r26956  
    55 
    66{combine_css path= $UAM_PATH|@cat:'admin/template/uam.css'} 
     7{if $UAM_THEME=='clear'}{combine_css path= $UAM_PATH|@cat:'admin/template/themes/clear/theme.css'}{/if} 
     8{if $UAM_THEME=='roma'}{combine_css path= $UAM_PATH|@cat:'admin/template/themes/roma/theme.css'}{/if} 
    79 
    810 
     
    2224      .tablesorter( 
    2325      {ldelim} 
     26          widgets: ["zebra"], 
     27          widgetOptions : 
     28          {ldelim} 
     29              zebra : [ "normal-row", "alt-row" ] 
     30          {rdelim}, 
    2431          sortList:[[3,0]], 
    2532          // pass the headers argument and assing a object  
  • extensions/UserAdvManager/branches/2.6/admin/template/usermanager.tpl

    r26948 r26956  
    55 
    66{combine_css path= $UAM_PATH|@cat:'admin/template/uam.css'} 
     7{if $UAM_THEME=='clear'}{combine_css path= $UAM_PATH|@cat:'admin/template/themes/clear/theme.css'}{/if} 
     8{if $UAM_THEME=='roma'}{combine_css path= $UAM_PATH|@cat:'admin/template/themes/roma/theme.css'}{/if} 
    79 
    810<script type="text/javascript"> 
     
    1921    {ldelim} 
    2022      $("#sorting") 
    21       .tablesorter({ldelim}sortList:[[6,0]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim},2: {ldelim} sorter: false {rdelim}{rdelim}{rdelim}) 
     23      .tablesorter({ldelim}widgets: ["zebra"],widgetOptions :{ldelim}zebra : [ "normal-row", "alt-row" ]{rdelim},sortList:[[6,0]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim},2: {ldelim} sorter: false {rdelim}{rdelim}{rdelim}) 
    2224      .tablesorterPager({ldelim}container: $("#pager"), page: 0, size: 20, output: '{ldelim}page{rdelim} / {ldelim}totalPages{rdelim}',{rdelim}); 
    2325    {rdelim}  
  • extensions/UserAdvManager/branches/2.6/changelog.txt.php

    r25101 r26956  
    465465 
    466466-- 2.51.1 : Bug 2986 rollback - The fix is not working well. A special notice is added in administration panel 
     467 
     468-- 2.6.0 : Compatibility with Piwigo 2.6 
     469           HTML5 recommandation improvement 
     470           New tablesorter and tablesorter.pager jquery plugin 
     471           Add sk_SK, thanks to : JoeKundlak 
     472           Update pt_PT, thanks to : Bridges and ANO 
     473           Update pt_BR, thanks to : flaviove 
     474           Update tr_TR, thanks to : hakanselcuk 
     475           Update de_DE, thanks to : duke 
     476           Update da_DK, thanks to : Kaare 
     477           Update lv_LV, thanks to : agrisans 
     478           Update es_ES, thanks to : petaqui 
     479           Update it_IT, thanks to : Ericnet 
     480           Update ru_RU, thanks to : Konve 
     481           Update el_GR, thanks to : bas_alba 
    467482*/ 
    468483?> 
  • extensions/UserAdvManager/branches/2.6/obsolete.list

    r26948 r26956  
    1 template/ConfirmMail.tpl 
    2 template/rejected.tpl 
    3 template/del_account.tpl 
    4 template/confmail.css 
    5 template/index.php 
    6 template/icon/index.php 
    7 template/icon/errors.png 
    8 template/icon/home.png 
    9 template/icon/infos.png 
    10 template/icon/ 
    11 template 
    12 rejected.php 
    13 ConfirmMail.php 
    14 GT_del_account.php 
    15 USR_del_account.php 
     1admin/template/themes/default/collapse.gif 
     2admin/template/themes/default/expand.gif 
     3admin/template/themes/default/theme.css 
     4admin/template/themes/default/ 
     5admin/template/js/jquery-lastest.js 
Note: See TracChangeset for help on using the changeset viewer.