[Phpgroupware-cvs] admin inc/class.uiaccounts.inc.php templates/ba...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    admin
Changes by:     Sigurd Nes <sigurdne>   07/02/03 22:22:16

Modified files:
        inc            : class.uiaccounts.inc.php 
        templates/base : users.xsl 

Log message:
        show user-status

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uiaccounts.inc.php?cvsroot=phpgroupware&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/admin/templates/base/users.xsl?cvsroot=phpgroupware&r1=1.3&r2=1.4

Patches:
Index: inc/class.uiaccounts.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- inc/class.uiaccounts.inc.php        24 Jan 2007 17:33:38 -0000      1.69
+++ inc/class.uiaccounts.inc.php        3 Feb 2007 22:22:15 -0000       1.70
@@ -9,7 +9,7 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: class.uiaccounts.inc.php,v 1.69 2007/01/24 17:33:38 Caeies Exp 
$ */
+       /* $Id: class.uiaccounts.inc.php,v 1.70 2007/02/03 22:22:15 sigurdne 
Exp $ */
 
        class uiaccounts
        {
@@ -237,6 +237,14 @@
                                                                                
                'extra' => $link_data
                                                                                
        )),
                                'lang_firstname'                => 
lang('firstname'),
+                               'sort_status'                   => 
$this->nextmatchs->show_sort_order(array
+                                                                               
        (
+                                                                               
                'sort'  => $sort,
+                                                                               
                'var'   => 'account_status',
+                                                                               
                'order' => $order,
+                                                                               
                'extra' => $link_data
+                                                                               
        )),
+                               'lang_status'                   => 
lang('status'),
                                'lang_view'                             => 
lang('view'),
                                'lang_edit'                             => 
lang('edit'),
                                'lang_delete'                   => 
lang('delete'),
@@ -260,6 +268,7 @@
                                        'lid'                                   
        => (!$account['account_lid']?'':$account['account_lid']),
                                        'firstname'                             
        => (!$account['account_firstname']?'':$account['account_firstname']),
                                        'lastname'                              
        => (!$account['account_lastname']?'':$account['account_lastname']),
+                                       'status'                                
        => (!$account['account_status']?'':$account['account_status']),
                                        'delete_url'                            
=> $this->bo->check_rights('delete','account_access')
                                                                                
                        ?$GLOBALS['phpgw']->link('/index.php', 
array('menuaction' => 'admin.uiaccounts.delete_user', 'account_id' => 
$account['account_id']) )
                                                                                
                        : '',

Index: templates/base/users.xsl
===================================================================
RCS file: /sources/phpgroupware/admin/templates/base/users.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- templates/base/users.xsl    12 Aug 2006 09:13:01 -0000      1.3
+++ templates/base/users.xsl    3 Feb 2007 22:22:16 -0000       1.4
@@ -1,4 +1,4 @@
-<!-- $Id: users.xsl,v 1.3 2006/08/12 09:13:01 skwashd Exp $ -->
+<!-- $Id: users.xsl,v 1.4 2007/02/03 22:22:16 sigurdne Exp $ -->
 
        <xsl:template name="users">
                <xsl:choose>
@@ -20,12 +20,12 @@
                <center>
                <table border="0" cellspacing="2" cellpadding="2">
                        <tr>
-                               <td colspan="6" width="100%">
+                               <td colspan="7" width="100%">
                                        <xsl:call-template name="nextmatchs"/>
                                </td>
                        </tr>
                        <tr>
-                               <td colspan="6" width="100%" align="right">
+                               <td colspan="7" width="100%" align="right">
                                        <xsl:choose>
                                                <xsl:when test="search_access = 
'yes'">
                                                        <xsl:call-template 
name="search_field"/>
@@ -46,11 +46,13 @@
                <xsl:variable name="sort_lid" select="sort_lid"/>
                <xsl:variable name="sort_firstname" select="sort_firstname"/>
                <xsl:variable name="sort_lastname" select="sort_lastname"/>
+               <xsl:variable name="sort_status" select="sort_status"/>
                <xsl:variable name="lang_sort_statustext" 
select="lang_sort_statustext"/>
                <tr class="th">
                        <td width="20%"><a href="{$sort_lid}" 
onMouseover="window.status='{$lang_sort_statustext}';return true;" 
onMouseout="window.status='';return true;" class="th_text"><xsl:value-of 
select="lang_lid"/></a></td>
                        <td width="20%"><a href="{$sort_firstname}" 
onMouseover="window.status='{$lang_sort_statustext}';return true;" 
onMouseout="window.status='';return true;" class="th_text"><xsl:value-of 
select="lang_firstname"/></a></td>
                        <td width="20%"><a href="{$sort_lastname}" 
onMouseover="window.status='{$lang_sort_statustext}';return true;" 
onMouseout="window.status='';return true;" class="th_text"><xsl:value-of 
select="lang_lastname"/></a></td>
+                       <td width="6%" align="center"><a href="{$sort_status}" 
onMouseover="window.status='{$lang_sort_statustext}';return true;" 
onMouseout="window.status='';return true;" class="th_text"><xsl:value-of 
select="lang_status"/></a></td>
                        <td width="8%" align="center"><xsl:value-of 
select="lang_view"/></td>
                        <td width="8%" align="center"><xsl:value-of 
select="lang_edit"/></td>
                        <td width="8%" align="center"><xsl:value-of 
select="lang_delete"/></td>
@@ -80,6 +82,7 @@
                        <td><xsl:value-of select="lid"/></td>
                        <td><xsl:value-of select="firstname"/></td>
                        <td><xsl:value-of select="lastname"/></td>
+                       <td align="center"><xsl:value-of select="status"/></td>
                        <td align="center">
                                <xsl:variable name="view_url" 
select="view_url"/>
                                <a href="{$view_url}" 
onMouseover="window.status='{$lang_view_statustext}';return true;" 
onMouseout="window.status='';return true;" class="th_text"><xsl:value-of 
select="lang_view"/></a>