Show
Ignore:
Timestamp:
02/11/10 17:34:27 (2 years ago)
Author:
gbastien
Message:

* Merged recent changes in the trunk into this branch
* New token architecture not yet fully functional, nor tested, but ...

  • can now edit token templates for different context of tokens (from the edit netork interface at the bottom of page)
  • Users connected through a wifidog gateway can view their connection token information
Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/newtoken/wifidog/templates/classes/MainUI_ToolContent.tpl

    r1308 r1446  
    5555                    <div>{"Logged in as"|_}: {$userListUI}</div> 
    5656                    <a id="preferences_link" href="{$base_ssl_path}admin/generic_object_admin.php?object_id={$userId}&amp;object_class=User&amp;action=edit"><img src="{$common_images_url}profile.gif">&nbsp;{"Profile / Settings"|_}</a> 
     57                    {if $hasConnection}<a id="preferences_link" href="{$base_ssl_path}admin/generic_object_admin.php?object_id={$tokenId}&amp;object_class=Connection&amp;action=edit"><img src="{$common_images_url}profile.gif">&nbsp;{"Connection information"|_}</a>{/if} 
    5758                    <a id="logout_link" href="{$base_ssl_path}login/?logout=true{$logoutParameters}"><img src="{$common_images_url}logout.gif">&nbsp;{"Logout"|_}</a> 
    5859                {else}