Changeset 6201


Ignore:
Timestamp:
05/16/10 22:32:54 (9 years ago)
Author:
vdigital
Message:

New: Piwigo 2.1 support
Fix: Non active menu => Icon is active
Fix: Active the right menu (Tools or Plugins) depending on the default access.
Change: CSS review.
Bug bypass on language.
Part of a code review.

Location:
extensions/whois_online
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • extensions/whois_online/config.php

    r6193 r6201  
    235235                'Administrators' => $conf_whois['Administrators'], 
    236236                'Plugins_menu' => ($conf_whois['Add to Plugins menu']) ? 1 : 0, 
    237                 'History_icon' => ($conf_whois['Add icon to History']) ? 1 : 0, 
     237                'History_icon' => ($conf_whois['Add icon to History'] or !$conf_whois['Add to Plugins menu']) ? 1 : 0, 
    238238                'Keep_data' => ($conf_whois['Keep data']) ? 1 : 0, 
    239239                'Display' => ($conf_whois['Default display']) ? 1 : 0, 
  • extensions/whois_online/default.tpl

    r3319 r6201  
    1 <div class="Online" style="float:right;text-align:center;margin-right:25px; margin-bottom:35px;"> 
     1<div class="Online" style="float:right;text-align:center;margin-right:25px; margin-bottom:60px;"> 
    22{if $Whois.Total > 0 and !$Whois.Slideshow} 
    33        {'Total hits:'|@translate} {if (is_admin())}<a href="./admin.php?page=plugin&amp;section=whois_online%2Fconfig.php&amp;tab=report" class="other">{$Whois.Total}</a>{else}{$Whois.Total}{/if} 
  • extensions/whois_online/include/wo_admin_functions.inc.php

    r6193 r6201  
    8686} 
    8787 
     88 
     89// Select the correct menu on loc_end_admin 
     90function whois_select_menu($menu) { 
     91        global $conf_whois, $template; 
     92        if ($conf_whois['Add icon to History'] or !$conf_whois['Add to Plugins menu'])  
     93                $template->assign('ACTIVE_MENU', 4); 
     94        else $template->assign('ACTIVE_MENU', 3); 
     95} 
     96 
    8897// Template function 
    8998function Whois_most($text, $count, $when, $format) { 
  • extensions/whois_online/include/wo_functions.inc.php

    r6193 r6201  
    157157function whois_add_icon($menu) { 
    158158        global $conf_whois, $lang; 
     159        add_event_handler('loc_end_admin', 'whois_select_menu' ); 
    159160        if ($conf_whois['Add icon to History']) 
    160161                $lang['History'] .= '</a> <a class="external" href="' . get_admin_plugin_menu_link(WHOIS_ONLINE_PATH.'config.php') . '"> 
  • extensions/whois_online/online.css

    r3319 r6201  
    1919a.ws1:hover { color: #f33; background-color: #f33; border-bottom: 1px solid #ff3363;} 
    2020a.ws { color: #111; background-color: #f33 !important; } 
     21#theAdminPage #content { margin-top:15px; min-height:370px; } 
     22.cluetip-default #cluetip-outer { border-radius: 16px; -moz-border-radius: 16px; -khtml-border-radius: 16px; -webkit-border-radius: 16px; } 
     23.cluetip-default h3#cluetip-title { border-radius: 16px 16px 0 0; -moz-border-radius: 16px 16px 0 0; -khtml-border-radius: 16px 16px 0 0; -webkit-border-radius: 16px 16px 0 0; } 
  • extensions/whois_online/online.php

    r6193 r6201  
    1616        add_event_handler('loc_begin_index', 'whois_online_management'); 
    1717        add_event_handler('register_user', 'whois_online_register'); 
    18         if ($conf_whois['Default display'] or (defined('IN_ADMIN') and IN_ADMIN)) add_event_handler('loc_begin_page_tail', 'whois_default_display' ); 
     18        if ($conf_whois['Default display'] or (defined('IN_ADMIN') and IN_ADMIN))   
     19                add_event_handler('loc_begin_page_tail', 'whois_default_display' ); 
    1920} 
    2021 
  • extensions/whois_online/report.tpl

    r6193 r6201  
    2424                                <tr><td class=&#34;right&#34;><b><i>User_id</i></b></td><td>{$detail.user_id}</td> 
    2525                                <td class=&#34;right&#34;><b><i>{'Status'|@translate}</i></b></td><td>{$detail.user.status|@translate|ucfirst} ({$detail.user.status})</td></tr> 
    26                                 <tr><td class=&#34;right&#34;><b><i>{'language'|@translate}</i></b></td><td>{$detail.Language}</td></tr> 
     26                          {*<tr><td class=&#34;right&#34;><b><i>{'language'|@translate}</i></b></td><td>{$detail.Language}</td></tr>*} 
    2727                                <tr><td class=&#34;right&#34; colspan=&#34;2&#34;>{$detail.Country.Name}</td><td colspan=&#34;2&#34;> / {$detail.Country.City}</td></tr> 
    2828                                <tr><td colspan=&#34;4&#34;>&nbsp;</td></tr> 
     
    9898  jQuery('.cluetip').cluetip({ 
    9999    width: 300, 
    100     splitTitle: '|' 
     100    splitTitle: '|', 
     101        clickThrough: true 
    101102  }); 
    102103}); 
Note: See TracChangeset for help on using the changeset viewer.